From 48dcdaf17ebb281dbf856de9d25526f87517d84d Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@pivotal.io>
Date: Fri, 15 Feb 2019 11:49:43 -0500
Subject: [PATCH] Fixing starter packaging

---
 spring-cloud-circuitbreaker-dependencies/pom.xml       | 10 ++++++++++
 .../pom.xml                                            |  1 -
 .../src/main/resources/META-INF/spring.provides        |  1 +
 .../pom.xml                                            |  1 -
 .../src/main/resources/META-INF/spring.provides        |  1 +
 5 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-hystrix/src/main/resources/META-INF/spring.provides
 create mode 100644 spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/src/main/resources/META-INF/spring.provides

diff --git a/spring-cloud-circuitbreaker-dependencies/pom.xml b/spring-cloud-circuitbreaker-dependencies/pom.xml
index 57b386f..cad788a 100644
--- a/spring-cloud-circuitbreaker-dependencies/pom.xml
+++ b/spring-cloud-circuitbreaker-dependencies/pom.xml
@@ -53,6 +53,16 @@
                 <artifactId>spring-cloud-circuitbreaker-commons</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-starter-circuitbreaker-resilience4j</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-starter-circuitbreaker-hystrix</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-hystrix/pom.xml b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-hystrix/pom.xml
index a10981c..d61ff1a 100644
--- a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-hystrix/pom.xml
+++ b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-hystrix/pom.xml
@@ -12,7 +12,6 @@
     <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-starter-circuitbreaker-hystrix</artifactId>
     <version>0.0.1.BUILD-SNAPSHOT</version>
-    <packaging>pom</packaging>
 
     <dependencies>
         <dependency>
diff --git a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-hystrix/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-hystrix/src/main/resources/META-INF/spring.provides
new file mode 100644
index 0000000..a1c502e
--- /dev/null
+++ b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-hystrix/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: spring-cloud-circuitbreaker-hystrix
\ No newline at end of file
diff --git a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/pom.xml b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/pom.xml
index 36f6237..330b588 100644
--- a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/pom.xml
+++ b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/pom.xml
@@ -13,7 +13,6 @@
     <artifactId>spring-cloud-starter-circuitbreaker-resilience4j</artifactId>
     <version>0.0.1.BUILD-SNAPSHOT</version>
 
-    <packaging>pom</packaging>
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/src/main/resources/META-INF/spring.provides
new file mode 100644
index 0000000..d68b6ca
--- /dev/null
+++ b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: spring-cloud-circuitbreaker-resilience4j
\ No newline at end of file