update to latest snapshot of boot

spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/config/ClientProperties.java

@@ -19,7 +19,7 @@ package de.codecentric.boot.admin.client.config;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.bind.convert.DefaultDurationUnit;
+import org.springframework.boot.convert.DurationUnit;
 
 @lombok.Data
 @ConfigurationProperties(prefix = "spring.boot.admin.client")
@@ -38,19 +38,19 @@ public class ClientProperties {
     /**
      * Time interval the registration is repeated
      */
-    @DefaultDurationUnit(ChronoUnit.MILLIS)
+    @DurationUnit(ChronoUnit.MILLIS)
     private Duration period = Duration.ofMillis(10_000L);
 
     /**
      * Connect timeout for the registration.
      */
-    @DefaultDurationUnit(ChronoUnit.MILLIS)
+    @DurationUnit(ChronoUnit.MILLIS)
     private Duration connectTimeout = Duration.ofMillis(5_000L);
 
     /**
      * Read timeout (in ms) for the registration.
      */
-    @DefaultDurationUnit(ChronoUnit.MILLIS)
+    @DurationUnit(ChronoUnit.MILLIS)
     private Duration readTimeout = Duration.ofMillis(5_000L);
 
     /**

spring-boot-admin-docs/src/main/asciidoc/changes-2.x.adoc

@@ -33,6 +33,7 @@ As some of the actuator endpoints changed with the Spring Boot 2 release not all
 * Added the concept of applications (consisting of 1 to n instances) to the backend
 * Removed Zuul
 * Removed dependency on spring-cloud-starter
+* Added CompositeHttpHeadersProvider to support multiple HttpHeadersProviders
 
 === Client
 * Moved all properties to `spring.boot.admin.client.*` and `spring.boot.admin.client.instance.*`

spring-boot-admin-server-ui/src/main/java/de/codecentric/boot/admin/server/ui/config/AdminServerUiProperties.java

@@ -20,7 +20,7 @@ import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.concurrent.TimeUnit;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.bind.convert.DefaultDurationUnit;
+import org.springframework.boot.convert.DurationUnit;
 import org.springframework.http.CacheControl;
 
 @lombok.Data
@@ -48,7 +48,7 @@ public class AdminServerUiProperties {
         /**
          * include "max-age" directive in Cache-Control http header.
          */
-        @DefaultDurationUnit(ChronoUnit.SECONDS)
+        @DurationUnit(ChronoUnit.SECONDS)
         private Duration maxAge = Duration.ofSeconds(3600);
 
         /**

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/config/AdminServerProperties.java

@@ -23,7 +23,7 @@ import java.time.temporal.ChronoUnit;
 import java.util.HashSet;
 import java.util.Set;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.bind.convert.DefaultDurationUnit;
+import org.springframework.boot.convert.DurationUnit;
 
 import static java.util.Arrays.asList;
 
@@ -91,26 +91,26 @@ public class AdminServerProperties {
         /**
          * Time interval to update the status of instances with expired statusInfo
          */
-        @DefaultDurationUnit(ChronoUnit.MILLIS)
+        @DurationUnit(ChronoUnit.MILLIS)
         private Duration period = Duration.ofMillis(10_000L);
 
         /**
          * Lifetime of status. The status won't be updated as long the last status isn't
          * expired.
          */
-        @DefaultDurationUnit(ChronoUnit.MILLIS)
+        @DurationUnit(ChronoUnit.MILLIS)
         private Duration statusLifetime = Duration.ofMillis(10_000L);
 
         /**
          * Connect timeout when querying the instances' status and info.
          */
-        @DefaultDurationUnit(ChronoUnit.MILLIS)
+        @DurationUnit(ChronoUnit.MILLIS)
         private Duration connectTimeout = Duration.ofMillis(2_000);
 
         /**
          * read timeout when querying the instances' status and info.
          */
-        @DefaultDurationUnit(ChronoUnit.MILLIS)
+        @DurationUnit(ChronoUnit.MILLIS)
         private Duration readTimeout = Duration.ofMillis(20_000);
 
     }