feat(#2800): grouping on wallboard

Author: SteKoe

.github/workflows/build-feature.yml

@@ -18,6 +18,7 @@ jobs:
     steps:
 
       - name: free disk space
+        continue-on-error: true
         run: |
           df -h
           sudo swapoff -a

.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/[email protected].3
+        uses: JamesIves/[email protected].8
         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/release-to-maven-central.yml

@@ -20,6 +20,7 @@ jobs:
       - run: echo "Will start a Maven Central upload with version ${{ github.event.inputs.releaseversion }}"
 
       - name: free disk space
+        continue-on-error: true
         run: |
           df -h
           sudo swapoff -a
@@ -65,15 +66,15 @@ jobs:
           MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
 
       - name: Deploy Asciidoc docs output to GitHub Pages
-        uses: JamesIves/[email protected].3
+        uses: JamesIves/[email protected].8
         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/[email protected].3
+        uses: JamesIves/[email protected].8
         if: github.event.inputs.copyDocsToCurrent == 'true'
         with:
           branch: gh-pages # The branch the action should deploy to.
@@ -90,6 +91,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: free disk space
+        continue-on-error: true
         run: |
           df -h
           sudo swapoff -a

.mvn/wrapper/maven-wrapper.properties

@@ -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.8/apache-maven-3.9.8-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

pom.xml

@@ -26,7 +26,7 @@
     <description>Spring Boot Admin</description>
     <url>https://github.com/codecentric/spring-boot-admin/</url>
     <properties>
-        <revision>3.3.4-SNAPSHOT</revision>
+        <revision>3.3.5-SNAPSHOT</revision>
         <java.version>17</java.version>
 
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -36,47 +36,48 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- used dependencies versions -->
-        <spring-boot.version>3.3.2</spring-boot.version>
+        <spring-boot.version>3.3.5</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.2</awaitility.version>
-        <testcontainers.version>1.20.1</testcontainers.version>
+        <testcontainers.version>1.20.3</testcontainers.version>
         <eureka-client.version>3.1.1</eureka-client.version>
-        <jetty.version>12.0.12</jetty.version>
+        <jetty.version>12.0.14</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.17.1
         </versions-maven-plugin.version> <!-- because of https://github.com/mojohaus/versions/issues/855 -->
         <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.7.1</maven-dependency-plugin.version>
-        <maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
+        <maven-site-plugin.version>3.21.0</maven-site-plugin.version>
+        <maven-dependency-plugin.version>3.8.0</maven-dependency-plugin.version>
+        <maven-deploy-plugin.version>3.1.3</maven-deploy-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-surefire-plugin.version>3.5.1</maven-surefire-plugin.version>
+        <maven-failsafe-plugin.version>3.5.1</maven-failsafe-plugin.version>
+        <maven-install-plugin.version>3.1.3</maven-install-plugin.version>
         <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
-        <maven-javadoc-plugin.version>3.8.0</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.10.1</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>
-        <maven-gpg-plugin.version>3.2.5</maven-gpg-plugin.version>
-        <frontend-maven-plugin.version>1.15.0</frontend-maven-plugin.version>
+        <maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
+        <frontend-maven-plugin.version>1.15.1</frontend-maven-plugin.version>
         <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
         <asciidoctor-maven-plugin.version>3.0.0</asciidoctor-maven-plugin.version>
         <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.4.0</maven-checkstyle-plugin.version>
-        <checkstyle.version>10.17.0</checkstyle.version>
+        <maven-checkstyle-plugin.version>3.5.0</maven-checkstyle-plugin.version>
+        <checkstyle.version>10.18.2</checkstyle.version>
         <spring-javaformat-checkstyle.version>0.0.43</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>
+        <jolokia-support-spring.version>2.1.1</jolokia-support-spring.version>
     </properties>
     <modules>
         <module>spring-boot-admin-server</module>

spring-boot-admin-docs/pom.xml

@@ -30,7 +30,7 @@
     </parent>
 
     <properties>
-        <site.skin.version>2.3.2</site.skin.version>
+        <site.skin.version>2.3.3</site.skin.version>
     </properties>
 
     <build>
@@ -100,7 +100,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>3.6.2</version>
+                <version>3.8.0</version>
             </plugin>
         </plugins>
     </reporting>

spring-boot-admin-docs/src/site/asciidoc/client.adoc

@@ -41,13 +41,31 @@ springBoot {
 [[jmx-bean-management]]
 == JMX-Bean Management ==
 
-ATTENTION: Spring Boot 3 does currently not support Jolokia, so this will not work with Spring Boot 3 based applications.
-You can still monitor Spring Boot 2 applications with Jolokia endpoint using a Spring Boot Admin 3 server.
-
-To interact with JMX-beans in the admin UI you have to include https://jolokia.org/[Jolokia] in your application.
+To interact with JMX-beans in the admin UI you have to include
+https://jolokia.org/[Jolokia] in your application and expose it via the actuator endpoint.
 As Jolokia is servlet based there is no support for reactive applications.
-In case you are using the `spring-boot-admin-starter-client` it will be pulled in for you, if not add Jolokia to your dependencies.
-With Spring Boot 2.2.0 you might want to set `spring.jmx.enabled=true` if you want to expose Spring beans via JMX.
+
+You might want to set `spring.jmx.enabled=true` if you want to expose Spring beans via JMX.
+
+==== Spring Boot 3 App ====
+
+Spring Boot 3 does not support Jolokia directly, you need a separate dependency for Spring Boot 3 based applications.
+See https://jolokia.org/reference/html/manual/spring.html for more details.
+
+[source,xml]
+.pom.xml
+----
+<dependency>
+    <groupId>org.jolokia</groupId>
+    <artifactId>jolokia-support-spring</artifactId>
+    <version>2.1.0</version>
+</dependency>
+----
+
+==== Spring Boot 2 App ====
+
+You can still monitor Spring Boot 2 applications with Jolokia endpoint using a Spring Boot Admin 3 server. Spring Boot 2
+provided the actuator itself, so you only the need the plain jolokia dependency.
 
 [source,xml]
 .pom.xml

spring-boot-admin-docs/src/site/asciidoc/customize_ui.adoc

@@ -216,3 +216,19 @@ You can very simply hide views in the navbar:
 ----
 include::{samples-dir}/spring-boot-admin-sample-servlet/src/main/resources/application.yml[tags=customization-view-settings]
 ----
+
+== Hide Service URL ==
+To hide service URLs in Spring Boot Admin UI entirely, set the following property in your Server's configuration:
+
+|===
+| Property name | Default | Usage
+
+| `spring.boot.admin.ui.hide-instance-url`
+| `false`
+| Set to `true` to hide service URLs as well as actions that require them in UI (e.g. jump to /health or /actuator).
+
+|===
+
+If you want to hide the URL for specific instances oncly, you can set the `hide-url` property in the instance metadata while registering a service.
+When using Spring Boot Admin Client you can set the property `spring.boot.admin.client.metadata.hide-url=true` in the corresponding config file.
+The value set in `metadata` does not have any effect, when the URLs are disabled in Server.

spring-boot-admin-docs/src/site/asciidoc/getting-started.adoc

@@ -48,7 +48,7 @@ NOTE: See also the {github-src}/spring-boot-admin-samples/spring-boot-admin-samp
 [[register-client-applications]]
 == Registering Client Applications ==
 
-To register your application at the SBA Server, you can either include the SBA Client or use http://projects.spring.io/spring-cloud/spring-cloud.html[Spring Cloud Discovery] (e.g. Eureka, Consul, ...). There is also a <<server#spring-cloud-discovery-static-config,simple option using a static configuration on the SBA Server side>>.
+To register your application at the SBA Server, you can either include the SBA Client or use https://spring.io/projects/spring-cloud[Spring Cloud Discovery] (e.g. Eureka, Consul, ...). There is also a <<server#spring-cloud-discovery-static-config,simple option using a static configuration on the SBA Server side>>.
 
 [[register-clients-via-spring-boot-admin]]
 === Spring Boot Admin Client ===