From 23868f35b794d075e4dc2d7207ba26657dade262 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Thu, 20 Aug 2015 11:53:33 +0100
Subject: [PATCH] Add starters

---
 pom.xml                                       | 70 +++++++------------
 spring-cloud-sleuth-core/pom.xml              |  5 ++
 spring-cloud-sleuth-zipkin/pom.xml            |  8 ---
 spring-cloud-starter-sleuth/pom.xml           | 41 +++++++++++
 .../main/resources/META-INF/spring.provides   |  1 +
 spring-cloud-starter-zipkin/pom.xml           | 27 +++++++
 .../main/resources/META-INF/spring.provides   |  1 +
 7 files changed, 100 insertions(+), 53 deletions(-)
 create mode 100644 spring-cloud-starter-sleuth/pom.xml
 create mode 100644 spring-cloud-starter-sleuth/src/main/resources/META-INF/spring.provides
 create mode 100644 spring-cloud-starter-zipkin/pom.xml
 create mode 100644 spring-cloud-starter-zipkin/src/main/resources/META-INF/spring.provides

diff --git a/pom.xml b/pom.xml
index 7342cdb50..b6f0853ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,8 @@
 		<module>spring-cloud-sleuth-core</module>
 		<module>spring-cloud-sleuth-zipkin</module>
 		<module>spring-cloud-sleuth-samples</module>
+		<module>spring-cloud-starter-sleuth</module>
+		<module>spring-cloud-starter-zipkin</module>
 		<module>docs</module>
 	</modules>
 
@@ -72,6 +74,18 @@
 
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-netflix</artifactId>
+				<version>${spring-cloud-netflix.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.integration</groupId>
+				<artifactId>spring-integration-core</artifactId>
+				<version>${spring-integration.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-sleuth-core</artifactId>
@@ -82,6 +96,16 @@
 				<artifactId>spring-cloud-sleuth-zipkin</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-starter-zipkin</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-starter-sleuth</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.github.kristofa</groupId>
 				<artifactId>brave-client</artifactId>
@@ -123,48 +147,6 @@
 				<artifactId>flume-zipkin-metrics-sink</artifactId>
 				<version>${brave.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>com.google.guava</groupId>
-				<artifactId>guava</artifactId>
-				<version>18.0</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-lang</groupId>
-				<artifactId>commons-lang</artifactId>
-				<version>2.5</version>
-			</dependency>
-			<dependency>
-				<groupId>io.reactivex</groupId>
-				<artifactId>rxjava</artifactId>
-				<version>1.0.10</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-zuul</artifactId>
-				<version>${spring-cloud-netflix.version}</version>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-feign</artifactId>
-				<version>${spring-cloud-netflix.version}</version>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.hystrix</groupId>
-				<artifactId>hystrix-core</artifactId>
-				<version>1.4.5</version>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.zuul</groupId>
-				<artifactId>zuul-core</artifactId>
-				<version>1.0.28</version>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.feign</groupId>
-				<artifactId>feign-core</artifactId>
-				<version>8.7.1</version>
-			</dependency>
 			<dependency>
 				<groupId>org.aspectj</groupId>
 				<artifactId>aspectjrt</artifactId>
@@ -203,13 +185,11 @@
 			<dependency>
 				<groupId>org.hamcrest</groupId>
 				<artifactId>hamcrest-core</artifactId>
-				<version>1.3</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.codehaus.groovy</groupId>
-				<artifactId>groovy-all</artifactId>
-				<version>2.4.3</version>
+				<artifactId>groovy</artifactId>
 				<scope>test</scope>
 			</dependency>
 		</dependencies>
diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml
index 2862b9ca2..9a434aa66 100644
--- a/spring-cloud-sleuth-core/pom.xml
+++ b/spring-cloud-sleuth-core/pom.xml
@@ -58,6 +58,10 @@
 			<artifactId>spring-integration-core</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.netflix.hystrix</groupId>
 			<artifactId>hystrix-core</artifactId>
@@ -109,6 +113,7 @@
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
 			<version>2.1.0</version>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 
diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml
index ed657a2e1..8cffeb165 100644
--- a/spring-cloud-sleuth-zipkin/pom.xml
+++ b/spring-cloud-sleuth-zipkin/pom.xml
@@ -33,10 +33,6 @@
 	</build>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-sleuth-core</artifactId>
@@ -63,10 +59,6 @@
 			<groupId>com.github.kristofa</groupId>
 			<artifactId>brave-impl-spring</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.github.kristofa</groupId>
-			<artifactId>brave-tracefilters</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>com.github.kristofa</groupId>
 			<artifactId>brave-zipkin-spancollector</artifactId>
diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml
new file mode 100644
index 000000000..89e28b5ec
--- /dev/null
+++ b/spring-cloud-starter-sleuth/pom.xml
@@ -0,0 +1,41 @@
+<?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-sleuth</artifactId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>spring-cloud-starter-sleuth</artifactId>
+	<name>spring-cloud-starter-sleuth</name>
+	<description>Spring Cloud Starter</description>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter</artifactId>
+		</dependency>
+		<dependency>
+			<!-- TODO: maybe this should be optional -->
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<!-- TODO: maybe this should be optional -->
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-aop</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-sleuth-core</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-cloud-starter-sleuth/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-sleuth/src/main/resources/META-INF/spring.provides
new file mode 100644
index 000000000..aa6015d66
--- /dev/null
+++ b/spring-cloud-starter-sleuth/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: spring-cloud-sleuth-core
\ No newline at end of file
diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml
new file mode 100644
index 000000000..d8f1c0bd4
--- /dev/null
+++ b/spring-cloud-starter-zipkin/pom.xml
@@ -0,0 +1,27 @@
+<?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-sleuth</artifactId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>spring-cloud-starter-zipkin</artifactId>
+	<name>spring-cloud-starter-zipkin</name>
+	<description>Spring Cloud Starter</description>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-sleuth</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-sleuth-zipkin</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-cloud-starter-zipkin/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-zipkin/src/main/resources/META-INF/spring.provides
new file mode 100644
index 000000000..3dc45a036
--- /dev/null
+++ b/spring-cloud-starter-zipkin/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: spring-platform-netflix-core, eureka-client
\ No newline at end of file