From c511440ed9e87b2195f447e3dfd4201a4d8f8dca Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Mon, 25 Sep 2017 17:19:34 -0400
Subject: [PATCH] Remove deprecated starters

fixes gh-1946, gh-2220, gh-2221, gh-2222
---
 spring-cloud-starter-netflix/pom.xml          |  2 --
 .../.jdk8                                     |  0
 .../pom.xml                                   | 29 -------------------
 .../main/resources/META-INF/spring.provides   |  1 -
 .../pom.xml                                   |  4 +--
 5 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-amqp/.jdk8
 delete mode 100644 spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-amqp/pom.xml
 delete mode 100644 spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-amqp/src/main/resources/META-INF/spring.provides

diff --git a/spring-cloud-starter-netflix/pom.xml b/spring-cloud-starter-netflix/pom.xml
index 2601fcd8..76aada70 100644
--- a/spring-cloud-starter-netflix/pom.xml
+++ b/spring-cloud-starter-netflix/pom.xml
@@ -20,8 +20,6 @@
 		<module>spring-cloud-starter-netflix-hystrix-dashboard</module>
 		<module>spring-cloud-starter-netflix-ribbon</module>
 		<module>spring-cloud-starter-netflix-turbine</module>
-		<module>spring-cloud-starter-netflix-spectator</module>
-		<module>spring-cloud-starter-netflix-turbine-amqp</module>
 		<module>spring-cloud-starter-netflix-turbine-stream</module>
 		<module>spring-cloud-starter-netflix-zuul</module>
 		<module>spring-cloud-starter-openfeign</module>
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-amqp/.jdk8 b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-amqp/.jdk8
deleted file mode 100644
index e69de29b..00000000
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-amqp/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-amqp/pom.xml
deleted file mode 100644
index 901b225d..00000000
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-amqp/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<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-netflix</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
-	</parent>
-	<artifactId>spring-cloud-starter-netflix-turbine-amqp</artifactId>
-	<name>Spring Cloud Starter Netflix Turbine AMQP</name>
-	<description>Spring Cloud Starter Netflix Turbine AMQP (deprecated, please use spring-cloud-starter-netflix-turbine-stream)</description>
-	<url>https://projects.spring.io/spring-cloud</url>
-	<organization>
-		<name>Pivotal Software, Inc.</name>
-		<url>https://www.spring.io</url>
-	</organization>
-	<properties>
-		<main.basedir>${basedir}/../../..</main.basedir>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-netflix-turbine-stream</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-amqp/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-amqp/src/main/resources/META-INF/spring.provides
deleted file mode 100644
index e1782585..00000000
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-amqp/src/main/resources/META-INF/spring.provides
+++ /dev/null
@@ -1 +0,0 @@
-provides: spring-cloud-netflix-turbine-amqp
\ No newline at end of file
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-stream/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-stream/pom.xml
index 02194315..bc993e17 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-stream/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-stream/pom.xml
@@ -21,7 +21,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-eureka</artifactId>
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 			<exclusions>
 				<exclusion>
 					<artifactId>spring-boot-starter-tomcat</artifactId>
@@ -35,7 +35,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-archaius</artifactId>
+			<artifactId>spring-cloud-starter-netflix-archaius</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>