Update to Spring Cloud Hoxton.RELEASE

... and update some dependencies

closes #1316

Author: joshiste

pom.xml

@@ -36,12 +36,11 @@
 
         <!-- used dependencies versions -->
         <spring-boot.version>2.2.1.RELEASE</spring-boot.version>
-        <spring-cloud.version>Hoxton.RC2</spring-cloud.version>
-        <wiremock.version>2.24.0</wiremock.version>
-        <hazelcast-tests.version>3.12.2</hazelcast-tests.version>
+        <spring-cloud.version>Hoxton.RELEASE</spring-cloud.version>
+        <wiremock.version>2.25.1</wiremock.version>
+        <hazelcast-tests.version>3.12.4</hazelcast-tests.version>
         <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
-        <awaitility.version>3.1.6</awaitility.version>
-
+        <awaitility.version>4.0.1</awaitility.version>
 
         <!-- plugin versions -->
         <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
@@ -54,20 +53,20 @@
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
         <maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
         <maven-install-plugin.version>2.5.2</maven-install-plugin.version>
-        <maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
+        <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
         <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
         <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
         <maven-source-plugin.version>3.1.0</maven-source-plugin.version>
         <maven-war-plugin.version>3.2.3</maven-war-plugin.version>
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
-        <jacoco-maven-plugin.version>0.8.4</jacoco-maven-plugin.version>
+        <jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
         <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
         <asciidoctor-maven-plugin.version>1.6.0</asciidoctor-maven-plugin.version>
-        <git-commit-id-plugin.version>2.2.6</git-commit-id-plugin.version>
-        <flatten-maven-plugin.version>1.0.1</flatten-maven-plugin.version>
+        <git-commit-id-plugin.version>3.0.1</git-commit-id-plugin.version>
+        <flatten-maven-plugin.version>1.1.0</flatten-maven-plugin.version>
         <maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
-        <checkstyle.version>8.23</checkstyle.version>
+        <checkstyle.version>8.24</checkstyle.version>
         <spring-javaformat-checkstyle.version>0.0.15</spring-javaformat-checkstyle.version>
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
     </properties>

spring-boot-admin-server-ui/src/main/frontend/views/instances/scheduledtasks/i18n.de.json

@@ -2,9 +2,9 @@
   "instances": {
     "scheduledtasks": {
       "label": "Geplante Tasks",
+      "no_scheduledtasks": "Keine geplanten Aufgaben.",
       "cron": {
         "expression": "Expression",
-        "no_scheduledtasks": "Keine geplanten Aufgaben.",
         "runnable": "Runnable",
         "title": "Cron"
       },

spring-boot-admin-server-ui/src/main/frontend/views/instances/scheduledtasks/i18n.en.json

@@ -1,10 +1,10 @@
 {
   "instances": {
     "scheduledtasks": {
-      "label" : "Scheduled Tasks",
+      "label": "Scheduled Tasks",
+      "no_scheduledtasks": "No scheduled tasks present.",
       "cron": {
         "expression": "Expression",
-        "no_scheduledtasks": "No scheduled tasks present.",
         "runnable": "Runnable",
         "title": "Cron"
       },

spring-boot-admin-server-ui/src/main/frontend/views/instances/scheduledtasks/i18n.fr.json

@@ -1,10 +1,10 @@
 {
   "instances": {
     "scheduledtasks": {
-      "label" : "Tâches programmées",
+      "label": "Tâches programmées",
+      "no_scheduledtasks": "Aucune tâches présente.",
       "cron": {
         "expression": "Expression",
-        "no_scheduledtasks": "Aucune tâches présente.",
         "runnable": "Exécutable",
         "title": "Cron"
       },

spring-boot-admin-server-ui/src/main/frontend/views/instances/scheduledtasks/i18n.ko.json

@@ -1,10 +1,10 @@
 {
   "instances": {
     "scheduledtasks": {
-      "label" : "스케쥴 작업",
+      "label": "스케쥴 작업",
+      "no_scheduledtasks": "스케쥴 작업이 없습니다.",
       "cron": {
         "expression": "표현식",
-        "no_scheduledtasks": "스케쥴 작업이 없습니다.",
         "runnable": "실행가능",
         "title": "Cron"
       },

spring-boot-admin-server-ui/src/main/frontend/views/instances/scheduledtasks/i18n.zh.json

@@ -1,10 +1,10 @@
 {
   "instances": {
     "scheduledtasks": {
-      "label" : "计划任务",
+      "label": "计划任务",
+      "no_scheduledtasks": "没有计划任务。",
       "cron": {
         "expression": "表达式",
-        "no_scheduledtasks": "没有计划任务。",
         "runnable": "可运行",
         "title": "计划任务"
       },

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

@@ -18,13 +18,13 @@
 
 import org.reactivestreams.Publisher;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 
 import de.codecentric.boot.admin.server.domain.entities.InstanceRepository;
 import de.codecentric.boot.admin.server.domain.entities.SnapshottingInstanceRepository;
@@ -50,7 +50,7 @@
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnBean(AdminServerMarkerConfiguration.Marker.class)
 @EnableConfigurationProperties(AdminServerProperties.class)
-@Import({ AdminServerInstanceWebClientConfiguration.class, AdminServerWebConfiguration.class })
+@ImportAutoConfiguration({ AdminServerInstanceWebClientConfiguration.class, AdminServerWebConfiguration.class })
 @AutoConfigureAfter({ WebClientAutoConfiguration.class })
 public class AdminServerAutoConfiguration {