Merge branch 'develop'

wcm-io-devops · Dec 9, 2024 · 06674e8 · 06674e8
2 parents 386d3a1 + ea1bbc0
commit 06674e8
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 11 deletions.
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: ${{ matrix.distribution }}
           java-version: ${{ matrix.java }}

diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
@@ -25,7 +25,7 @@ jobs:
           git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 11

diff --git a/parent_toplevel/changes.xml b/parent_toplevel/changes.xml
@@ -23,6 +23,18 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="1.4.6" date="not released">
+      <action type="update" dev="sseifert">
+        Update to global-parent 60.
+      </action>
+      <action type="update" dev="sseifert">
+        Update to reflow-maven-skin 1.2.0.
+      </action>
+      <action type="update" dev="sseifert">
+        Update testing dependencies.
+      </action>
+    </release>
+
     <release version="1.4.4" date="2024-01-25">
       <action type="update" dev="sseifert">
         Update to global-parent 56.

diff --git a/parent_toplevel/pom.xml b/parent_toplevel/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.maven</groupId>
     <artifactId>io.wcm.maven.global-parent</artifactId>
-    <version>56</version>
+    <version>60</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops</groupId>
   <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-  <version>1.4.4</version>
+  <version>1.4.6</version>
   <packaging>pom</packaging>
 
   <name>Toplevel Parent</name>
@@ -84,7 +84,7 @@
     <site.deploy.url>scm:git:https://github.com/wcm-io-devops/wcm-io-devops.github.io.git</site.deploy.url>
 
     <!-- Versions -->
-    <mockito.version>5.10.0</mockito.version>
+    <mockito.version>5.14.2</mockito.version>
 
     <!-- SonarCloud -->
     <sonar.organization>wcm-io-devops</sonar.organization>
@@ -149,7 +149,7 @@
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest-library</artifactId>
-        <version>2.2</version>
+        <version>3.0</version>
       </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
@@ -165,7 +165,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.10.1</version>
+        <version>5.11.3</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -304,8 +304,19 @@
           </dependencies>
         </plugin>
 
-      </plugins>
+        <!-- Stick with old versions of site plugins because latest ones use Doxia 2.x, which is not compatible with our io.wcm.maven.skins.reflow-velocity-tools -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.12.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>3.5.0</version>
+        </plugin>
 
+      </plugins>
     </pluginManagement>
   </build>
 

diff --git a/parent_toplevel/src/site/site.xml b/parent_toplevel/src/site/site.xml
@@ -35,7 +35,7 @@
   <skin>
     <groupId>io.wcm.maven.skins</groupId>
     <artifactId>reflow-maven-skin</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
   </skin>
   <custom>
     <reflowSkin>

diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.4.2</version>
+    <version>1.4.5-SNAPSHOT</version>
     <relativePath>parent_toplevel/pom.xml</relativePath>
   </parent>
 

diff --git a/public_site/pom.xml b/public_site/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.4.2</version>
+    <version>1.4.5-SNAPSHOT</version>
     <relativePath>../parent_toplevel/pom.xml</relativePath>
   </parent>
 

diff --git a/public_site/src/site/markdown/index.md b/public_site/src/site/markdown/index.md
@@ -18,6 +18,7 @@ wcm.io DevOps is an Open Source project which provides tools for configuration m
 
 * [Ansible Automation for AEM](ansible-aem/)
 * [Jenkins Pipeline Library for CI/CD](https://github.com/wcm-io-devops/jenkins-pipeline-library)
+* [pippo - CLI Tool for Cloud Manager](https://github.com/wcm-io-devops/pippo)
 
 ##### Maven