Merge branch 'master' into feat/migrate-to-maven-4-part-2

Author: SteKoe

.github/workflows/build-feature.yml

@@ -51,7 +51,7 @@ jobs:
 
       - name: Upload surefire reports
         if: always()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: surefire-reports
           path: |

.github/workflows/build-main.yml

@@ -38,7 +38,7 @@ jobs:
 
       - name: Upload surefire reports
         if: always()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: surefire-reports
           path: |
@@ -88,7 +88,7 @@ jobs:
         run: ./mvnw -B --no-transfer-progress site
 
       - name: Deploy documentation to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@v4.7.6
+        uses: JamesIves/github-pages-deploy-action@v4.8.0
         with:
           branch: gh-pages
           folder: spring-boot-admin-docs/target/generated-docs/build

.github/workflows/deploy-documentation.yml

@@ -50,15 +50,15 @@ jobs:
         run: ./mvnw -B --no-transfer-progress  -pl spring-boot-admin-docs site
 
       - name: Deploy documentation to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@v4.7.6
+        uses: JamesIves/github-pages-deploy-action@v4.8.0
         with:
           branch: gh-pages
           folder: spring-boot-admin-docs/target/generated-docs/build
           target-folder: ${{ github.event.inputs.releaseversion }}
           clean: true
 
       - name: Deploy redirect for /current to /${{ github.event.inputs.releaseversion }}
-        uses: JamesIves/github-pages-deploy-action@v4.7.6
+        uses: JamesIves/github-pages-deploy-action@v4.8.0
         if: github.event.inputs.copyDocsToCurrent == 'true'
         with:
           branch: gh-pages
@@ -67,7 +67,7 @@ jobs:
           clean: true
 
       - name: Deploy deeplink redirect for /current/* to /${{ github.event.inputs.releaseversion }}/*
-        uses: JamesIves/github-pages-deploy-action@v4.7.6
+        uses: JamesIves/github-pages-deploy-action@v4.8.0
         if: github.event.inputs.copyDocsToCurrent == 'true'
         with:
           branch: gh-pages

.github/workflows/release-to-maven-central.yml

@@ -78,15 +78,15 @@ jobs:
         run: ./mvnw -B --no-transfer-progress  -pl spring-boot-admin-docs site
 
       - name: Deploy documentation to GitHub Pages for version ${{ github.event.inputs.releaseversion }}
-        uses: JamesIves/github-pages-deploy-action@v4.7.6
+        uses: JamesIves/github-pages-deploy-action@v4.8.0
         with:
           branch: gh-pages
           folder: spring-boot-admin-docs/target/generated-docs/build
           target-folder: ${{ github.event.inputs.releaseversion }}
           clean: true
 
       - name: Deploy redirect for /current to /${{ github.event.inputs.releaseversion }}
-        uses: JamesIves/github-pages-deploy-action@v4.7.6
+        uses: JamesIves/github-pages-deploy-action@v4.8.0
         if: github.event.inputs.copyDocsToCurrent == 'true'
         with:
           branch: gh-pages
@@ -95,7 +95,7 @@ jobs:
           clean: true
 
       - name: Deploy deeplink redirect for /current/* to /${{ github.event.inputs.releaseversion }}/*
-        uses: JamesIves/github-pages-deploy-action@v4.7.6
+        uses: JamesIves/github-pages-deploy-action@v4.8.0
         if: github.event.inputs.copyDocsToCurrent == 'true'
         with:
           branch: gh-pages

pom.xml

@@ -30,7 +30,7 @@
     <url>https://github.com/codecentric/spring-boot-admin/</url>
 
     <properties>
-        <revision>3.5.7-SNAPSHOT</revision>
+        <revision>3.5.8-SNAPSHOT</revision>
 
         <java.version>17</java.version>
         <node.version>v22.12.0</node.version>
@@ -50,25 +50,25 @@
         <argLine/>
 
         <!-- used dependencies versions -->
-        <spring-boot.version>3.5.8</spring-boot.version>
+        <spring-boot.version>3.5.10</spring-boot.version>
         <spring-cloud.version>2025.0.0</spring-cloud.version>
 
-        <jolokia-support-spring.version>2.4.2</jolokia-support-spring.version>
+        <jolokia-support-spring.version>2.4.3</jolokia-support-spring.version>
 
-        <checkstyle.version>12.2.0</checkstyle.version>
+        <checkstyle.version>12.3.1</checkstyle.version>
         <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
 
         <wiremock.version>3.13.2</wiremock.version>
         <hazelcast.version>5.6.0</hazelcast.version>
         <awaitility.version>4.3.0</awaitility.version>
-        <testcontainers.version>1.21.3</testcontainers.version>
+        <testcontainers.version>2.0.3</testcontainers.version>
         <jetty.version>12.1.5</jetty.version>
 
         <!-- plugin versions -->
         <build-helper-maven-plugin.version>3.6.1</build-helper-maven-plugin.version>
         <maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
         <!-- because of https://github.com/mojohaus/versions/issues/855 -->
-        <versions-maven-plugin.version>2.20.1</versions-maven-plugin.version>
+        <versions-maven-plugin.version>2.21.0</versions-maven-plugin.version>
         <maven-clean-plugin.version>3.5.0</maven-clean-plugin.version>
         <maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
         <maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
@@ -82,14 +82,14 @@
         <maven-source-plugin.version>3.4.0</maven-source-plugin.version>
         <maven-war-plugin.version>3.5.1</maven-war-plugin.version>
         <maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
-        <frontend-maven-plugin.version>1.15.4</frontend-maven-plugin.version>
+        <frontend-maven-plugin.version>2.0.0</frontend-maven-plugin.version>
         <jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
         <git-commit-id-maven-plugin.version>4.9.10</git-commit-id-maven-plugin.version>
         <flatten-maven-plugin.version>1.7.3</flatten-maven-plugin.version>
         <cyclonedx-maven-plugin.version>2.9.1</cyclonedx-maven-plugin.version>
         <maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
         <spring-javaformat-maven-plugin.version>0.0.47</spring-javaformat-maven-plugin.version>
-        <central-publishing-maven-plugin.version>0.9.0</central-publishing-maven-plugin.version>
+        <central-publishing-maven-plugin.version>0.10.0</central-publishing-maven-plugin.version>
         <spring-conf-prop-documenter-maven-plugin.version>0.7.2</spring-conf-prop-documenter-maven-plugin.version>
     </properties>
 

renovate.json

@@ -6,11 +6,8 @@
     "bot",
     "dependencies"
   ],
-  "npm": {
-    "minimumReleaseAge": "5 days",
-    "internalChecksFilter": "strict",
-    "prCreation": "not-pending"
-  },
+  "minimumReleaseAge": "5 days",
+  "internalChecksFilter": "strict",
   "packageRules": [
     {
       "description": "Automatically merge minor and patch-level updates when checks pass, creates a PR otherwise",
@@ -29,6 +26,13 @@
         "spring-boot-admin"
       ],
       "enabled": false
+    },
+    {
+      "description": "Checkstyle 13+ requires Java 21, stay on 12.x",
+      "matchPackageNames": [
+        "com.puppycrawl.tools:checkstyle"
+      ],
+      "allowedVersions": "<13"
     }
   ]
 }

spring-boot-admin-build/pom.xml

@@ -95,7 +95,7 @@
             </dependency>
             <dependency>
                 <groupId>org.testcontainers</groupId>
-                <artifactId>junit-jupiter</artifactId>
+                <artifactId>testcontainers-junit-jupiter</artifactId>
                 <version>${testcontainers.version}</version>
                 <scope>test</scope>
             </dependency>

spring-boot-admin-docs/src/site/package-lock.json

@@ -18,6 +18,9 @@ export function PropertyTable({
                                 additionalProperties = [] as Array<SpringPropertyDefinition>,
                               }: Readonly<Props>) {
   const filteredProperties = filterPropertiesByName(properties, filter, exclusive)
+    .filter((property, index, self) =>
+      index === self.findIndex((p) => p.name === property.name)
+    )
     .sort((a, b) => {
       return a.name.length - b.name.length || a.name.localeCompare(b.name);
     });