From df5902fabd585c22b28b974a9cd83a34d9f9e21c Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Tue, 19 Jul 2016 10:51:09 +0100
Subject: [PATCH] Move some dependencies from bom to parent

---
 pom.xml                                       | 47 +++++++++++++++--
 spring-cloud-contract-dependencies/pom.xml    | 52 -------------------
 .../pom.xml                                   |  4 --
 3 files changed, 44 insertions(+), 59 deletions(-)

diff --git a/pom.xml b/pom.xml
index 949063d377..e7ec4c4afc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,7 @@
 	<inceptionYear>2016</inceptionYear>
 
 	<properties>
+		<activemq.version>5.12.1</activemq.version>
 		<camel.version>2.17.0</camel.version>
 		<spring-cloud-stream.version>1.0.2.RELEASE</spring-cloud-stream.version>
 		<spring-framework.version>4.3.1.BUILD-SNAPSHOT</spring-framework.version>
@@ -41,15 +42,55 @@
 
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>org.apache.camel</groupId>
+				<artifactId>camel-spring</artifactId>
+				<version>${camel.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.camel</groupId>
+				<artifactId>camel-spring-boot-starter</artifactId>
+				<version>${camel.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.camel</groupId>
+				<artifactId>camel-jackson</artifactId>
+				<version>${camel.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.camel</groupId>
+				<artifactId>camel-jms</artifactId>
+				<version>${camel.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.activemq</groupId>
+				<artifactId>activemq-camel</artifactId>
+				<version>${activemq.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.activemq</groupId>
+				<artifactId>activemq-pool</artifactId>
+				<version>${activemq.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>cglib</groupId>
 				<artifactId>cglib</artifactId>
 				<version>3.2.4</version>
 			</dependency>
 			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-lang3</artifactId>
-				<version>3.3</version>
+				<groupId>org.spockframework</groupId>
+				<artifactId>spock-spring</artifactId>
+				<version>1.0-groovy-2.4</version>
+			</dependency>
+			<dependency>
+				<groupId>org.spockframework</groupId>
+				<artifactId>spock-core</artifactId>
+				<version>1.0-groovy-2.4</version>
+			</dependency>
+			<dependency>
+				<groupId>info.solidsoft.spock</groupId>
+				<artifactId>spock-global-unroll</artifactId>
+				<version>0.5.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml
index d03319e7dc..3db66d169d 100644
--- a/spring-cloud-contract-dependencies/pom.xml
+++ b/spring-cloud-contract-dependencies/pom.xml
@@ -16,8 +16,6 @@
 	<properties>
 		<wiremock.version>2.1.7</wiremock.version>
 		<jsonassert.version>0.4.7</jsonassert.version>
-		<camel.version>2.17.0</camel.version>
-		<activemq.version>5.12.1</activemq.version>
 		<aether.version>1.1.0</aether.version>
 		<spring-cloud-stream.version>1.0.2.RELEASE</spring-cloud-stream.version>
 		<spring-cloud-zookeeper.version>1.0.3.BUILD-SNAPSHOT</spring-cloud-zookeeper.version>
@@ -150,46 +148,11 @@
 				<artifactId>jsonassert</artifactId>
 				<version>1.2.3</version>
 			</dependency>
-			<dependency>
-				<groupId>org.apache.camel</groupId>
-				<artifactId>camel-spring</artifactId>
-				<version>${camel.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.camel</groupId>
-				<artifactId>camel-spring-boot-starter</artifactId>
-				<version>${camel.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.camel</groupId>
-				<artifactId>camel-jackson</artifactId>
-				<version>${camel.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.camel</groupId>
-				<artifactId>camel-jms</artifactId>
-				<version>${camel.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.activemq</groupId>
-				<artifactId>activemq-camel</artifactId>
-				<version>${activemq.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.activemq</groupId>
-				<artifactId>activemq-pool</artifactId>
-				<version>${activemq.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>args4j</groupId>
 				<artifactId>args4j</artifactId>
 				<version>2.32</version>
 			</dependency>
-			<dependency>
-				<groupId>com.jayway.restassured</groupId>
-				<artifactId>spring-mock-mvc</artifactId>
-				<version>2.9.0</version>
-			</dependency>
 			<dependency>
 				<groupId>org.eclipse.aether</groupId>
 				<artifactId>aether-api</artifactId>
@@ -220,21 +183,6 @@
 				<artifactId>maven-aether-provider</artifactId>
 				<version>3.3.9</version>
 			</dependency>
-			<dependency>
-				<groupId>org.spockframework</groupId>
-				<artifactId>spock-spring</artifactId>
-				<version>1.0-groovy-2.4</version>
-			</dependency>
-			<dependency>
-				<groupId>org.spockframework</groupId>
-				<artifactId>spock-core</artifactId>
-				<version>1.0-groovy-2.4</version>
-			</dependency>
-			<dependency>
-				<groupId>info.solidsoft.spock</groupId>
-				<artifactId>spock-global-unroll</artifactId>
-				<version>0.5.0</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-netflix-dependencies</artifactId>
diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/pom.xml b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/pom.xml
index 10414853ec..d033396513 100644
--- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/pom.xml
+++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/pom.xml
@@ -21,10 +21,6 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier-testing-utils</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>com.github.tomakehurst</groupId>
 			<artifactId>wiremock</artifactId>