From 836181271a7d6a3c3ac9b68caf714d8c0be0cb0e Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@pivotal.io>
Date: Tue, 23 Jun 2020 14:55:32 -0400
Subject: [PATCH] Adding ribbon modules back.  Fixes #555

---
 pom.xml                                        |  2 ++
 spring-cloud-kubernetes-dependencies/pom.xml   | 12 ++++++++++++
 spring-cloud-kubernetes-ribbon/pom.xml         |  2 +-
 spring-cloud-starter-kubernetes-all/pom.xml    |  5 +++++
 spring-cloud-starter-kubernetes-ribbon/pom.xml |  2 +-
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2a221613..fdf3214e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,8 +89,10 @@
 		<module>spring-cloud-kubernetes-core</module>
 		<module>spring-cloud-kubernetes-config</module>
 		<module>spring-cloud-kubernetes-discovery</module>
+		<module>spring-cloud-kubernetes-ribbon</module>
 		<module>spring-cloud-starter-kubernetes</module>
 		<module>spring-cloud-starter-kubernetes-config</module>
+		<module>spring-cloud-starter-kubernetes-ribbon</module>
 		<module>spring-cloud-starter-kubernetes-all</module>
 		<module>spring-cloud-kubernetes-examples</module>
 		<module>spring-cloud-kubernetes-leader</module>
diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
index a059e251..b8368626 100644
--- a/spring-cloud-kubernetes-dependencies/pom.xml
+++ b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -86,6 +86,12 @@
 				<version>${project.version}</version>
 			</dependency>
 
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-kubernetes-ribbon</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+
 			<!-- Own dependencies - Starters -->
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
@@ -99,6 +105,12 @@
 				<version>${project.version}</version>
 			</dependency>
 
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-starter-kubernetes-ribbon</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-starter-kubernetes-all</artifactId>
diff --git a/spring-cloud-kubernetes-ribbon/pom.xml b/spring-cloud-kubernetes-ribbon/pom.xml
index b28f816b..e1604281 100644
--- a/spring-cloud-kubernetes-ribbon/pom.xml
+++ b/spring-cloud-kubernetes-ribbon/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>1.1.4.BUILD-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-all/pom.xml b/spring-cloud-starter-kubernetes-all/pom.xml
index cac51a68..a6f4c53d 100644
--- a/spring-cloud-starter-kubernetes-all/pom.xml
+++ b/spring-cloud-starter-kubernetes-all/pom.xml
@@ -46,6 +46,11 @@
 			<artifactId>spring-cloud-kubernetes-discovery</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-kubernetes-ribbon</artifactId>
+		</dependency>
+
 	</dependencies>
 
 </project>
diff --git a/spring-cloud-starter-kubernetes-ribbon/pom.xml b/spring-cloud-starter-kubernetes-ribbon/pom.xml
index 9d0d65ab..2ccb5dff 100644
--- a/spring-cloud-starter-kubernetes-ribbon/pom.xml
+++ b/spring-cloud-starter-kubernetes-ribbon/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>1.1.4.BUILD-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>