diff --git a/pom.xml b/pom.xml index 6ab83b7b8e..e32978f6bf 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-build - 1.2.0.BUILD-SNAPSHOT + 1.2.1.BUILD-SNAPSHOT @@ -25,10 +25,13 @@ 5.12.1 2.17.0 - Brooklyn.BUILD-SNAPSHOT - 1.4.0.BUILD-SNAPSHOT + 1.4.1.BUILD-SNAPSHOT 2.17 - 1.2.0.BUILD-SNAPSHOT + ${project.parent.version} + 1.0.3.BUILD-SNAPSHOT + Brooklyn.BUILD-SNAPSHOT + 1.2.0.BUILD-SNAPSHOT + 1.1.0.BUILD-SNAPSHOT @@ -110,6 +113,34 @@ pom import + + org.springframework.cloud + spring-cloud-netflix-dependencies + ${spring-cloud-netflix.version} + pom + import + + + org.springframework.cloud + spring-cloud-stream-dependencies + ${spring-cloud-stream.version} + pom + import + + + org.springframework.cloud + spring-cloud-zookeeper-dependencies + ${spring-cloud-zookeeper.version} + pom + import + + + org.springframework.cloud + spring-cloud-consul-dependencies + ${spring-cloud-consul.version} + pom + import + diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index d59291ca93..9bdfe67a3c 100644 --- a/spring-cloud-contract-dependencies/pom.xml +++ b/spring-cloud-contract-dependencies/pom.xml @@ -5,7 +5,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.2.0.BUILD-SNAPSHOT + 1.2.1.BUILD-SNAPSHOT spring-cloud-contract-dependencies @@ -17,10 +17,6 @@ 2.1.7 0.4.7 1.0.2.v20150114 - Brooklyn.BUILD-SNAPSHOT - 1.0.3.BUILD-SNAPSHOT - 1.2.0.BUILD-SNAPSHOT - 1.1.0.BUILD-SNAPSHOT @@ -103,26 +99,21 @@ - - com.jayway.restassured - spring-mock-mvc - 2.9.0 - com.toomuchcoding.jsonassert jsonassert ${jsonassert.version} + + com.jayway.restassured + spring-mock-mvc + 2.9.0 + org.skyscreamer jsonassert 1.2.3 - - args4j - args4j - 2.32 - org.eclipse.aether aether-api @@ -153,34 +144,6 @@ maven-aether-provider 3.2.1 - - org.springframework.cloud - spring-cloud-netflix-dependencies - ${spring-cloud-netflix.version} - pom - import - - - org.springframework.cloud - spring-cloud-stream-dependencies - ${spring-cloud-stream.version} - pom - import - - - org.springframework.cloud - spring-cloud-zookeeper-dependencies - ${spring-cloud-zookeeper.version} - pom - import - - - org.springframework.cloud - spring-cloud-consul-dependencies - ${spring-cloud-consul.version} - pom - import -