Netflix · gorzell · Apr 14, 2015 · Jan 29, 2015 · Jan 29, 2015 · gorzell
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/build.gradle b/build.gradle
@@ -1,58 +1,40 @@
+plugins {
+    id 'nebula.netflixoss' version '2.2.5'
+}
+
 // Establish version and status
 ext.githubProjectName = 'SimianArmy'
 group = "com.netflix.${project.name}"
 apply plugin:'eclipse-wtp'
 
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral() // maven { url 'http://jcenter.bintray.com' }
-    }
-    apply from: file('gradle/buildscript.gradle'), to: buildscript
-}
-
-allprojects {
-    repositories { 
-        mavenLocal()
-        mavenCentral() // maven { url: 'http://jcenter.bintray.com' }
-    }
+repositories { 
+    mavenLocal()
+    jcenter()
 }
 
-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')
-
 apply plugin: 'war'
 apply plugin: 'jetty'
-apply plugin: 'eclipse'
-apply plugin: 'idea'
 
 dependencies {
     // for the VMWareClient
     compile 'com.cloudbees.thirdparty:vijava:5.0.0'
-    compile 'dom4j:dom4j:1.6.1'
 
     // for DB support outside of AWS (SimpleDB not available)
     compile 'org.mapdb:mapdb:0.9.5'
 
-    compile 'javax.ws.rs:jsr311-api:1.1.1'
     compile 'com.sun.jersey:jersey-core:1.11'
-    compile 'com.sun.jersey:jersey-server:1.11'
     compile 'com.sun.jersey:jersey-servlet:1.11'
     compile 'org.slf4j:slf4j-api:1.6.4'
     compile 'org.codehaus.jackson:jackson-core-asl:1.9.2'
     compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.2'
-    compile 'com.netflix.eureka:eureka-client:1.1.22'
+    compile('com.netflix.eureka:eureka-client:1.1.22') {
+        exclude group: 'com.sun.jersey', module: 'jersey-bundle'
+    }
     compile 'com.amazonaws:aws-java-sdk:1.8.11'
     compile 'commons-lang:commons-lang:2.6'
-    compile 'joda-time:joda-time:2.0'
     compile 'com.google.guava:guava:11.0.2'
     compile 'org.apache.httpcomponents:httpclient:4.3'
-    compile 'org.apache.httpcomponents:httpcore:4.3'
     compile 'org.jclouds.driver:jclouds-jsch:1.6.0'
-    compile 'org.jclouds.driver:jclouds-slf4j:1.6.0'
     compile 'org.jclouds.api:ec2:1.6.0'
 
     testCompile 'org.testng:testng:6.3.1'
@@ -61,15 +43,13 @@ dependencies {
     runtime 'org.slf4j:slf4j-log4j12:1.6.1'
 
     providedCompile 'javax.servlet:servlet-api:2.5'
-    // needed for findbug Missing Class: javax.annotation.Nonnull
-    providedCompile 'com.google.code.findbugs:jsr305:1.3.9'
 }
 
 test {
     useTestNG()
 }
 
-tasks.withType(Compile) {
+tasks.withType(JavaCompile) {
     options.compilerArgs << "-Xlint" << "-Werror"
 }
 

diff --git a/codequality/HEADER b/codequality/HEADER
diff --git a/gradle.properties b/gradle.properties
@@ -1 +0,0 @@
-version=2.5-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 Aug 27 11:05:53 PDT 2014
+#Thu Jan 29 13:45:16 PST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip