diff --git a/docs/pom.xml b/docs/pom.xml index b5c0cb9..3a1f8cc 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-bus-parent - 1.3.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT pom Spring Cloud Bus Docs diff --git a/pom.xml b/pom.xml index 4ec8c3d..a85fefb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 spring-cloud-bus-parent - 1.3.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT pom spring-cloud-bus-parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 1.3.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT @@ -26,11 +26,25 @@ - 1.2.1.BUILD-SNAPSHOT - Chelsea.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT + Elmhurst.BUILD-SNAPSHOT bus + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + + + + + spring diff --git a/spring-cloud-bus-dependencies/pom.xml b/spring-cloud-bus-dependencies/pom.xml index 67b61a5..737b878 100644 --- a/spring-cloud-bus-dependencies/pom.xml +++ b/spring-cloud-bus-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT spring-cloud-bus-dependencies - 1.3.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT pom spring-cloud-bus-dependencies Spring Cloud Bus Dependencies diff --git a/spring-cloud-bus/pom.xml b/spring-cloud-bus/pom.xml index 938798f..f60e8a8 100644 --- a/spring-cloud-bus/pom.xml +++ b/spring-cloud-bus/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-bus-parent - 1.3.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-bus/src/test/java/org/springframework/cloud/bus/BusAutoConfigurationTests.java b/spring-cloud-bus/src/test/java/org/springframework/cloud/bus/BusAutoConfigurationTests.java index a802577..3304f4e 100644 --- a/spring-cloud-bus/src/test/java/org/springframework/cloud/bus/BusAutoConfigurationTests.java +++ b/spring-cloud-bus/src/test/java/org/springframework/cloud/bus/BusAutoConfigurationTests.java @@ -31,7 +31,7 @@ import org.junit.After; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.cloud.bus.event.AckRemoteApplicationEvent; import org.springframework.cloud.bus.event.RefreshRemoteApplicationEvent; import org.springframework.cloud.bus.event.SentApplicationEvent; @@ -97,7 +97,7 @@ public class BusAutoConfigurationTests { @Test public void inboundNotFromSelfWithAck() throws Exception { this.context = SpringApplication - .run(new Object[] { InboundMessageHandlerConfiguration.class, + .run(new Class[] { InboundMessageHandlerConfiguration.class, OutboundMessageHandlerConfiguration.class, SentMessageConfiguration.class }, new String[] {}); this.context.setId("bar"); @@ -118,7 +118,7 @@ public class BusAutoConfigurationTests { @Test public void inboundNotFromSelfWithTrace() throws Exception { this.context = SpringApplication.run( - new Object[] { InboundMessageHandlerConfiguration.class, + new Class[] { InboundMessageHandlerConfiguration.class, OutboundMessageHandlerConfiguration.class, SentMessageConfiguration.class }, new String[] { "--spring.cloud.bus.trace.enabled=true" }); @@ -138,7 +138,7 @@ public class BusAutoConfigurationTests { @Test public void inboundAckWithTrace() throws Exception { this.context = SpringApplication.run( - new Object[] { InboundMessageHandlerConfiguration.class, + new Class[] { InboundMessageHandlerConfiguration.class, OutboundMessageHandlerConfiguration.class, AckMessageConfiguration.class }, new String[] { "--spring.cloud.bus.trace.enabled=true" }); diff --git a/spring-cloud-starter-bus-amqp/pom.xml b/spring-cloud-starter-bus-amqp/pom.xml index 5302887..61c78c2 100644 --- a/spring-cloud-starter-bus-amqp/pom.xml +++ b/spring-cloud-starter-bus-amqp/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-bus-parent - 1.3.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-starter-bus-amqp diff --git a/spring-cloud-starter-bus-kafka/pom.xml b/spring-cloud-starter-bus-kafka/pom.xml index 7a71cfb..644a2b8 100644 --- a/spring-cloud-starter-bus-kafka/pom.xml +++ b/spring-cloud-starter-bus-kafka/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-bus-parent - 1.3.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-starter-bus-kafka