From 93398e829a211657f696d7ee1724b5e79418170e Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Mon, 1 Jun 2015 13:30:32 -0600
Subject: [PATCH 1/6] spring-cloud-starter for each module

fixes gh-34
---
 pom.xml                                       | 40 +++++++-
 spring-cloud-consul-bus/pom.xml               | 12 +++
 spring-cloud-consul-config/pom.xml            | 12 +++
 spring-cloud-consul-core/pom.xml              |  5 +
 spring-cloud-consul-discovery/pom.xml         | 19 ++++
 spring-cloud-consul-sample/pom.xml            | 22 +++--
 spring-cloud-starter-consul-bus/pom.xml       | 44 +++++++++
 .../main/resources/META-INF/spring.provides   |  1 +
 spring-cloud-starter-consul-config/pom.xml    | 44 +++++++++
 .../main/resources/META-INF/spring.provides   |  1 +
 spring-cloud-starter-consul-discovery/pom.xml | 92 +++++++++++++++++++
 .../main/resources/META-INF/spring.provides   |  1 +
 spring-cloud-starter-consul-ui/pom.xml        | 40 ++++++++
 .../main/resources/META-INF/spring.provides   |  1 +
 spring-cloud-starter-consul/pom.xml           | 40 ++++++++
 .../main/resources/META-INF/spring.provides   |  1 +
 16 files changed, 360 insertions(+), 15 deletions(-)
 create mode 100644 spring-cloud-starter-consul-bus/pom.xml
 create mode 100644 spring-cloud-starter-consul-bus/src/main/resources/META-INF/spring.provides
 create mode 100644 spring-cloud-starter-consul-config/pom.xml
 create mode 100644 spring-cloud-starter-consul-config/src/main/resources/META-INF/spring.provides
 create mode 100644 spring-cloud-starter-consul-discovery/pom.xml
 create mode 100644 spring-cloud-starter-consul-discovery/src/main/resources/META-INF/spring.provides
 create mode 100644 spring-cloud-starter-consul-ui/pom.xml
 create mode 100644 spring-cloud-starter-consul-ui/src/main/resources/META-INF/spring.provides
 create mode 100644 spring-cloud-starter-consul/pom.xml
 create mode 100644 spring-cloud-starter-consul/src/main/resources/META-INF/spring.provides

diff --git a/pom.xml b/pom.xml
index 2f207b66..2cec6795 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,11 @@
 		<module>spring-cloud-consul-ui</module>
 		<module>spring-cloud-consul-sample</module>
 		<module>spring-cloud-consul-tests</module>
+		<module>spring-cloud-starter-consul-bus</module>
+		<module>spring-cloud-starter-consul-config</module>
+		<module>spring-cloud-starter-consul-discovery</module>
+		<module>spring-cloud-starter-consul-ui</module>
+		<module>spring-cloud-starter-consul</module>
 		<module>docs</module>
 	</modules>
 
@@ -70,27 +75,52 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-consul-core</artifactId>
-				<version>1.0.0.BUILD-SNAPSHOT</version>
+				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-consul-bus</artifactId>
-				<version>1.0.0.BUILD-SNAPSHOT</version>
+				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-consul-config</artifactId>
-				<version>1.0.0.BUILD-SNAPSHOT</version>
+				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-consul-discovery</artifactId>
-				<version>1.0.0.BUILD-SNAPSHOT</version>
+				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-consul-ui</artifactId>
-				<version>1.0.0.BUILD-SNAPSHOT</version>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-starter-consul</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-starter-consul-bus</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-starter-consul-config</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-starter-consul-discovery</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-starter-consul-ui</artifactId>
+				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-consul-bus/pom.xml b/spring-cloud-consul-bus/pom.xml
index dde261d6..9e9c833a 100644
--- a/spring-cloud-consul-bus/pom.xml
+++ b/spring-cloud-consul-bus/pom.xml
@@ -17,13 +17,25 @@
 	</parent>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-consul-core</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-bus</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.ecwid.consul</groupId>
+			<artifactId>consul-api</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml
index 6d7791db..a66beee2 100644
--- a/spring-cloud-consul-config/pom.xml
+++ b/spring-cloud-consul-config/pom.xml
@@ -17,13 +17,25 @@
 	</parent>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.ecwid.consul</groupId>
+			<artifactId>consul-api</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-consul-core</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-context</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml
index c8b43422..b9683ea5 100644
--- a/spring-cloud-consul-core/pom.xml
+++ b/spring-cloud-consul-core/pom.xml
@@ -20,23 +20,28 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-commons</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.ecwid.consul</groupId>
 			<artifactId>consul-api</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<!-- required by com.ecwid.consul but not as a pom dependency -->
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml
index 6373c8be..e701cd9e 100644
--- a/spring-cloud-consul-discovery/pom.xml
+++ b/spring-cloud-consul-discovery/pom.xml
@@ -21,33 +21,50 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-consul-core</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-commons</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.ecwid.consul</groupId>
+			<artifactId>consul-api</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-netflix-core</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.netflix.archaius</groupId>
 			<artifactId>archaius-core</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>commons-configuration</groupId>
 			<artifactId>commons-configuration</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.netflix.ribbon</groupId>
 			<artifactId>ribbon</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.netflix.ribbon</groupId>
 			<artifactId>ribbon-core</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.netflix.ribbon</groupId>
 			<artifactId>ribbon-httpclient</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.netflix.ribbon</groupId>
 			<artifactId>ribbon-loadbalancer</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
@@ -63,10 +80,12 @@
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
+			<optional>true</optional>
 		</dependency>
 	</dependencies>
 
diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml
index faeb4fdb..dd26dbaf 100644
--- a/spring-cloud-consul-sample/pom.xml
+++ b/spring-cloud-consul-sample/pom.xml
@@ -21,7 +21,7 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<version>1.2.1.RELEASE</version>
+				<version>1.2.3.RELEASE</version>
 				<executions>
 					<execution>
 						<goals>
@@ -41,33 +41,35 @@
 	</build>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-consul-config</artifactId>
+			<artifactId>spring-cloud-starter-consul</artifactId>
+		</dependency>
+		<!--<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-consul-config</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-consul-discovery</artifactId>
+			<artifactId>spring-cloud-starter-consul-discovery</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-consul-bus</artifactId>
+			<artifactId>spring-cloud-starter-consul-bus</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-consul-ui</artifactId>
-		</dependency>
+			<artifactId>spring-cloud-starter-consul-ui</artifactId>
+		</dependency>-->
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
+			<!-- Only needed at compile time -->
+			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 
diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml
new file mode 100644
index 00000000..6c4dfd1b
--- /dev/null
+++ b/spring-cloud-starter-consul-bus/pom.xml
@@ -0,0 +1,44 @@
+<?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-consul</artifactId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>spring-cloud-starter-consul-bus</artifactId>
+	<name>Spring Cloud Starter Consul Bus</name>
+	<description>Spring Cloud Starter Consul Bus</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-consul-bus</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-consul-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-bus</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.ecwid.consul</groupId>
+			<artifactId>consul-api</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-cloud-starter-consul-bus/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-consul-bus/src/main/resources/META-INF/spring.provides
new file mode 100644
index 00000000..6583dfc2
--- /dev/null
+++ b/spring-cloud-starter-consul-bus/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: spring-cloud-consul-core, consul-api, spring-cloud-consul-bus
\ No newline at end of file
diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml
new file mode 100644
index 00000000..46bd2a0f
--- /dev/null
+++ b/spring-cloud-starter-consul-config/pom.xml
@@ -0,0 +1,44 @@
+<?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-consul</artifactId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>spring-cloud-starter-consul-config</artifactId>
+	<name>Spring Cloud Starter Consul Config</name>
+	<description>Spring Cloud Starter Consul Config</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-consul-config</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.ecwid.consul</groupId>
+			<artifactId>consul-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-consul-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-context</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-cloud-starter-consul-config/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-consul-config/src/main/resources/META-INF/spring.provides
new file mode 100644
index 00000000..3d862baa
--- /dev/null
+++ b/spring-cloud-starter-consul-config/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: spring-cloud-consul-core, consul-api, spring-cloud-consul-config
\ No newline at end of file
diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml
new file mode 100644
index 00000000..1d730881
--- /dev/null
+++ b/spring-cloud-starter-consul-discovery/pom.xml
@@ -0,0 +1,92 @@
+<?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-consul</artifactId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>spring-cloud-starter-consul-discovery</artifactId>
+	<name>spring-cloud-starter-consul-discovery</name>
+	<description>Spring Cloud Starter Consul Discovery</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-consul-discovery</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-commons</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.ecwid.consul</groupId>
+			<artifactId>consul-api</artifactId>
+		</dependency>
+		<!-- required by com.ecwid.consul but not as a pom dependency -->
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-consul-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-netflix-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.archaius</groupId>
+			<artifactId>archaius-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>commons-configuration</groupId>
+			<artifactId>commons-configuration</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.ribbon</groupId>
+			<artifactId>ribbon</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.ribbon</groupId>
+			<artifactId>ribbon-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.ribbon</groupId>
+			<artifactId>ribbon-httpclient</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.ribbon</groupId>
+			<artifactId>ribbon-loadbalancer</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<!-- Only needed at compile time -->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-cloud-starter-consul-discovery/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-consul-discovery/src/main/resources/META-INF/spring.provides
new file mode 100644
index 00000000..9952539f
--- /dev/null
+++ b/spring-cloud-starter-consul-discovery/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: spring-cloud-consul-core, consul-api, spring-cloud-consul-discovery
\ No newline at end of file
diff --git a/spring-cloud-starter-consul-ui/pom.xml b/spring-cloud-starter-consul-ui/pom.xml
new file mode 100644
index 00000000..485b7415
--- /dev/null
+++ b/spring-cloud-starter-consul-ui/pom.xml
@@ -0,0 +1,40 @@
+<?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-consul</artifactId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>spring-cloud-starter-consul-ui</artifactId>
+	<name>Spring Cloud Starter Consul UI</name>
+	<description>Spring Cloud Starter Consul UI</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-consul-ui</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-consul-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-zuul</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-cloud-starter-consul-ui/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-consul-ui/src/main/resources/META-INF/spring.provides
new file mode 100644
index 00000000..9d157263
--- /dev/null
+++ b/spring-cloud-starter-consul-ui/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: spring-cloud-consul-core, consul-api, spring-cloud-consul-ui
\ No newline at end of file
diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml
new file mode 100644
index 00000000..4154bc6b
--- /dev/null
+++ b/spring-cloud-starter-consul/pom.xml
@@ -0,0 +1,40 @@
+<?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-consul</artifactId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>spring-cloud-starter-consul</artifactId>
+	<name>Spring Cloud Starter Consul</name>
+	<description>Spring Cloud Starter Consul</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-consul-bus</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-consul-config</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-consul-discovery</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-consul-ui</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-cloud-starter-consul/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-consul/src/main/resources/META-INF/spring.provides
new file mode 100644
index 00000000..281e1913
--- /dev/null
+++ b/spring-cloud-starter-consul/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: spring-cloud-consul-core, consul-api, spring-cloud-consul-bus, spring-cloud-consul-config, spring-cloud-consul-discovery, spring-cloud-consul-ui
\ No newline at end of file

From f2d77461b6dc6853920bb305c68876b0a978e48b Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Mon, 1 Jun 2015 13:32:41 -0600
Subject: [PATCH 2/6] added actuator test dependency

---
 spring-cloud-consul-discovery/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml
index e701cd9e..2ffa3209 100644
--- a/spring-cloud-consul-discovery/pom.xml
+++ b/spring-cloud-consul-discovery/pom.xml
@@ -87,6 +87,11 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
 
 </project>

From f5cc92f33ceaa24ae8ab150a6e9acd06d56dc7fb Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Mon, 1 Jun 2015 13:36:56 -0600
Subject: [PATCH 3/6] remove s-c-consul-tests

---
 pom.xml                                       |  1 -
 spring-cloud-consul-tests/pom.xml             | 50 ---------------
 spring-cloud-consul-tests/run-server.sh       |  1 -
 .../consul/sidecar/ZuulApplicationTests.java  | 61 -------------------
 .../src/test/resources/application.yml        | 21 -------
 .../src/test/resources/bootstrap.yml          |  7 ---
 .../src/test/resources/health.json            |  1 -
 7 files changed, 142 deletions(-)
 delete mode 100644 spring-cloud-consul-tests/pom.xml
 delete mode 100755 spring-cloud-consul-tests/run-server.sh
 delete mode 100644 spring-cloud-consul-tests/src/test/java/org/springframework/cloud/consul/sidecar/ZuulApplicationTests.java
 delete mode 100644 spring-cloud-consul-tests/src/test/resources/application.yml
 delete mode 100644 spring-cloud-consul-tests/src/test/resources/bootstrap.yml
 delete mode 100644 spring-cloud-consul-tests/src/test/resources/health.json

diff --git a/pom.xml b/pom.xml
index 2cec6795..966539dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,6 @@
 		<module>spring-cloud-consul-bus</module>
 		<module>spring-cloud-consul-ui</module>
 		<module>spring-cloud-consul-sample</module>
-		<module>spring-cloud-consul-tests</module>
 		<module>spring-cloud-starter-consul-bus</module>
 		<module>spring-cloud-starter-consul-config</module>
 		<module>spring-cloud-starter-consul-discovery</module>
diff --git a/spring-cloud-consul-tests/pom.xml b/spring-cloud-consul-tests/pom.xml
deleted file mode 100644
index 13f9e267..00000000
--- a/spring-cloud-consul-tests/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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>
-
-	<artifactId>spring-cloud-consul-tests</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Cloud Consul Tests</name>
-	<description>Spring Cloud Consul Tests</description>
-
-	<parent>
-		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-consul</artifactId>
-		<version>1.0.0.BUILD-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-consul-config</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-consul-discovery</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<!-- Only needed at compile time -->
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-	</dependencies>
-
-</project>
diff --git a/spring-cloud-consul-tests/run-server.sh b/spring-cloud-consul-tests/run-server.sh
deleted file mode 100755
index 8bacc042..00000000
--- a/spring-cloud-consul-tests/run-server.sh
+++ /dev/null
@@ -1 +0,0 @@
-python -m SimpleHTTPServer
diff --git a/spring-cloud-consul-tests/src/test/java/org/springframework/cloud/consul/sidecar/ZuulApplicationTests.java b/spring-cloud-consul-tests/src/test/java/org/springframework/cloud/consul/sidecar/ZuulApplicationTests.java
deleted file mode 100644
index 9662404d..00000000
--- a/spring-cloud-consul-tests/src/test/java/org/springframework/cloud/consul/sidecar/ZuulApplicationTests.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2013-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.sidecar;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
-import org.springframework.context.annotation.Bean;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = ZuulApplicationTests.ZuulApplication.class)
-@IntegrationTest("server.port=0")
-@WebAppConfiguration
-public class ZuulApplicationTests {
-
-	@Test
-	@Ignore
-	public void contextLoads() {
-	}
-
-	@SpringBootApplication
-	@EnableCircuitBreaker
-	@EnableDiscoveryClient
-	@EnableZuulProxy
-	public static class ZuulApplication {
-
-		@Bean
-		public InMemoryMetricRepository inMemoryMetricRepository() {
-			return new InMemoryMetricRepository();
-		}
-
-		public static void main(String[] args) {
-			SpringApplication.run(ZuulApplication.class, args);
-		}
-
-	}
-}
diff --git a/spring-cloud-consul-tests/src/test/resources/application.yml b/spring-cloud-consul-tests/src/test/resources/application.yml
deleted file mode 100644
index ce295c8c..00000000
--- a/spring-cloud-consul-tests/src/test/resources/application.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-server:
-  port: 5678
-spring:
-  application:
-    name: sidecarTest
-
-sidecar:
-  port: 8000
-  health-uri: http://localhost:8000/src/test/resources/health.json
-
-ribbon:
-  ServerListRefreshInterval: 5000
-
-endpoints:
-  refresh:
-    enabled: true
-  shutdown:
-    enabled: true
-  health:
-    sensitive: false
-
diff --git a/spring-cloud-consul-tests/src/test/resources/bootstrap.yml b/spring-cloud-consul-tests/src/test/resources/bootstrap.yml
deleted file mode 100644
index bbd58928..00000000
--- a/spring-cloud-consul-tests/src/test/resources/bootstrap.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-spring:
-  #application:
-  #  name: sideCarTest
-  cloud:
-    config:
-      username: user
-      password: password
diff --git a/spring-cloud-consul-tests/src/test/resources/health.json b/spring-cloud-consul-tests/src/test/resources/health.json
deleted file mode 100644
index 41f3615e..00000000
--- a/spring-cloud-consul-tests/src/test/resources/health.json
+++ /dev/null
@@ -1 +0,0 @@
-{"status":"UP"}
\ No newline at end of file

From 6f1fe48448d1491fe06fcb0a530a489e4ba20b4d Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Mon, 1 Jun 2015 20:19:47 -0600
Subject: [PATCH 4/6] add missing httpcore dependency

fixes gh-37
---
 pom.xml                          | 5 +++++
 spring-cloud-consul-core/pom.xml | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/pom.xml b/pom.xml
index 966539dc..5edbcde8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,6 +184,11 @@
 				<artifactId>httpclient</artifactId>
 				<version>${httpclient.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.httpcomponents</groupId>
+				<artifactId>httpcore</artifactId>
+				<version>${httpclient.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-starter-zuul</artifactId>
diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml
index b9683ea5..e805bdf4 100644
--- a/spring-cloud-consul-core/pom.xml
+++ b/spring-cloud-consul-core/pom.xml
@@ -43,6 +43,14 @@
 			<artifactId>gson</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>

From d28e7f0230bc4dc1cf611385e7ebf57ae75910b0 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Mon, 1 Jun 2015 20:31:15 -0600
Subject: [PATCH 5/6] add missing httpcore dependency to starters

---
 spring-cloud-consul-core/pom.xml              |  2 ++
 spring-cloud-consul-discovery/pom.xml         | 16 ++++++++++++++++
 spring-cloud-starter-consul-bus/pom.xml       | 13 +++++++++++++
 spring-cloud-starter-consul-config/pom.xml    | 13 +++++++++++++
 spring-cloud-starter-consul-discovery/pom.xml |  8 ++++++++
 5 files changed, 52 insertions(+)

diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml
index e805bdf4..d8482696 100644
--- a/spring-cloud-consul-core/pom.xml
+++ b/spring-cloud-consul-core/pom.xml
@@ -46,10 +46,12 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpcore</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml
index 2ffa3209..1b545d09 100644
--- a/spring-cloud-consul-discovery/pom.xml
+++ b/spring-cloud-consul-discovery/pom.xml
@@ -31,6 +31,22 @@
 			<artifactId>consul-api</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<!-- required by com.ecwid.consul but not as a pom dependency -->
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-netflix-core</artifactId>
diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml
index 6c4dfd1b..df0b18cd 100644
--- a/spring-cloud-starter-consul-bus/pom.xml
+++ b/spring-cloud-starter-consul-bus/pom.xml
@@ -40,5 +40,18 @@
 			<groupId>com.ecwid.consul</groupId>
 			<artifactId>consul-api</artifactId>
 		</dependency>
+		<!-- required by com.ecwid.consul but not as a pom dependency -->
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml
index 46bd2a0f..fc37b904 100644
--- a/spring-cloud-starter-consul-config/pom.xml
+++ b/spring-cloud-starter-consul-config/pom.xml
@@ -32,6 +32,19 @@
 			<groupId>com.ecwid.consul</groupId>
 			<artifactId>consul-api</artifactId>
 		</dependency>
+		<!-- required by com.ecwid.consul but not as a pom dependency -->
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-consul-core</artifactId>
diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml
index 1d730881..b40a1fe2 100644
--- a/spring-cloud-starter-consul-discovery/pom.xml
+++ b/spring-cloud-starter-consul-discovery/pom.xml
@@ -42,6 +42,14 @@
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-consul-core</artifactId>

From e78dca0762dfff5f01df15945bb44f90396b0690 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Mon, 1 Jun 2015 21:00:47 -0600
Subject: [PATCH 6/6] move s-c-s-consul to s-c-s-consul-all, s-c-s-consul now
 contains common consul dependencies for each starter

---
 pom.xml                                       |  8 +++-
 spring-cloud-consul-sample/pom.xml            |  2 +-
 spring-cloud-starter-consul-all/pom.xml       | 40 +++++++++++++++++++
 .../main/resources/META-INF/spring.provides   |  1 +
 spring-cloud-starter-consul-bus/pom.xml       | 25 +-----------
 .../main/resources/META-INF/spring.provides   |  2 +-
 spring-cloud-starter-consul-config/pom.xml    | 25 +-----------
 .../main/resources/META-INF/spring.provides   |  2 +-
 spring-cloud-starter-consul-discovery/pom.xml | 33 ++-------------
 .../main/resources/META-INF/spring.provides   |  2 +-
 .../main/resources/META-INF/spring.provides   |  2 +-
 spring-cloud-starter-consul/pom.xml           | 25 +++++++++---
 .../main/resources/META-INF/spring.provides   |  2 +-
 13 files changed, 81 insertions(+), 88 deletions(-)
 create mode 100644 spring-cloud-starter-consul-all/pom.xml
 create mode 100644 spring-cloud-starter-consul-all/src/main/resources/META-INF/spring.provides

diff --git a/pom.xml b/pom.xml
index 5edbcde8..5cfe84b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,11 +33,12 @@
 		<module>spring-cloud-consul-bus</module>
 		<module>spring-cloud-consul-ui</module>
 		<module>spring-cloud-consul-sample</module>
+		<module>spring-cloud-starter-consul</module>
 		<module>spring-cloud-starter-consul-bus</module>
 		<module>spring-cloud-starter-consul-config</module>
 		<module>spring-cloud-starter-consul-discovery</module>
 		<module>spring-cloud-starter-consul-ui</module>
-		<module>spring-cloud-starter-consul</module>
+		<module>spring-cloud-starter-consul-all</module>
 		<module>docs</module>
 	</modules>
 
@@ -121,6 +122,11 @@
 				<artifactId>spring-cloud-starter-consul-ui</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-starter-consul-all</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-commons</artifactId>
diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml
index dd26dbaf..048c28b4 100644
--- a/spring-cloud-consul-sample/pom.xml
+++ b/spring-cloud-consul-sample/pom.xml
@@ -47,7 +47,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-consul</artifactId>
+			<artifactId>spring-cloud-starter-consul-all</artifactId>
 		</dependency>
 		<!--<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml
new file mode 100644
index 00000000..2f2aa9cf
--- /dev/null
+++ b/spring-cloud-starter-consul-all/pom.xml
@@ -0,0 +1,40 @@
+<?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-consul</artifactId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>spring-cloud-starter-consul-all</artifactId>
+	<name>Spring Cloud Starter Consul All</name>
+	<description>Spring Cloud Starter Consul All</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-consul-bus</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-consul-config</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-consul-discovery</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-consul-ui</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-cloud-starter-consul-all/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-consul-all/src/main/resources/META-INF/spring.provides
new file mode 100644
index 00000000..18c222fc
--- /dev/null
+++ b/spring-cloud-starter-consul-all/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: spring-cloud-consul-bus, spring-cloud-consul-config, spring-cloud-consul-discovery, spring-cloud-consul-ui
\ No newline at end of file
diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml
index df0b18cd..b19b6bb2 100644
--- a/spring-cloud-starter-consul-bus/pom.xml
+++ b/spring-cloud-starter-consul-bus/pom.xml
@@ -22,36 +22,15 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-consul-bus</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
+			<artifactId>spring-cloud-starter-consul</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-consul-core</artifactId>
+			<artifactId>spring-cloud-consul-bus</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-bus</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.ecwid.consul</groupId>
-			<artifactId>consul-api</artifactId>
-		</dependency>
-		<!-- required by com.ecwid.consul but not as a pom dependency -->
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpcore</artifactId>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/spring-cloud-starter-consul-bus/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-consul-bus/src/main/resources/META-INF/spring.provides
index 6583dfc2..7e37bc1f 100644
--- a/spring-cloud-starter-consul-bus/src/main/resources/META-INF/spring.provides
+++ b/spring-cloud-starter-consul-bus/src/main/resources/META-INF/spring.provides
@@ -1 +1 @@
-provides: spring-cloud-consul-core, consul-api, spring-cloud-consul-bus
\ No newline at end of file
+provides: spring-cloud-consul-bus
\ No newline at end of file
diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml
index fc37b904..543068dd 100644
--- a/spring-cloud-starter-consul-config/pom.xml
+++ b/spring-cloud-starter-consul-config/pom.xml
@@ -22,32 +22,11 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-consul-config</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.ecwid.consul</groupId>
-			<artifactId>consul-api</artifactId>
-		</dependency>
-		<!-- required by com.ecwid.consul but not as a pom dependency -->
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpcore</artifactId>
+			<artifactId>spring-cloud-starter-consul</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-consul-core</artifactId>
+			<artifactId>spring-cloud-consul-config</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-starter-consul-config/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-consul-config/src/main/resources/META-INF/spring.provides
index 3d862baa..76b15afb 100644
--- a/spring-cloud-starter-consul-config/src/main/resources/META-INF/spring.provides
+++ b/spring-cloud-starter-consul-config/src/main/resources/META-INF/spring.provides
@@ -1 +1 @@
-provides: spring-cloud-consul-core, consul-api, spring-cloud-consul-config
\ No newline at end of file
+provides: spring-cloud-consul-config
\ No newline at end of file
diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml
index b40a1fe2..675c9e88 100644
--- a/spring-cloud-starter-consul-discovery/pom.xml
+++ b/spring-cloud-starter-consul-discovery/pom.xml
@@ -21,39 +21,14 @@
 		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-consul</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-consul-discovery</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-commons</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.ecwid.consul</groupId>
-			<artifactId>consul-api</artifactId>
-		</dependency>
-		<!-- required by com.ecwid.consul but not as a pom dependency -->
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpcore</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-consul-core</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-netflix-core</artifactId>
diff --git a/spring-cloud-starter-consul-discovery/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-consul-discovery/src/main/resources/META-INF/spring.provides
index 9952539f..85fed12c 100644
--- a/spring-cloud-starter-consul-discovery/src/main/resources/META-INF/spring.provides
+++ b/spring-cloud-starter-consul-discovery/src/main/resources/META-INF/spring.provides
@@ -1 +1 @@
-provides: spring-cloud-consul-core, consul-api, spring-cloud-consul-discovery
\ No newline at end of file
+provides: spring-cloud-consul-discovery
\ No newline at end of file
diff --git a/spring-cloud-starter-consul-ui/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-consul-ui/src/main/resources/META-INF/spring.provides
index 9d157263..e5fe9b5e 100644
--- a/spring-cloud-starter-consul-ui/src/main/resources/META-INF/spring.provides
+++ b/spring-cloud-starter-consul-ui/src/main/resources/META-INF/spring.provides
@@ -1 +1 @@
-provides: spring-cloud-consul-core, consul-api, spring-cloud-consul-ui
\ No newline at end of file
+provides: spring-cloud-consul-ui
\ No newline at end of file
diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml
index 4154bc6b..e4b497b9 100644
--- a/spring-cloud-starter-consul/pom.xml
+++ b/spring-cloud-starter-consul/pom.xml
@@ -21,20 +21,33 @@
 	</properties>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-consul-bus</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-consul-config</artifactId>
+			<artifactId>spring-cloud-commons</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-consul-discovery</artifactId>
+			<artifactId>spring-cloud-consul-core</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-consul-ui</artifactId>
+			<groupId>com.ecwid.consul</groupId>
+			<artifactId>consul-api</artifactId>
+		</dependency>
+		<!-- required by com.ecwid.consul but not as a pom dependency -->
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/spring-cloud-starter-consul/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-consul/src/main/resources/META-INF/spring.provides
index 281e1913..174eee93 100644
--- a/spring-cloud-starter-consul/src/main/resources/META-INF/spring.provides
+++ b/spring-cloud-starter-consul/src/main/resources/META-INF/spring.provides
@@ -1 +1 @@
-provides: spring-cloud-consul-core, consul-api, spring-cloud-consul-bus, spring-cloud-consul-config, spring-cloud-consul-discovery, spring-cloud-consul-ui
\ No newline at end of file
+provides: spring-cloud-consul-core, consul-api
\ No newline at end of file