Merge changes from upgrade to spring boot 2.7.0 into experimental spring boot 3 branch

Author: ulischulte

spring-boot-admin-client/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,2 @@
+de.codecentric.boot.admin.client.config.SpringBootAdminClientAutoConfiguration
+de.codecentric.boot.admin.client.config.SpringBootAdminClientCloudFoundryAutoConfiguration

spring-boot-admin-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -16,11 +16,11 @@
 
 package de.codecentric.boot.admin.client.config;
 
-import org.apache.commons.logging.LogFactory;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.cloud.CloudFoundryVcapEnvironmentPostProcessor;
 import org.springframework.boot.context.properties.bind.Bindable;
 import org.springframework.boot.context.properties.bind.Binder;
+import org.springframework.boot.logging.DeferredLogs;
 import org.springframework.mock.env.MockEnvironment;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -41,8 +41,7 @@ public void bind() {
 
 		MockEnvironment env = new MockEnvironment();
 		env.setProperty("VCAP_APPLICATION", vcap);
-		new CloudFoundryVcapEnvironmentPostProcessor(LogFactory.getLog(CloudFoundryApplicationPropertiesTest.class))
-				.postProcessEnvironment(env, null);
+		new CloudFoundryVcapEnvironmentPostProcessor(new DeferredLogs()).postProcessEnvironment(env, null);
 
 		CloudFoundryApplicationProperties cfProperties = Binder.get(env)
 				.bind("vcap.application", Bindable.of(CloudFoundryApplicationProperties.class)).get();

spring-boot-admin-client/src/test/java/de/codecentric/boot/admin/client/config/CloudFoundryApplicationPropertiesTest.java

@@ -81,12 +81,22 @@ And this is how you register the top-level view.
 ----
 include::{samples-dir}/spring-boot-admin-sample-custom-ui/src/index.js[tags=customization-ui-toplevel]
 ----
-<1> Name of the view and the route to the view
-<2> Path where the view will be accessible
+<1> Name of the view and the route to the view.
+<2> Path where the view will be accessible.
 <3> The imported custom component, which will be rendered on the route.
 <4> The label for the custom view to be shown in the top navigation bar.
 <5> Order for the view. Views in the top navigation bar are sorted by ascending order.
 
+===== Example
+[source,javascript]
+----
+include::{samples-dir}/spring-boot-admin-sample-custom-ui/src/index.js[tags=customization-ui-child]
+----
+<1> References the name of the parent view.
+<2> Router path used to navigate to.
+<3> Define whether the path should be registered as child route in parent's route.
+    When set to `true`, the parent component has to implement `<router-view>`
+
 The `routes.txt` config with the added route:
 [source,text]
 ----

spring-boot-admin-docs/src/main/asciidoc/customizing.adoc

@@ -36,7 +36,7 @@ spring:
 ----
 
 ==== Other DiscoveryClients ====
-Spring Boot Admin supports all other implementations of Spring Cloud's `DiscoveryClient` (Eureka, Zookeeper, Consul, ...). You need to add it to the Spring Boot Admin Server and configure it properly.
+Spring Boot Admin supports all other implementations of Spring Cloud's `DiscoveryClient` (https://docs.spring.io/spring-cloud-netflix/docs/current/reference/html/#service-discovery-eureka-clients/[Eureka], https://docs.spring.io/spring-cloud-zookeeper/docs/current/reference/html/#spring-cloud-zookeeper-discovery[Zookeeper], https://docs.spring.io/spring-cloud-consul/docs/current/reference/html/#spring-cloud-consul-discovery[Consul], https://docs.spring.io/spring-cloud-kubernetes/docs/current/reference/html/#discoveryclient-for-kubernetes[Kubernetes], ...). You need to add it to the Spring Boot Admin Server and configure it properly.
 An <<discover-clients-via-spring-cloud-discovery,example setup using Eureka>> is shown above.
 
 ==== Converting ServiceInstances ====

spring-boot-admin-docs/src/main/asciidoc/server-discovery.adoc

@@ -32,13 +32,16 @@ management:
 
 ---
 spring:
-  profiles: insecure
-
+  config:
+    activate:
+      on-profile: insecure
 ---
 spring:
-  profiles: secure
   security:
     user:
       name: "user"
       password: "password"
+  config:
+    activate:
+      on-profile: secure
 

spring-boot-admin-samples/spring-boot-admin-sample-consul/src/main/resources/application.yml

@@ -30,15 +30,18 @@ management:
 
 ---
 spring:
-  profiles: insecure
-
+  config:
+    activate:
+      on-profile: insecure
 ---
 spring:
-  profiles: secure
   security:
     user:
       name: "user"
       password: "password"
+  config:
+    activate:
+      on-profile: secure
 eureka:
   instance:
     metadata-map:

spring-boot-admin-samples/spring-boot-admin-sample-eureka/src/main/resources/application.yml

@@ -25,11 +25,11 @@ spring:
 
 ---
 spring:
-  profiles: insecure
-
+  config:
+    activate:
+      on-profile: insecure
 ---
 spring:
-  profiles: secure
   security:
     user:
       name: "user"
@@ -43,5 +43,8 @@ spring:
           metadata:
             user.name: "user"         #These two are needed so that the server
             user.password: "password" #can access the protected client endpoints
+  config:
+    activate:
+      on-profile: secure
 
 

spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/src/main/resources/application.yml

@@ -24,11 +24,11 @@
 import org.springframework.security.config.Customizer;
 import org.springframework.security.config.web.server.ServerHttpSecurity;
 import org.springframework.security.web.server.SecurityWebFilterChain;
+import reactor.core.publisher.Mono;
 
 import de.codecentric.boot.admin.server.config.AdminServerProperties;
 import de.codecentric.boot.admin.server.config.EnableAdminServer;
-import de.codecentric.boot.admin.server.domain.entities.InstanceRepository;
-import de.codecentric.boot.admin.server.notify.LoggingNotifier;
+import de.codecentric.boot.admin.server.notify.Notifier;
 
 @Configuration(proxyBeanMethods = false)
 @EnableAutoConfiguration
@@ -65,8 +65,8 @@ public SecurityWebFilterChain securityWebFilterChainSecure(ServerHttpSecurity ht
 	}
 
 	@Bean
-	public LoggingNotifier loggerNotifier(InstanceRepository repository) {
-		return new LoggingNotifier(repository);
+	public Notifier notifier() {
+		return (e) -> Mono.empty();
 	}
 
 }

spring-boot-admin-samples/spring-boot-admin-sample-reactive/src/main/java/de/codecentric/boot/admin/SpringBootAdminReactiveApplication.java

@@ -29,7 +29,9 @@ spring:
 
 ---
 spring:
-  profiles: dev
+  config:
+    activate:
+      on-profile: dev
   boot:
     admin:
       ui:
@@ -41,11 +43,11 @@ spring:
 
 ---
 spring:
-  profiles: insecure
-
+  config:
+    activate:
+      on-profile: insecure
 ---
 spring:
-  profiles: secure
   security:
     user:
       name: "user"
@@ -59,5 +61,8 @@ spring:
           metadata:
             user.name: "user"         #These two are needed so that the server
             user.password: "password" #can access the protected client endpoints
+  config:
+    activate:
+      on-profile: secure