From 44a42ad6f46b81035782618bd5fce814ada4640c Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Wed, 18 Mar 2015 13:31:26 +0000
Subject: [PATCH] Remove config-client from spring-cloud-starter

And add separate starter. Some of the integration test samples
now break, but they can be fixed by adding back the dependencies
using the old starter.

Fixes gh-16
---
 pom.xml                                       |  1 +
 spring-cloud-starter-config/pom.xml           | 38 +++++++++++++++++++
 .../main/resources/META-INF/spring.provides   |  1 +
 spring-cloud-starter-eureka/pom.xml           | 17 ++++++---
 spring-cloud-starter-parent/pom.xml           |  5 +++
 spring-cloud-starter/pom.xml                  | 10 ++---
 .../main/resources/META-INF/spring.provides   |  2 +-
 7 files changed, 61 insertions(+), 13 deletions(-)
 create mode 100644 spring-cloud-starter-config/pom.xml
 create mode 100644 spring-cloud-starter-config/src/main/resources/META-INF/spring.provides

diff --git a/pom.xml b/pom.xml
index 3c08ce9..572c1c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,7 @@
 	<modules>
 		<module>spring-cloud-starter-parent</module>
 		<module>spring-cloud-starter</module>
+		<module>spring-cloud-starter-config</module>
         <module>spring-cloud-starter-bus-amqp</module>
         <module>spring-cloud-starter-cloudfoundry</module>
 		<module>spring-cloud-starter-eureka</module>
diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml
new file mode 100644
index 0000000..f428676
--- /dev/null
+++ b/spring-cloud-starter-config/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-starter-parent</artifactId>
+		<version>1.0.1.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-cloud-starter-parent</relativePath>
+	</parent>
+	<artifactId>spring-cloud-starter-config</artifactId>
+	<name>spring-cloud-starter-config</name>
+	<description>Spring Cloud Starter</description>
+	<url>http://projects.spring.io/spring-cloud</url>
+	<organization>
+		<name>Pivotal Software, Inc.</name>
+		<url>http://www.spring.io</url>
+	</organization>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-config-client</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<!-- Only needed at compile time -->
+			<scope>compile</scope>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-cloud-starter-config/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-config/src/main/resources/META-INF/spring.provides
new file mode 100644
index 0000000..3628be6
--- /dev/null
+++ b/spring-cloud-starter-config/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: spring-cloud-config-client
\ No newline at end of file
diff --git a/spring-cloud-starter-eureka/pom.xml b/spring-cloud-starter-eureka/pom.xml
index 1326ac5..3f235e8 100644
--- a/spring-cloud-starter-eureka/pom.xml
+++ b/spring-cloud-starter-eureka/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
@@ -19,6 +20,12 @@
 		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
 	<dependencies>
+		<dependency>
+			<!-- You actually can't use Eureka as a client unless you register so 
+				it has to be a webapp -->
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter</artifactId>
@@ -35,10 +42,10 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-ribbon</artifactId>
 		</dependency>
-        <dependency>
-            <groupId>com.netflix.ribbon</groupId>
-            <artifactId>ribbon-eureka</artifactId>
-        </dependency>
+		<dependency>
+			<groupId>com.netflix.ribbon</groupId>
+			<artifactId>ribbon-eureka</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
 			<artifactId>xstream</artifactId>
diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml
index f7970dc..c3491cb 100644
--- a/spring-cloud-starter-parent/pom.xml
+++ b/spring-cloud-starter-parent/pom.xml
@@ -66,6 +66,11 @@
 				<artifactId>spring-cloud-starter-bus-amqp</artifactId>
 				<version>1.0.1.BUILD-SNAPSHOT</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-starter-config</artifactId>
+				<version>1.0.1.BUILD-SNAPSHOT</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-starter-turbine-amqp</artifactId>
diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml
index 7bfeab5..4813e9b 100644
--- a/spring-cloud-starter/pom.xml
+++ b/spring-cloud-starter/pom.xml
@@ -20,13 +20,9 @@
 	</properties>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-config-client</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-		</dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
 		<dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-commons</artifactId>
diff --git a/spring-cloud-starter/src/main/resources/META-INF/spring.provides b/spring-cloud-starter/src/main/resources/META-INF/spring.provides
index 3628be6..4737480 100644
--- a/spring-cloud-starter/src/main/resources/META-INF/spring.provides
+++ b/spring-cloud-starter/src/main/resources/META-INF/spring.provides
@@ -1 +1 @@
-provides: spring-cloud-config-client
\ No newline at end of file
+provides: spring-cloud-commons
\ No newline at end of file