Merging in gradle-template, specifically provided

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'
 
 }
 

gradle/buildscript.gradle

@@ -1,8 +1,9 @@
 // Executed in context of buildscript
 repositories {
+    // Repo in addition to maven central
     maven {
         name 'build-repo'
-        url 'https://github.com/Netflix-Skunkworks/build-repo/raw/master/releases/'
+        url 'https://raw.github.com/Netflix-Skunkworks/build-repo/master/releases/' // gradle-release/gradle-release/1.0-SNAPSHOT/gradle-release-1.0-SNAPSHOT.jar
     }
 }
 dependencies {

gradle/convention.gradle

@@ -54,6 +54,20 @@ subprojects { project ->
     // Ensure output is on a new line
     javadoc.doFirst { println "" }
 
+    configurations {
+        provided {
+            description = 'much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive.'
+            transitive = false
+            visible = false
+        }
+    }
+
+    project.sourceSets {
+        main.compileClasspath += project.configurations.provided
+        main.runtimeClasspath -= project.configurations.provided
+        test.compileClasspath += project.configurations.provided
+        test.runtimeClasspath += project.configurations.provided
+    }
 }
 
 task aggregateJavadoc(type: Javadoc) {

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'
     }

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
-    }
+    }
+