From bb68ed8d59178b30ba469fa2de24936e3e7e0a12 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Fri, 16 Sep 2016 15:17:50 +0100
Subject: [PATCH] Move unnecessary dependencies up a level

---
 pom.xml                                        | 16 ++++++++++++++++
 spring-cloud-cloudfoundry-dependencies/pom.xml | 18 ------------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index 014e47f..39b00c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,8 @@
      <properties>
        <bintray.package>cloudfoundry</bintray.package>
 	   <main.basedir>${basedir}</main.basedir>
+	   <spring-cloud-netflix.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-netflix.version>
+	   <spring-cloud-commons.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-commons.version>
      </properties>
 
     <scm>
@@ -61,6 +63,20 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-netflix-dependencies</artifactId>
+                <version>${spring-cloud-netflix.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-commons-dependencies</artifactId>
+				<version>${spring-cloud-commons.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+			</dependency>
  		    <dependency>
 			  <groupId>commons-logging</groupId>
 			  <artifactId>commons-logging</artifactId>
diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml
index a565c10..3ee65c8 100644
--- a/spring-cloud-cloudfoundry-dependencies/pom.xml
+++ b/spring-cloud-cloudfoundry-dependencies/pom.xml
@@ -13,26 +13,8 @@
 	<packaging>pom</packaging>
 	<name>spring-cloud-cloudfoundry-dependencies</name>
 	<description>Spring Cloud Cloudfoundry Dependencies</description>
-	<properties>
-	   <spring-cloud-netflix.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-netflix.version>
-	   <spring-cloud-commons.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-commons.version>
-	</properties>
 	<dependencyManagement>
 		<dependencies>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-netflix-dependencies</artifactId>
-                <version>${spring-cloud-netflix.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-commons-dependencies</artifactId>
-				<version>${spring-cloud-commons.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-cloudfoundry-discovery</artifactId>