Build changes for nebula.netflixoss

build.gradle

@@ -1,155 +1,35 @@
-ext.githubProjectName = 'eureka'
-
-ext {
-    jerseyVersion="1.11"
-    governatorVersion="1.2.10"
-    archaiusVersion="0.6.0"
-    ribbonVersion="2.0-RC9"
-    blitzVersion="1.34"
+plugins {
+    id 'nebula.netflixoss' version '2.2.3'
 }
 
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral() // maven { url 'http://jcenter.bintray.com' }
-    }
-    apply from: file('gradle/buildscript.gradle'), to: buildscript 
-}
-
-allprojects {
-    repositories { 
-        mavenCentral() // maven { url: 'http://jcenter.bintray.com' }
-    }
+ext {
+    githubProjectName = 'eureka'
+    jerseyVersion='1.11'
+    governatorVersion='1.2.10'
+    archaiusVersion='0.6.0'
+    ribbonVersion='2.0-RC9'
+    blitzVersion='1.34'
 }
 
-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')
-
 subprojects {
-    group = "com.netflix.${githubProjectName}"
-
-    test {
-        forkEvery = 1
-        // setting this property prevents java from grabbing focus when running the tests under osx
-        systemProperty 'java.awt.headless', 'true'
-    }
-
-    jar {
-        manifest {
-            attributes("Implementation-Title": name, "Implementation-Version": version,'Build-Time-ISO-8601': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"))
-        }
-    }
-}
-
-if (JavaVersion.current().isJava8Compatible()) {
-    allprojects {
-        tasks.withType(Javadoc) {
-            options.addStringOption('Xdoclint:none', '-quiet')
-        }
-    }
-}
+    apply plugin: 'nebula.netflixoss'
+    apply plugin: 'java'
 
-project(':eureka-client') {
-    dependencies {
-        compile "com.netflix.netflix-commons:netflix-eventbus:0.1.2"
-        compile 'com.thoughtworks.xstream:xstream:1.4.2'
-        compile "com.netflix.archaius:archaius-core:$archaiusVersion"
-        compile 'javax.ws.rs:jsr311-api:1.1.1'
-        compile 'com.netflix.servo:servo-core:0.7.4'
-        compile "com.sun.jersey:jersey-core:$jerseyVersion"
-        compile "com.sun.jersey:jersey-client:$jerseyVersion"
-        compile 'com.sun.jersey.contribs:jersey-apache-client4:1.11'
-        compile 'org.apache.httpcomponents:httpclient:4.2.1'
-        compile "com.netflix.ribbon:ribbon-httpclient:$ribbonVersion"
-        compile "com.netflix.governator:governator:$governatorVersion"
-        runtime 'org.codehaus.jettison:jettison:1.2'
-
-        testCompile 'junit:junit:4.10'
-        testCompile 'org.mortbay.jetty:jetty:6.1H.22'
-    }
-
-    task testJar(type: Jar) {
-        classifier = 'tests'
-        from sourceSets.test.output
-    }
-
-    configurations {
-        tests
-        published.extendsFrom tests, archives
-    }
-
-    artifacts {
-        tests testJar
-    }
+    group = "com.netflix.${githubProjectName}"
 
-    install {
-        configuration = configurations.published
+    repositories {
+        jcenter()
     }
 
-}
-
-project(':eureka-core') {
     test {
         forkEvery = 1
         // setting this property prevents java from grabbing focus when running the tests under osx
         systemProperty 'java.awt.headless', 'true'
     }
 
-    dependencies {
-        compile project(':eureka-client')
-
-        compile 'com.amazonaws:aws-java-sdk:1.3.27'
-        compile 'javax.servlet:servlet-api:2.4'
-        compile 'com.thoughtworks.xstream:xstream:1.4.2'
-        compile 'javax.ws.rs:jsr311-api:1.1.1'
-        compile "com.netflix.blitz4j:blitz4j:$blitzVersion"
-
-        testCompile 'junit:junit:4.10'
-        testCompile 'org.mortbay.jetty:jetty:6.1H.22'
-        testCompile 'org.mockito:mockito-all:1.8.5'
-        testRuntime 'org.slf4j:slf4j-simple:1.7.0'
-        testCompile project(':eureka-client')
-    }
-}
-
-project(':eureka-resources') {
-}
-
-project(':eureka-server') {
-    apply plugin: 'war'
-
-    sourceSets.main.java.srcDir 'test/java'
-
-    war {
-        from('conf')  {
-            include 'eureka-server*'
-            include 'eureka-client*'
-            include 'log4j.properties'
-            into 'WEB-INF/classes/'
+    jar {
+        manifest {
+            attributes('Build-Time-ISO-8601': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"))
         }
-        from (project(':eureka-resources').file('build/resources/main'))
-        webXml = file('WEB-INF/web.xml') // copies a file to WEB-INF/web.xml
-    }
-
-    dependencies {
-        compile project(':eureka-client')
-        compile project(':eureka-core')
-        runtime 'xerces:xercesImpl:2.4.0'
-        runtime 'asm:asm:3.1'
-        compile "com.sun.jersey:jersey-server:$jerseyVersion"
-        compile "com.sun.jersey:jersey-servlet:$jerseyVersion"
-        compile 'org.slf4j:slf4j-log4j12:1.6.1'
-        runtime 'org.codehaus.jettison:jettison:1.2' 
-        providedCompile 'javax.servlet:servlet-api:2.4'
-    }
-
-    delete 'testlibs'
-    copy { 
-        from zipTree('build/libs/'+ war.archiveName)
-        into 'testlibs' 
-        include 'WEB-INF/lib/'
     }
 }

eureka-client/build.gradle

@@ -0,0 +1,19 @@
+apply plugin: 'nebula-test-jar'
+
+dependencies {
+    compile "com.netflix.netflix-commons:netflix-eventbus:0.1.2"
+    compile 'com.thoughtworks.xstream:xstream:1.4.2'
+    compile "com.netflix.archaius:archaius-core:$archaiusVersion"
+    compile 'javax.ws.rs:jsr311-api:1.1.1'
+    compile 'com.netflix.servo:servo-core:0.7.4'
+    compile "com.sun.jersey:jersey-core:$jerseyVersion"
+    compile "com.sun.jersey:jersey-client:$jerseyVersion"
+    compile 'com.sun.jersey.contribs:jersey-apache-client4:1.11'
+    compile 'org.apache.httpcomponents:httpclient:4.2.1'
+    compile "com.netflix.ribbon:ribbon-httpclient:$ribbonVersion"
+    compile "com.netflix.governator:governator:$governatorVersion"
+    runtime 'org.codehaus.jettison:jettison:1.2'
+
+    testCompile 'junit:junit:4.10'
+    testCompile 'org.mortbay.jetty:jetty:6.1H.22'
+}

eureka-core/build.gradle

@@ -0,0 +1,15 @@
+dependencies {
+    compile project(':eureka-client')
+
+    compile 'com.amazonaws:aws-java-sdk:1.3.27'
+    compile 'javax.servlet:servlet-api:2.4'
+    compile 'com.thoughtworks.xstream:xstream:1.4.2'
+    compile 'javax.ws.rs:jsr311-api:1.1.1'
+    compile "com.netflix.blitz4j:blitz4j:$blitzVersion"
+
+    testCompile 'junit:junit:4.10'
+    testCompile 'org.mortbay.jetty:jetty:6.1H.22'
+    testCompile 'org.mockito:mockito-all:1.8.5'
+    testRuntime 'org.slf4j:slf4j-simple:1.7.0'
+    testCompile project(':eureka-client')
+}

eureka-server/build.gradle

@@ -0,0 +1,22 @@
+apply plugin: 'war'
+
+dependencies {
+    compile project(':eureka-client')
+    compile project(':eureka-core')
+    runtime 'xerces:xercesImpl:2.4.0'
+    runtime 'asm:asm:3.1'
+    compile "com.sun.jersey:jersey-server:$jerseyVersion"
+    compile "com.sun.jersey:jersey-servlet:$jerseyVersion"
+    compile 'org.slf4j:slf4j-log4j12:1.6.1'
+    runtime 'org.codehaus.jettison:jettison:1.2' 
+    providedCompile 'javax.servlet:servlet-api:2.4'
+}
+
+task copyLibs(type: Copy) {
+    into 'testlibs/WEB-INF/libs'
+    from configurations.runtime	
+}
+
+war {
+    from (project(':eureka-resources').file('build/resources/main'))
+}