Merge remote-tracking branch 'upstream/pr/469' into manual-merge-nebula

Conflicts: gradle.properties
Netflix · Jan 22, 2015 · 0d9dd96 · 0d9dd96
2 parents e041b1d + bb10299
commit 0d9dd96
Show file tree

Hide file tree

Showing 27 changed files with 101 additions and 614 deletions.
diff --git a/CHANGES.md → CHANGELOG.md b/CHANGES.md → CHANGELOG.md
diff --git a/build.gradle b/build.gradle
@@ -1,35 +1,45 @@
-ext.githubProjectName = rootProject.name
-
 buildscript {
     repositories {
-        mavenLocal()
-        mavenCentral() // maven { url 'http://jcenter.bintray.com' }
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:2.0.1'
     }
-    apply from: file('gradle/buildscript.gradle'), to: buildscript 
 }
 
-allprojects {
-    repositories { 
-        mavenCentral() // maven { url: 'http://jcenter.bintray.com' }
-    }
+plugins {
+    id 'nebula.netflixoss' version '2.2.3'
 }
 
-apply from: file('gradle/convention.gradle')
-apply from: file('gradle/maven.gradle')
-//apply from: file('gradle/check.gradle')
-apply from: file('gradle/license.gradle')
-apply from: file('gradle/release.gradle')
+ext {
+    githubProjectName = rootProject.name    
+}
 
 subprojects {
+    apply plugin: 'nebula.netflixoss'
+    apply plugin: 'java'
+    apply plugin: 'nebula.provided-base'
+
+    repositories {
+        jcenter()
+    }
 
     group = "com.netflix.${githubProjectName}"
 
-    sourceSets.test.java.srcDir 'src/main/java'
+    eclipse {
+        classpath {
+            // include 'provided' dependencies on the classpath
+            plusConfigurations += [configurations.provided]
+            downloadSources = true
+            downloadJavadoc = true
+        }
+    }
 
-    tasks.withType(Javadoc).each {
-        it.classpath = sourceSets.main.compileClasspath
+
+    idea {
+        module {
+            // include 'provided' dependencies on the classpath
+            scopes.COMPILE.plus += [configurations.provided]
+        }
     }
 }
-
-// Prevent contrib project from being published
-project('hystrix-contrib').task('uploadMavenCentral', overwrite:true) { }
diff --git a/codequality/HEADER b/codequality/HEADER
diff --git a/gradle.properties b/gradle.properties
@@ -1 +0,0 @@
-version=1.4.0-RC7-SNAPSHOT

diff --git a/gradle/buildscript.gradle b/gradle/buildscript.gradle
diff --git a/gradle/check.gradle b/gradle/check.gradle
diff --git a/gradle/convention.gradle b/gradle/convention.gradle
diff --git a/gradle/license.gradle b/gradle/license.gradle
diff --git a/gradle/maven.gradle b/gradle/maven.gradle
diff --git a/gradle/netflix-oss.gradle b/gradle/netflix-oss.gradle
diff --git a/gradle/release.gradle b/gradle/release.gradle
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Nov 19 11:13:37 PST 2014
+#Thu Jan 08 16:14:23 PST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip