From 55bb1d7b2ff372bc4cf5561631ccc7120c28c036 Mon Sep 17 00:00:00 2001
From: spencergibb <spencer@gibb.us>
Date: Mon, 14 Dec 2020 14:03:17 -0500
Subject: [PATCH] removes import from application.yml

---
 .../src/main/resources/application.yml                        | 3 +--
 .../configdatatests/ConsulConfigDataApplicationTests.java     | 2 +-
 spring-cloud-starter-consul-all/pom.xml                       | 4 ++++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/src/main/resources/application.yml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/src/main/resources/application.yml
index ebbee05b..69ad84bf 100644
--- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/src/main/resources/application.yml
+++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/src/main/resources/application.yml
@@ -4,9 +4,8 @@ server:
 spring:
   application:
     name: testConsulConfigDataIntegrationTestApp
-  config:
-    import: 'optional:consul:'
 
 logging:
   level:
     org.springframework.cloud.consul: DEBUG
+    org.springframework.boot.context.config: TRACE
diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/src/test/java/org/springframework/cloud/consul/configdatatests/ConsulConfigDataApplicationTests.java b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/src/test/java/org/springframework/cloud/consul/configdatatests/ConsulConfigDataApplicationTests.java
index d4c547f9..e48d29d5 100644
--- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/src/test/java/org/springframework/cloud/consul/configdatatests/ConsulConfigDataApplicationTests.java
+++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/src/test/java/org/springframework/cloud/consul/configdatatests/ConsulConfigDataApplicationTests.java
@@ -44,7 +44,7 @@ public class ConsulConfigDataApplicationTests {
 
 		SpringApplication application = new SpringApplication(ConsulConfigDataApplication.class);
 		context = application.run("--spring.application.name=" + APP_NAME,
-				"--spring.config.import=consul:" + ConsulTestcontainers.getHost() + ":"
+				"--spring.config.import=optional:consul:" + ConsulTestcontainers.getHost() + ":"
 						+ ConsulTestcontainers.getPort(),
 				"--spring.cloud.consul.config.prefix=" + ROOT, "--spring.cloud.consul.config.watch.delay=10");
 
diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml
index 105cbc29..5e6a8fd0 100644
--- a/spring-cloud-starter-consul-all/pom.xml
+++ b/spring-cloud-starter-consul-all/pom.xml
@@ -33,5 +33,9 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-consul-discovery</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-consul-bus</artifactId>
+		</dependency>
 	</dependencies>
 </project>