Using gradle-template version of provided, fixing deps missing once p…

…rovided was done Conflicts: hystrix-contrib/hystrix-metrics-event-stream/build.gradle
simonhoo · Dec 14, 2012 · a4662be · a4662be
1 parent da57e54
commit a4662be
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 22 deletions.
diff --git a/build.gradle b/build.gradle
@@ -19,27 +19,7 @@ subprojects {
 
     group = "com.netflix.${githubProjectName}"
 
-    sourceSets {
-        test {
-            java {
-                srcDir 'src/main/java'
-            }
-        }
-    }
-    // Establish a provided scope
-    configurations {
-        provided {
-            description = 'Dependencies needed for compile but are provided at runtime or not needed'
-            transitive = false
-            visible = false
-        }
-        compile.extendsFrom provided
-    }
-    sourceSets {
-        main.compileClasspath += configurations.provided
-        main.runtimeClasspath -= configurations.provided
-        test.compileClasspath += configurations.provided
-    }
+    sourceSets.test.java.srcDir 'src/main/java'
 
 }
 
diff --git a/hystrix-contrib/hystrix-metrics-event-stream/build.gradle b/hystrix-contrib/hystrix-metrics-event-stream/build.gradle
@@ -3,4 +3,5 @@
         compile project(':hystrix-core')
         compile 'org.codehaus.jackson:jackson-core-asl:1.9.2'
         provided 'javax.servlet:servlet-api:2.5'
+        provided 'junit:junit:4.10'
     }
diff --git a/hystrix-examples/build.gradle b/hystrix-examples/build.gradle
@@ -1,9 +1,11 @@
     apply plugin: 'java'
     dependencies {
         compile project(':hystrix-core')
+        provided 'junit:junit:4.10'
     }
 
     task(runDemo, dependsOn: 'classes', type: JavaExec) {
     	main = 'com.netflix.hystrix.examples.demo.HystrixCommandDemo'
     	classpath = sourceSets.main.runtimeClasspath
-    }
+    }
+