Remove unneeded hystrix-contrib intermediate project

Netflix · Jan 9, 2015 · 0f8e794 · 0f8e794
1 parent 0ef516e
commit 0f8e794
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/hystrix-examples-webapp/build.gradle b/hystrix-examples-webapp/build.gradle
@@ -4,8 +4,8 @@ apply plugin: 'jetty'
 dependencies {
     compile project(':hystrix-core')
     compile project(':hystrix-examples')
-    compile project(':hystrix-contrib:hystrix-request-servlet')
-    compile project(':hystrix-contrib:hystrix-metrics-event-stream')
+    compile project(':hystrix-request-servlet')
+    compile project(':hystrix-metrics-event-stream')
 }
 
 jettyRun {

diff --git a/settings.gradle b/settings.gradle
@@ -2,13 +2,23 @@ rootProject.name='hystrix'
 include 'hystrix-core', \
 'hystrix-examples', \
 'hystrix-examples-webapp', \
-'hystrix-contrib:hystrix-clj', \
-'hystrix-contrib:hystrix-request-servlet', \
-'hystrix-contrib:hystrix-servo-metrics-publisher', \
-'hystrix-contrib:hystrix-metrics-event-stream', \
-'hystrix-contrib:hystrix-rx-netty-metrics-stream', \
-'hystrix-contrib:hystrix-codahale-metrics-publisher', \
-'hystrix-contrib:hystrix-yammer-metrics-publisher', \
-'hystrix-contrib:hystrix-network-auditor-agent', \
-'hystrix-contrib:hystrix-javanica', \
+'hystrix-contrib/hystrix-clj', \
+'hystrix-contrib/hystrix-request-servlet', \
+'hystrix-contrib/hystrix-servo-metrics-publisher', \
+'hystrix-contrib/hystrix-metrics-event-stream', \
+'hystrix-contrib/hystrix-rx-netty-metrics-stream', \
+'hystrix-contrib/hystrix-codahale-metrics-publisher', \
+'hystrix-contrib/hystrix-yammer-metrics-publisher', \
+'hystrix-contrib/hystrix-network-auditor-agent', \
+'hystrix-contrib/hystrix-javanica', \
 'hystrix-dashboard'
+
+project(':hystrix-contrib/hystrix-clj').name = 'hystrix-clj'
+project(':hystrix-contrib/hystrix-request-servlet').name = 'hystrix-request-servlet'
+project(':hystrix-contrib/hystrix-servo-metrics-publisher').name = 'hystrix-servo-metrics-publisher'
+project(':hystrix-contrib/hystrix-metrics-event-stream').name = 'hystrix-metrics-event-stream'
+project(':hystrix-contrib/hystrix-rx-netty-metrics-stream').name = 'hystrix-rx-netty-metrics-stream'
+project(':hystrix-contrib/hystrix-codahale-metrics-publisher').name = 'hystrix-codahale-metrics-publisher'
+project(':hystrix-contrib/hystrix-yammer-metrics-publisher').name = 'hystrix-yammer-metrics-publisher'
+project(':hystrix-contrib/hystrix-network-auditor-agent').name = 'hystrix-network-auditor-agent'
+project(':hystrix-contrib/hystrix-javanica').name = 'hystrix-javanica'