Merge remote-tracking branch 'upstream/master' into 2.x

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

@@ -45,6 +45,7 @@ import static org.springframework.boot.autoconfigure.condition.ConditionalOnWebA
 
 @Configuration
 @EnableConfigurationProperties({ClientProperties.class, InstanceProperties.class})
+@ConditionalOnWebApplication
 @Conditional(SpringBootAdminClientEnabledCondition.class)
 @AutoConfigureAfter(WebMvcEndpointManagementContextConfiguration.class)
 public class SpringBootAdminClientAutoConfiguration {

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

@@ -40,6 +40,13 @@ public class SpringBootAdminClientAutoConfigurationTest {
         assertThat(context.getBeansOfType(ApplicationRegistrator.class)).isEmpty();
     }
 
+    @Test
+    public void nonWebEnvironment() {
+        load("spring.main.admin.url:http://localhost:8081", "spring.boot.admin.client.enabled:true",
+                "spring.main.web-environment:false");
+        assertThat(context.getBeansOfType(ApplicationRegistrator.class).isEmpty());
+    }
+
     private void load(final String... environment) {
         SpringApplication springApplication = new SpringApplication(TestClientApplication.class);
         springApplication.addInitializers(