Merge branch 'develop'

stefanseifert · stefanseifert · commit 2388f4613dc5 · 2025-09-24T09:08:31.000+02:00
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
@@ -15,16 +15,16 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [11, 17, 21]
+        java: [17, 21]
         os: [ubuntu-latest]
         distribution: [temurin]
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: ${{ matrix.distribution }}
           java-version: ${{ matrix.java }}
diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
@@ -17,18 +17,18 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Configure GIT
         run: |
           git config --global user.email "${{ secrets.GH_SITE_DEPLOY_EMAIL }}"
           git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
 
       - name: Setup JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
           cache: maven
 
       - name: Build, verify, deploy, generate site
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <img src="https://wcm.io/images/favicon-16@2x.png"/> wcm.io DevOps Tooling
 ======
-[![Build](https://github.com/wcm-io-devops/devops-tooling/workflows/Build/badge.svg?branch=develop)](https://github.com/wcm-io-devops/devops-tooling/actions?query=workflow%3ABuild+branch%3Adevelop)
+[![Build](https://github.com/wcm-io-devops/devops-tooling/actions/workflows/maven-build.yml/badge.svg?branch=develop)](https://github.com/wcm-io-devops/devops-tooling/actions?query=workflow%3ABuild+branch%3Adevelop)
 
 Tooling for wcm.io DevOps projects
diff --git a/parent_toplevel/changes.xml b/parent_toplevel/changes.xml
@@ -24,6 +24,15 @@
     xsi:schemaLocation="http://maven.apache.org/changes/2.0.0 https://maven.apache.org/xsd/changes-2.0.0.xsd">
   <body>
 
+    <release version="2.1.0" date="2025-09-24">
+      <action type="update" dev="sseifert">
+        Switch minimum Java to Java 17 - both for build and compile target.
+      </action>
+      <action type="update" dev="sseifert">
+        Update global-parent dependency to 70.
+      </action>
+    </release>
+
     <release version="2.0.4" date="2025-09-19">
       <action type="update" dev="sseifert">
         Update to global-parent 66.
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>66</version>
+    <version>70</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops</groupId>
   <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-  <version>2.0.4</version>
+  <version>2.1.0</version>
   <packaging>pom</packaging>
 
   <name>Toplevel Parent</name>
@@ -75,7 +75,7 @@
   <properties>
 
     <!-- Java version -->
-    <java.version>11</java.version>
+    <java.version>17</java.version>
 
     <!-- site settings -->
     <site.url.module.prefix>tooling/parent_toplevel</site.url.module.prefix>
@@ -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.19.0</mockito.version>
+    <mockito.version>5.20.0</mockito.version>
 
     <!-- SonarCloud -->
     <sonar.organization>wcm-io-devops</sonar.organization>
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>2.0.3-SNAPSHOT</version>
+    <version>2.1.0-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>2.0.3-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../parent_toplevel/pom.xml</relativePath>
   </parent>
 

-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 <img src="https://wcm.io/images/[email protected]"/> wcm.io DevOps Tooling
 ======
 -[![Build](https://github.com/wcm-io-devops/devops-tooling/workflows/Build/badge.svg?branch=develop)](https://github.com/wcm-io-devops/devops-tooling/actions?query=workflow%3ABuild+branch%3Adevelop)
 +[![Build](https://github.com/wcm-io-devops/devops-tooling/actions/workflows/maven-build.yml/badge.svg?branch=develop)](https://github.com/wcm-io-devops/devops-tooling/actions?query=workflow%3ABuild+branch%3Adevelop)
 Tooling for wcm.io DevOps projects