From 23e7fa67cb03b844b19be67c6a0d84cd8ec01060 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Tue, 22 Sep 2015 09:41:46 -0600
Subject: [PATCH] remove bus temporarily as it is broken with the changes to
 spring-cloud-bus

---
 pom.xml                                             |  4 ++--
 .../consul/sample/SampleConsulApplication.java      | 13 +++++--------
 spring-cloud-starter-consul-all/pom.xml             |  4 ++--
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 58f4b35b..fb30b720 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,10 +30,10 @@
 		<module>spring-cloud-consul-core</module>
 		<module>spring-cloud-consul-config</module>
 		<module>spring-cloud-consul-discovery</module>
-		<module>spring-cloud-consul-bus</module>
+		<!--<module>spring-cloud-consul-bus</module>-->
 		<module>spring-cloud-consul-sample</module>
 		<module>spring-cloud-starter-consul</module>
-		<module>spring-cloud-starter-consul-bus</module>
+		<!--<module>spring-cloud-starter-consul-bus</module>-->
 		<module>spring-cloud-starter-consul-config</module>
 		<module>spring-cloud-starter-consul-discovery</module>
 		<module>spring-cloud-starter-consul-all</module>
diff --git a/spring-cloud-consul-sample/src/main/java/org/springframework/cloud/consul/sample/SampleConsulApplication.java b/spring-cloud-consul-sample/src/main/java/org/springframework/cloud/consul/sample/SampleConsulApplication.java
index 4c1eaf16..618bb967 100644
--- a/spring-cloud-consul-sample/src/main/java/org/springframework/cloud/consul/sample/SampleConsulApplication.java
+++ b/spring-cloud-consul-sample/src/main/java/org/springframework/cloud/consul/sample/SampleConsulApplication.java
@@ -28,15 +28,12 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.bind.RelaxedPropertyResolver;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.bus.jackson.SubtypeModule;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
-import org.springframework.cloud.consul.bus.SimpleRemoteEvent;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
@@ -55,7 +52,7 @@ import org.springframework.web.bind.annotation.RestController;
 @EnableConfigurationProperties
 @EnableFeignClients
 @Slf4j
-public class SampleConsulApplication implements ApplicationListener<SimpleRemoteEvent> {
+public class SampleConsulApplication /*implements ApplicationListener<SimpleRemoteEvent>*/ {
 
 	@Autowired
 	private LoadBalancerClient loadBalancer;
@@ -117,10 +114,10 @@ public class SampleConsulApplication implements ApplicationListener<SimpleRemote
 		return sampleClient.choose();
 	}
 
-	@Bean
+	/*@Bean
 	public SubtypeModule sampleSubtypeModule() {
 		return new SubtypeModule(SimpleRemoteEvent.class);
-	}
+	}*/
 
 	@Bean
 	public SampleProperties sampleProperties() {
@@ -131,10 +128,10 @@ public class SampleConsulApplication implements ApplicationListener<SimpleRemote
 		SpringApplication.run(SampleConsulApplication.class, args);
 	}
 
-	@Override
+	/*@Override
 	public void onApplicationEvent(SimpleRemoteEvent event) {
 		log.info("Received event: {}", event);
-	}
+	}*/
 
 	@FeignClient("testConsulApp")
 	public interface SampleClient {
diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml
index 0bdfebe3..0c60b43e 100644
--- a/spring-cloud-starter-consul-all/pom.xml
+++ b/spring-cloud-starter-consul-all/pom.xml
@@ -20,10 +20,10 @@
 		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
 	<dependencies>
-		<dependency>
+		<!--<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-consul-bus</artifactId>
-		</dependency>
+		</dependency>-->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-consul-config</artifactId>