Merge remote-tracking branch 'origin/master' into feat/grouping-wallboard

* origin/master: (93 commits)
  chore(deps): update storybook monorepo to v8.2.2 (#3496)
  chore(deps): update dependency sass to v1.77.8 (#3495)
  chore(deps): update babel monorepo to v7.24.8 (#3494)
  chore(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.3.1 (#3492)
  fix(deps): update dependency org.springframework.cloud:spring-cloud-dependencies to v2023.0.3 (#3493)
  chore(deps): update dependency org.apache.maven.plugins:maven-failsafe-plugin to v3.3.1 (#3491)
  chore(deps): update npm to v10.8.2 (#3490)
  chore(deps): update storybook monorepo to v8.2.1 (#3489)
  chore(deps): update storybook monorepo to v8.2.0 (#3470)
  chore(deps): update dependency sass to v1.77.7 (#3488)
  chore(deps): update typescript-eslint monorepo to v7.16.0 (#3487)
  chore(deps): update node.js to v20.15.1 (#3486)
  chore(deps): update jamesives/github-pages-deploy-action action to v4.6.3 (#3484)
  chore(deps): update dependency org.eclipse.jetty:jetty-alpn-server to v12.0.11 (#3483)
  chore(deps): update dependency vite to v5.3.3 (#3482)
  chore(deps): update dependency vite-plugin-static-copy to v1.0.6 (#3481)
  chore(deps): update dependency vite-plugin-static-copy to v1.0.6 (#3480)
  chore(deps): update dependency eslint-plugin-vue to v9.27.0 (#3479)
  chore(deps): update dependency typescript to v5.5.3 (#3478)
  chore(deps): update typescript-eslint monorepo to v7.15.0 (#3477)
  ...

Author: SteKoe

.github/workflows/build-feature.yml

@@ -6,17 +6,26 @@ on:
       - master
       - 1.*
       - 2.*
+  pull_request:
 
 jobs:
   build:
-
     strategy:
       matrix:
         os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}
     steps:
 
+      - name: free disk space
+        run: |
+          df -h
+          sudo swapoff -a
+          sudo rm -f /swapfile
+          sudo apt clean
+          docker rmi $(docker image ls -aq)
+          df -h
+
       - uses: actions/checkout@v4
 
       - name: Set up JDK 17

.github/workflows/build-main.yml

@@ -84,7 +84,7 @@ jobs:
         run: echo ${{ steps.project.outputs.version }}
 
       - name: Deploy Asciidoc docs output to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@v4.6.1
+        uses: JamesIves/github-pages-deploy-action@v4.6.3
         with:
           branch: gh-pages # The branch the action should deploy to.
           folder: spring-boot-admin-docs/target/generated-docs # The folder the action should deploy.

.github/workflows/build-pullrequest.yml

@@ -19,6 +19,15 @@ jobs:
     steps:
       - run: echo "Will start a Maven Central upload with version ${{ github.event.inputs.releaseversion }}"
 
+      - name: free disk space
+        run: |
+          df -h
+          sudo swapoff -a
+          sudo rm -f /swapfile
+          sudo apt clean
+          docker rmi $(docker image ls -aq)
+          df -h
+
       - uses: actions/checkout@v4
 
       - name: Set up settings.xml for Maven Central Repository
@@ -56,15 +65,15 @@ jobs:
           MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
 
       - name: Deploy Asciidoc docs output to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@v4.6.1
+        uses: JamesIves/github-pages-deploy-action@v4.6.3
         with:
           branch: gh-pages # The branch the action should deploy to.
           folder: spring-boot-admin-docs/target/generated-docs # The folder the action should deploy.
           target-folder: ${{ github.event.inputs.releaseversion }}
           clean: true # Automatically remove deleted files from the deploy branch
 
       - name: Deploy Asciidoc docs output to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@v4.6.1
+        uses: JamesIves/github-pages-deploy-action@v4.6.3
         if: github.event.inputs.copyDocsToCurrent == 'true'
         with:
           branch: gh-pages # The branch the action should deploy to.
@@ -80,6 +89,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: free disk space
+        run: |
+          df -h
+          sudo swapoff -a
+          sudo rm -f /swapfile
+          sudo apt clean
+          docker rmi $(docker image ls -aq)
+          df -h
+
       - name: Generate changelog
         id: changelog
         uses: metcalfc/changelog-generator@v4.3.1

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

@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip

.mvn/wrapper/maven-wrapper.properties

@@ -12,13 +12,12 @@ Monitoring Python applications is available using [Pyctuator](https://github.com
 ## Compatibility Matrix
 In the Spring Boot Admin Server App, the Spring Boot Admin's version matches the major and minor versions of Spring Boot.
 
-| Spring Boot Version | Spring Boot Admin  |
-|---------------------|--------------------|
-| 2.6                 | 2.6.Y              |
-| 2.7                 | 2.7.Y              |
-| 3.0                 | 3.0.Y              |
-| 3.1                 | 3.1.Y              |
-| 3.2                 | 3.2.Y              |
+| Spring Boot Version | Spring Boot Admin |
+|---------------------|-------------------|
+| 2.7                 | 2.7.Y             |
+| 3.0                 | 3.0.Y             |
+| ...                 | ...               |
+| 3.3                 | 3.3.Y             |
 
 Nevertheless, it is possible to monitor any version of a Spring Boot service independently of the underlying Spring Boot version in the service.
 Hence, it is possible to run Spring Boot Admin Server version 2.6 and monitor a service that is running on Spring Boot 2.3 using Spring Boot Admin Client version 2.3.

README.md

@@ -26,7 +26,7 @@
     <description>Spring Boot Admin</description>
     <url>https://github.com/codecentric/spring-boot-admin/</url>
     <properties>
-        <revision>3.2.4-SNAPSHOT</revision>
+        <revision>3.3.3-SNAPSHOT</revision>
         <java.version>17</java.version>
 
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -36,31 +36,31 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- used dependencies versions -->
-        <spring-boot.version>3.3.0</spring-boot.version>
-        <spring-cloud.version>2023.0.1</spring-cloud.version>
+        <spring-boot.version>3.3.1</spring-boot.version>
+        <spring-cloud.version>2023.0.3</spring-cloud.version>
         <wiremock.version>3.0.1</wiremock.version>
         <hazelcast-tests.version>5.4.0</hazelcast-tests.version>
         <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
         <awaitility.version>4.2.1</awaitility.version>
         <testcontainers.version>1.19.8</testcontainers.version>
         <eureka-client.version>3.1.1</eureka-client.version>
-        <jetty.version>12.0.9</jetty.version>
+        <jetty.version>12.0.11</jetty.version>
 
         <!-- plugin versions -->
         <build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
         <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
-        <versions-maven-plugin.version>2.16.2
+        <versions-maven-plugin.version>2.17.0
         </versions-maven-plugin.version> <!-- because of https://github.com/mojohaus/versions/issues/855 -->
-        <maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>
+        <maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
         <maven-site-plugin.version>3.12.1</maven-site-plugin.version>
-        <maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
+        <maven-dependency-plugin.version>3.7.1</maven-dependency-plugin.version>
         <maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
-        <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
-        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
-        <maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
+        <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
+        <maven-surefire-plugin.version>3.3.1</maven-surefire-plugin.version>
+        <maven-failsafe-plugin.version>3.3.1</maven-failsafe-plugin.version>
         <maven-install-plugin.version>3.1.2</maven-install-plugin.version>
-        <maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
-        <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
+        <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
+        <maven-javadoc-plugin.version>3.7.0</maven-javadoc-plugin.version>
         <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
         <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
         <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
@@ -71,10 +71,10 @@
         <asciidoctor-converter-doxia-module.version>3.0.0</asciidoctor-converter-doxia-module.version>
         <git-commit-id-maven-plugin.version>4.9.10</git-commit-id-maven-plugin.version>
         <flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
-        <maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
-        <checkstyle.version>10.16.0</checkstyle.version>
-        <spring-javaformat-checkstyle.version>0.0.41</spring-javaformat-checkstyle.version>
-        <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
+        <maven-checkstyle-plugin.version>3.4.0</maven-checkstyle-plugin.version>
+        <checkstyle.version>10.17.0</checkstyle.version>
+        <spring-javaformat-checkstyle.version>0.0.42</spring-javaformat-checkstyle.version>
+        <nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
         <node.version>v18.20.2</node.version>
         <npm.version>10.5.2</npm.version>
     </properties>

pom.xml

@@ -100,7 +100,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.6.1</version>
             </plugin>
         </plugins>
     </reporting>