diff --git a/pom.xml b/pom.xml index 52fa31d75..1c2b20942 100644 --- a/pom.xml +++ b/pom.xml @@ -20,11 +20,7 @@ 1.7 1.3.0.BUILD-SNAPSHOT - Brixton.BUILD-SNAPSHOT - 1.2.1.BUILD-SNAPSHOT - 4.2.0.RC2 4.2.0.BUILD-SNAPSHOT - 1.2.0.BUILD-SNAPSHOT 1.1.0.BUILD-SNAPSHOT @@ -37,6 +33,13 @@ + + org.springframework.integration + spring-integration-bom + ${spring-integration.version} + pom + import + org.springframework.boot spring-boot-starter-parent @@ -44,18 +47,6 @@ pom import - - org.springframework.cloud - spring-cloud-starter-parent - ${spring-cloud.version} - pom - import - - - org.springframework.cloud - spring-cloud-spring-service-connector - ${spring-cloud-spring-service-connector.version} - org.springframework.cloud spring-cloud-lattice-connector @@ -93,13 +84,18 @@ org.springframework.cloud - spring-cloud-stream-module-launcher + spring-cloud-stream-binder-spi ${project.version} - org.springframework - spring-messaging - ${spring-framework.version} + org.springframework.cloud + spring-cloud-stream-binder-test + ${project.version} + + + org.springframework.cloud + spring-cloud-stream-module-launcher + ${project.version} org.springframework.integration diff --git a/spring-cloud-stream-binders/pom.xml b/spring-cloud-stream-binders/pom.xml index a094b575e..bfdbff61e 100644 --- a/spring-cloud-stream-binders/pom.xml +++ b/spring-cloud-stream-binders/pom.xml @@ -18,6 +18,7 @@ 0.8.2.1 2.6.0 + 1.2.1.BUILD-SNAPSHOT spring-cloud-stream-binder-spi @@ -31,15 +32,9 @@ - org.springframework.cloud - spring-cloud-stream-binder-spi - ${project.version} - - - org.springframework.cloud - spring-cloud-stream-binder-test - ${project.version} - test + org.springframework.xd + spring-xd-tuple + ${spring-xd.version} org.apache.kafka diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/pom.xml b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/pom.xml index 56f5d2809..c83cae5ec 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/pom.xml +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/pom.xml @@ -54,7 +54,6 @@ org.springframework.integration spring-integration-amqp - ${spring-integration.version} diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/pom.xml b/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/pom.xml index a5dd4678e..027142f03 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/pom.xml +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/pom.xml @@ -54,18 +54,15 @@ org.springframework.integration spring-integration-redis - ${spring-integration.version} joda-time joda-time - 2.5 test org.springframework.xd spring-xd-tuple - ${spring-xd.version} test diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/pom.xml b/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/pom.xml index af265ed55..985cd5cba 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/pom.xml +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/pom.xml @@ -22,7 +22,6 @@ org.springframework spring-web - ${spring-framework.version} org.springframework.integration @@ -31,17 +30,14 @@ org.springframework.retry spring-retry - 1.1.0.RELEASE com.fasterxml.jackson.core jackson-databind - 2.4.5 org.apache.httpcomponents httpclient - 4.3.6 diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-test/pom.xml b/spring-cloud-stream-binders/spring-cloud-stream-binder-test/pom.xml index e7517b249..dba84c085 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-test/pom.xml +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-test/pom.xml @@ -36,12 +36,10 @@ org.springframework spring-web - ${spring-framework.version} org.springframework.xd spring-xd-tuple - ${spring-xd.version} test diff --git a/spring-cloud-stream-codec/pom.xml b/spring-cloud-stream-codec/pom.xml index a33631aa8..a2ad32d44 100644 --- a/spring-cloud-stream-codec/pom.xml +++ b/spring-cloud-stream-codec/pom.xml @@ -30,10 +30,12 @@ org.springframework.integration spring-integration-core + true org.springframework.boot spring-boot-starter-logging + true org.springframework.boot