Upgrade to Gradle 2.10

Netflix · Feb 10, 2016 · d7e680e · d7e680e
1 parent 6096daf
commit d7e680e
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 19 deletions.
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 @@
-#Thu Feb 05 14:57:34 PST 2015
+#Wed Feb 10 15:33:16 PST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
diff --git a/gradlew b/gradlew
@@ -42,11 +42,6 @@ case "`uname`" in
     ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -114,6 +109,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

diff --git a/priam-dse-extensions/build.gradle b/priam-dse-extensions/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     compile 'com.googlecode.json-simple:json-simple:1.1'
     compile 'org.xerial.snappy:snappy-java:1.0.5-M3'
     compile 'org.yaml:snakeyaml:1.10'
-	compile "org.apache.cassandra:cassandra-all:2.0.9"
+	  compile 'org.apache.cassandra:cassandra-all:2.0.9'
     compile 'javax.ws.rs:jsr311-api:1.1.1'
     compile 'joda-time:joda-time:2.0'
     compile 'commons-configuration:commons-configuration:1.5'
@@ -37,7 +37,7 @@ dependencies {
     compile 'org.bouncycastle:bcprov-jdk16:1.46'
     compile 'org.bouncycastle:bcpg-jdk16:1.46'
     compile ('com.google.appengine.tools:appengine-gcs-client:0.4.3') {
-	exclude module: 'guava'
+	     exclude module: 'guava'
     }
     compile 'com.google.apis:google-api-services-storage:v1-rev9-1.19.0'
     compile 'com.google.http-client:google-http-client-jackson2:1.19.0'

diff --git a/priam-web/build.gradle b/priam-web/build.gradle
@@ -1,7 +1,9 @@
-apply plugin: 'java'
-apply plugin: 'nebula.provided-base'
+plugins {
+  id 'jetty'
+}
+
 apply plugin: 'war'
-apply plugin: 'jetty'
+apply plugin: 'nebula.provided-base'
 
 dependencies {
     compile project(':priam')
@@ -27,7 +29,7 @@ dependencies {
     compile 'com.googlecode.json-simple:json-simple:1.1'
     compile 'org.xerial.snappy:snappy-java:1.0.5-M3'
     compile 'org.yaml:snakeyaml:1.10'
-	compile "org.apache.cassandra:cassandra-all:2.0.9"
+	  compile 'org.apache.cassandra:cassandra-all:2.0.9'
     compile 'javax.ws.rs:jsr311-api:1.1.1'
     compile 'joda-time:joda-time:2.0'
     compile 'commons-configuration:commons-configuration:1.5'
@@ -41,7 +43,7 @@ dependencies {
     compile 'org.bouncycastle:bcprov-jdk16:1.46'
     compile 'org.bouncycastle:bcpg-jdk16:1.46'
     compile ('com.google.appengine.tools:appengine-gcs-client:0.4.3') {
-	exclude module: 'guava'
+	     exclude module: 'guava'
     }
     compile 'com.google.apis:google-api-services-storage:v1-rev9-1.19.0'
     compile 'com.google.http-client:google-http-client-jackson2:1.19.0'

diff --git a/priam/build.gradle b/priam/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'java'
 apply plugin: 'nebula.provided-base'
-apply plugin: 'nebula.nebula-test-jar'
+apply plugin: 'nebula.test-jar'
 
 dependencies {
     compile 'commons-lang:commons-lang:2.6'
@@ -23,7 +23,7 @@ dependencies {
     compile 'com.googlecode.json-simple:json-simple:1.1'
     compile 'org.xerial.snappy:snappy-java:1.0.5-M3'
     compile 'org.yaml:snakeyaml:1.10'
-	compile "org.apache.cassandra:cassandra-all:2.0.9"
+	  compile 'org.apache.cassandra:cassandra-all:2.0.9'
     compile 'javax.ws.rs:jsr311-api:1.1.1'
     compile 'joda-time:joda-time:2.0'
     compile 'commons-configuration:commons-configuration:1.5'
@@ -37,7 +37,7 @@ dependencies {
     compile 'org.bouncycastle:bcprov-jdk16:1.46'
     compile 'org.bouncycastle:bcpg-jdk16:1.46'
     compile ('com.google.appengine.tools:appengine-gcs-client:0.4.3') {
-	exclude module: 'guava'
+	      exclude module: 'guava'
     }
     compile 'com.google.apis:google-api-services-storage:v1-rev9-1.19.0'
     compile 'com.google.http-client:google-http-client-jackson2:1.19.0'