New nebula.netflixoss build

sanjeevgour · Apr 3, 2015 · a764853 · a764853
1 parent 9224295
commit a764853
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 65 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/build.gradle b/build.gradle
@@ -1,21 +1,30 @@
-ext.githubProjectName = rootProject.name
-
 buildscript {
-    repositories { mavenCentral() }
-    apply from: file('gradle/buildscript.gradle'), to: buildscript
+    repositories { jcenter() }
+    dependencies {
+        classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:2.2.0'
+    }
 }
 
-allprojects {
-    repositories { mavenCentral() }
+plugins {
+    id 'nebula.netflixoss' version '2.2.9'
 }
 
-apply plugin: 'idea'
-apply from: file('gradle/convention.gradle')
-apply from: file('gradle/maven.gradle')
-apply from: file('gradle/license.gradle')
-apply from: file('gradle/release.gradle')
+ext.githubProjectName = rootProject.name
+
+idea {
+    project {
+        languageLevel = '1.7'
+    }
+}
 
 subprojects {
+    apply plugin: 'nebula.netflixoss'
+    apply plugin: 'java'
+    apply plugin: 'nebula.provided-base'
+
+    repositories {
+        jcenter()
+    }
 
     group = "com.netflix.${githubProjectName}"
 

diff --git a/gradle.properties b/gradle.properties
@@ -1 +0,0 @@
-version=1.0.28

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 @@
-#Tue Aug 14 16:28:54 PDT 2012
+#Thu Apr 02 16:32:40 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
diff --git a/gradlew b/gradlew
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ##############################################################################
 ##
@@ -61,9 +61,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/"
+cd "`dirname \"$PRG\"`/" >&-
 APP_HOME="`pwd -P`"
-cd "$SAVED"
+cd "$SAVED" >&-
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 

diff --git a/zuul-core/build.gradle b/zuul-core/build.gradle
@@ -1,7 +1,4 @@
-apply plugin: 'java'
 apply plugin: 'groovy'
-apply plugin: 'eclipse'
-apply plugin: 'idea'
 
 dependencies {
     compile 'commons-io:commons-io:2.4'
@@ -11,7 +8,6 @@ dependencies {
 
     provided 'junit:junit-dep:4.10'
     provided 'javax.servlet:servlet-api:2.5'
-    groovy "org.codehaus.groovy:groovy-all:2.3.1"
 
     compile 'com.netflix.archaius:archaius-core:0.6.0'
     compile 'com.netflix.servo:servo-core:0.7.2'
@@ -30,15 +26,7 @@ javadoc {
 
 eclipse {
     classpath {
-        plusConfigurations += configurations.provided
         downloadSources = true
         downloadJavadoc = true
     }
 }
-
-
-idea {
-    module {
-        scopes.PROVIDED.plus += configurations.provided
-    }
-}
diff --git a/zuul-netflix-webapp/build.gradle b/zuul-netflix-webapp/build.gradle
@@ -1,7 +1,4 @@
-apply plugin: 'java'
 apply plugin: 'groovy'
-apply plugin: 'eclipse'
-apply plugin: 'idea'
 apply plugin: 'war'
 apply plugin: 'jetty'
 
@@ -20,8 +17,8 @@ dependencies {
     compile 'com.sun.jersey:jersey-client:1.17.1'
     compile 'com.sun.jersey:jersey-servlet:1.17.1'
 
-    groovy "org.codehaus.groovy:groovy-all:2.2.2"
-    provided 'junit:junit-dep:4.10'
+    compile "org.codehaus.groovy:groovy-all:2.2.2"
+    providedCompile 'junit:junit-dep:4.10'
 }
 
 javadoc {
@@ -35,20 +32,11 @@ javadoc {
 
 eclipse {
     classpath {
-        plusConfigurations += configurations.provided
         downloadSources = true
         downloadJavadoc = true
     }
 }
 
-
-idea {
-    module {
-        languageLevel = '1.7'
-        scopes.PROVIDED.plus += configurations.provided
-    }
-}
-
 war {
     webXml = file('src/main/webapp/WEB-INF/web.xml')
     webInf{

diff --git a/zuul-netflix/build.gradle b/zuul-netflix/build.gradle
@@ -1,7 +1,4 @@
-apply plugin: 'java'
 apply plugin: 'groovy'
-apply plugin: 'eclipse'
-apply plugin: 'idea'
 
 dependencies {
     compile project(':zuul-core')
@@ -37,15 +34,7 @@ javadoc {
 
 eclipse {
     classpath {
-        plusConfigurations += configurations.provided
         downloadSources = true
         downloadJavadoc = true
     }
 }
-
-
-idea {
-    module {
-        scopes.PROVIDED.plus += configurations.provided
-    }
-}
diff --git a/zuul-simple-webapp/build.gradle b/zuul-simple-webapp/build.gradle
@@ -1,20 +1,16 @@
-apply plugin: 'java'
 apply plugin: 'war'
-apply plugin: 'eclipse'
-apply plugin: 'idea'
 apply plugin: 'jetty'
 
 
 dependencies {
     compile project(":zuul-core")
 
     compile 'org.apache.httpcomponents:httpclient:4.3.2'
-    provided 'javax.servlet:servlet-api:2.5'
+    providedCompile 'javax.servlet:servlet-api:2.5'
 }
 
 eclipse {
   classpath {
-        plusConfigurations += configurations.provided
         downloadSources = true
         downloadJavadoc = true
   }
@@ -29,12 +25,6 @@ war {
     }
 }
 
-idea {
-    module {
-        scopes.PROVIDED.plus += configurations.provided
-    }
-}
-
 jettyRun.contextPath = '/'
 
 jettyRun.doFirst {