From 7418d9a61014dee0bd121da296401b1c9b98eca5 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Fri, 20 Mar 2015 16:27:55 +0000
Subject: [PATCH] Use cloud parent where possible

---
 configserver-eureka/pom.xml | 18 +++---------------
 eureka-first/pom.xml        | 18 +++---------------
 netflix-sidecar/pom.xml     | 18 +++---------------
 turbine/pom.xml             | 18 +++---------------
 zuul-proxy-eureka/pom.xml   | 18 +++---------------
 zuul-proxy/pom.xml          | 18 +++---------------
 zuul/pom.xml                |  6 +++---
 7 files changed, 21 insertions(+), 93 deletions(-)

diff --git a/configserver-eureka/pom.xml b/configserver-eureka/pom.xml
index 0d70c95..d978c53 100644
--- a/configserver-eureka/pom.xml
+++ b/configserver-eureka/pom.xml
@@ -12,9 +12,9 @@
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.1.RELEASE</version>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-starter-parent</artifactId>
+		<version>1.0.1.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -23,18 +23,6 @@
 		<start-class>demo.DemoApplication</start-class>
 		<java.version>1.7</java.version>
 	</properties>
-	
-	<dependencyManagement>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-parent</artifactId>
-			<version>1.0.1.BUILD-SNAPSHOT</version>
-			<type>pom</type>
-			<scope>import</scope>
-		</dependency>
-	</dependencies>
-	</dependencyManagement>
 
 	<dependencies>
 		<dependency>
diff --git a/eureka-first/pom.xml b/eureka-first/pom.xml
index 46cd818..53565fe 100644
--- a/eureka-first/pom.xml
+++ b/eureka-first/pom.xml
@@ -12,9 +12,9 @@
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.1.RELEASE</version>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-starter-parent</artifactId>
+		<version>1.0.1.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -23,18 +23,6 @@
 		<start-class>demo.DemoApplication</start-class>
 		<java.version>1.7</java.version>
 	</properties>
-	
-	<dependencyManagement>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-parent</artifactId>
-			<version>1.0.1.BUILD-SNAPSHOT</version>
-			<type>pom</type>
-			<scope>import</scope>
-		</dependency>
-	</dependencies>
-	</dependencyManagement>
 
 	<dependencies>
 		<dependency>
diff --git a/netflix-sidecar/pom.xml b/netflix-sidecar/pom.xml
index 181871c..38186af 100644
--- a/netflix-sidecar/pom.xml
+++ b/netflix-sidecar/pom.xml
@@ -12,9 +12,9 @@
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.1.RELEASE</version>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-starter-parent</artifactId>
+		<version>1.0.1.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -23,18 +23,6 @@
 		<start-class>demo.DemoApplication</start-class>
 		<java.version>1.7</java.version>
 	</properties>
-	
-	<dependencyManagement>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-parent</artifactId>
-			<version>1.0.1.BUILD-SNAPSHOT</version>
-			<type>pom</type>
-			<scope>import</scope>
-		</dependency>
-	</dependencies>
-	</dependencyManagement>
 
 	<dependencies>
 		<dependency>
diff --git a/turbine/pom.xml b/turbine/pom.xml
index ccdd2f4..905dd6c 100644
--- a/turbine/pom.xml
+++ b/turbine/pom.xml
@@ -12,9 +12,9 @@
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.1.RELEASE</version>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-starter-parent</artifactId>
+		<version>1.0.1.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -23,18 +23,6 @@
 		<start-class>demo.DemoApplication</start-class>
 		<java.version>1.7</java.version>
 	</properties>
-	
-	<dependencyManagement>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-parent</artifactId>
-			<version>1.0.1.BUILD-SNAPSHOT</version>
-			<type>pom</type>
-			<scope>import</scope>
-		</dependency>
-	</dependencies>
-	</dependencyManagement>
 
 	<dependencies>
 		<dependency>
diff --git a/zuul-proxy-eureka/pom.xml b/zuul-proxy-eureka/pom.xml
index a3da3da..ef8c84a 100644
--- a/zuul-proxy-eureka/pom.xml
+++ b/zuul-proxy-eureka/pom.xml
@@ -12,9 +12,9 @@
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.1.RELEASE</version>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-starter-parent</artifactId>
+		<version>1.0.1.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -24,18 +24,6 @@
 		<java.version>1.7</java.version>
 	</properties>
 	
-	<dependencyManagement>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-parent</artifactId>
-			<version>1.0.1.BUILD-SNAPSHOT</version>
-			<type>pom</type>
-			<scope>import</scope>
-		</dependency>
-	</dependencies>
-	</dependencyManagement>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/zuul-proxy/pom.xml b/zuul-proxy/pom.xml
index 66bc75c..09e036c 100644
--- a/zuul-proxy/pom.xml
+++ b/zuul-proxy/pom.xml
@@ -12,9 +12,9 @@
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.1.RELEASE</version>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-starter-parent</artifactId>
+		<version>1.0.1.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -24,18 +24,6 @@
 		<java.version>1.7</java.version>
 	</properties>
 	
-	<dependencyManagement>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-parent</artifactId>
-			<version>1.0.1.BUILD-SNAPSHOT</version>
-			<type>pom</type>
-			<scope>import</scope>
-		</dependency>
-	</dependencies>
-	</dependencyManagement>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/zuul/pom.xml b/zuul/pom.xml
index 0e1b3cc..ba54835 100644
--- a/zuul/pom.xml
+++ b/zuul/pom.xml
@@ -12,9 +12,9 @@
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.1.RELEASE</version>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-starter-parent</artifactId>
+		<version>1.0.1.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>