OpenFeign · rspieldenner · Jan 6, 2015 · Jan 5, 2015 · Jan 5, 2015 · Jan 5, 2015
diff --git a/CHANGES.md → CHANGELOG.md b/CHANGES.md → CHANGELOG.md
diff --git a/build.gradle b/build.gradle
@@ -1,156 +1,17 @@
-// Establish version and status
-ext.githubProjectName = rootProject.name // Change if github project name is not the same as the root project's name
-
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-    apply from: file('gradle/buildscript.gradle'), to: buildscript 
-}
-
-allprojects {
-    if (JavaVersion.current().isJava8Compatible()) {
-        tasks.withType(Javadoc) {
-            options.addStringOption('Xdoclint:none', '-quiet') // Doclint is onerous in Java 8.
-        }
-    }
-    repositories { 
-        mavenLocal()
-        mavenCentral()
-        maven { url 'https://oss.sonatype.org/content/repositories/releases/' }
-    }
+plugins {
+    id 'nebula.netflixoss' version '2.2.2'
 }
 
-apply from: file('gradle/convention.gradle')
-apply from: file('gradle/maven.gradle')
-if (!JavaVersion.current().isJava8Compatible()) {
-    apply from: file('gradle/check.gradle') // FindBugs is incompatible with Java 8.
+ext {
+    githubProjectName = rootProject.name // Change if github project name is not the same as the root project's name
 }
-apply from: file('gradle/license.gradle')
-apply from: file('gradle/release.gradle')
-apply plugin: 'idea'
 
 subprojects {
-    apply from: rootProject.file('dagger.gradle')
-    group = "com.netflix.${githubProjectName}" // TEMPLATE: Set to organization of project
-}
-
-project(':feign-core') {
-    apply plugin: 'java'
-
-    test {
-        useTestNG()
-    }
-
-    dependencies {
-        testCompile 'com.google.guava:guava:14.0.1'
-        testCompile 'com.google.code.gson:gson:2.2.4'
-        testCompile 'com.fasterxml.jackson.core:jackson-databind:2.2.2'
-        testCompile 'org.testng:testng:6.8.5'
-        testCompile 'com.google.mockwebserver:mockwebserver:20130706'
-    }
-}
-
-project(':feign-sax') {
-    apply plugin: 'java'
-
-    test {
-        useTestNG()
-    }
-
-    dependencies {
-        compile     project(':feign-core')
-        testCompile 'com.google.guava:guava:14.0.1'
-        testCompile 'org.testng:testng:6.8.5'
-    }
-}
-
-project(':feign-gson') {
-    apply plugin: 'java'
-
-    test {
-        useTestNG()
-    }
-
-    dependencies {
-        compile     project(':feign-core')
-        compile     'com.google.code.gson:gson:2.2.4'
-        testCompile 'org.testng:testng:6.8.5'
-    }
-}
-
-project(':feign-jackson') {
-    apply plugin: 'java'
+    apply plugin: 'nebula.netflixoss'
 
-    test {
-        useTestNG()
-    }
-
-    dependencies {
-        compile     project(':feign-core')
-        compile     'com.fasterxml.jackson.core:jackson-databind:2.2.2'
-        testCompile 'org.testng:testng:6.8.5'
-        testCompile 'com.google.guava:guava:14.0.1'
-    }
-}
-
-project(':feign-jaxb') {
-    apply plugin: 'java'
-
-    test {
-        useTestNG()
-    }
-
-    dependencies {
-        compile     project(':feign-core')
-        testCompile 'org.testng:testng:6.8.5'
-        testCompile 'com.google.guava:guava:14.0.1'
-    }
-}
-
-project(':feign-jaxrs') {
-    apply plugin: 'java'
-
-    test {
-        useTestNG()
-    }
-
-    dependencies {
-        compile     project(':feign-core')
-        compile     'javax.ws.rs:jsr311-api:1.1.1'
-        testCompile project(':feign-gson')
-        testCompile 'com.google.guava:guava:14.0.1'
-        testCompile 'org.testng:testng:6.8.5'
-    }
-}
-
-project(':feign-ribbon') {
-    apply plugin: 'java'
-
-    test {
-        useTestNG()
-    }
-
-    dependencies {
-        compile     project(':feign-core')
-        compile     'com.netflix.ribbon:ribbon-loadbalancer:2.0-RC5'
-        testCompile 'org.testng:testng:6.8.5'
-        testCompile 'com.google.mockwebserver:mockwebserver:20130706'
-    }
-}
-
-project(':feign-slf4j') {
-    apply plugin: 'java'
-
-    test {
-        useTestNG()
-    }
-
-    dependencies {
-        compile     project(':feign-core')
-        compile     'org.slf4j:slf4j-api:1.7.5'
-        testCompile 'org.testng:testng:6.8.5'
-        testCompile 'org.slf4j:slf4j-simple:1.7.5'
+    repositories { 
+        jcenter()
     }
+    apply from: rootProject.file('dagger.gradle')
+    group = "com.netflix.${githubProjectName}" // TEMPLATE: Set to organization of project
 }
diff --git a/codequality/HEADER b/codequality/HEADER
diff --git a/core/build.gradle b/core/build.gradle
@@ -0,0 +1,15 @@
+apply plugin: 'java'
+
+sourceCompatibility = 1.6
+
+test {
+    useTestNG()
+}
+
+dependencies {
+    testCompile 'com.google.guava:guava:14.0.1'
+    testCompile 'com.google.code.gson:gson:2.2.4'
+    testCompile 'com.fasterxml.jackson.core:jackson-databind:2.2.2'
+    testCompile 'org.testng:testng:6.8.5'
+    testCompile 'com.google.mockwebserver:mockwebserver:20130706'
+}
diff --git a/dagger.gradle b/dagger.gradle
@@ -92,7 +92,7 @@ rootProject.idea.project.ipr.withXml { projectXml ->
 tasks.ideaModule.dependsOn(prepareAnnotationGeneratedSourceDirs)
 
 idea.module {
-    scopes.PROVIDED.plus += project.configurations.daggerCompiler
+    scopes.PROVIDED.plus += [project.configurations.daggerCompiler]
     iml.withXml { xml->
         def moduleSource = xml.asNode().component.find { it.@name = 'NewModuleRootManager' }.content[0]
         moduleSource.appendNode('sourceFolder', [url: "file://\$MODULE_DIR\$/${relativePath(annotationGeneratedSources)}", isTestSource: false])
@@ -103,7 +103,7 @@ idea.module {
 tasks.eclipseClasspath.dependsOn(prepareAnnotationGeneratedSourceDirs)
 
 eclipse.classpath {
-    plusConfigurations += project.configurations.daggerCompiler
+    plusConfigurations += [project.configurations.daggerCompiler]
 }
 
 tasks.eclipseClasspath {

diff --git a/example-github/build.gradle b/example-github/build.gradle
@@ -1,5 +1,11 @@
+plugins {
+  id 'nebula.provided-base' version '2.0.1'
+}
+
 apply plugin: 'java'
 
+sourceCompatibility = 1.6
+
 dependencies {
   compile  'com.netflix.feign:feign-core:5.3.0'
   compile  'com.netflix.feign:feign-gson:5.3.0'

diff --git a/example-wikipedia/build.gradle b/example-wikipedia/build.gradle
@@ -1,5 +1,11 @@
+plugins {
+  id 'nebula.provided-base' version '2.0.1'
+}
+
 apply plugin: 'java'
 
+sourceCompatibility = 1.6
+
 dependencies {
   compile  'com.netflix.feign:feign-core:5.3.0'
   compile  'com.netflix.feign:feign-gson:5.3.0'

diff --git a/gradle.properties b/gradle.properties
@@ -1 +0,0 @@
-version=8.0.0-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