Update gradle to version 3.5.1

Author: Sumedh Wale

build.gradle

@@ -27,33 +27,6 @@ allprojects {
   apply plugin: 'eclipse'
   apply plugin: "com.commercehub.gradle.plugin.avro"
 
-  configurations {
-    provided {
-      description 'a dependency that is provided externally at runtime'
-      visible true
-    }
-  }
-
-  idea {
-    module {
-      scopes.PROVIDED.plus += [ configurations.provided ]
-    }
-  }
-  eclipse {
-    classpath {
-      plusConfigurations += [ configurations.provided ]
-    }
-  }
-
-  sourceSets {
-    main.compileClasspath += configurations.provided
-    main.runtimeClasspath -= configurations.provided
-    test.compileClasspath += configurations.provided
-    test.runtimeClasspath += configurations.provided
-  }
-
-  javadoc.classpath += configurations.provided
-
   ext {
     sparkVersion = '2.0.1-3'
     snappyVersion = '1.0.0'
@@ -71,12 +44,12 @@ allprojects {
 }
 
 dependencies {
-  provided "io.snappydata:snappydata-core_2.11:${snappyVersion}"
-  provided "io.snappydata:snappydata-cluster_2.11:${snappyVersion}"
-  provided "io.snappydata:snappy-spark-core_2.11:${sparkVersion}"
-  provided "io.snappydata:snappy-spark-catalyst_2.11:${sparkVersion}"
-  provided "io.snappydata:snappy-spark-sql_2.11:${sparkVersion}"
-  // provided "io.snappydata:snappydata-aqp_2.11:${snappyVersion}"
+  compileOnly "io.snappydata:snappydata-core_2.11:${snappyVersion}"
+  compileOnly "io.snappydata:snappydata-cluster_2.11:${snappyVersion}"
+  compileOnly "io.snappydata:snappy-spark-core_2.11:${sparkVersion}"
+  compileOnly "io.snappydata:snappy-spark-catalyst_2.11:${sparkVersion}"
+  compileOnly "io.snappydata:snappy-spark-sql_2.11:${sparkVersion}"
+  // compileOnly "io.snappydata:snappydata-aqp_2.11:${snappyVersion}"
 
   compile 'com.miguno:kafka-avro-codec_2.10:0.1.1-SNAPSHOT'
   compile 'org.apache.kafka:kafka_2.11:0.8.2.1'

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Thu Nov 12 11:58:42 PST 2015
+#Fri Mar 30 15:48:21 IST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,17 +1,35 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS="-Xmx2g -XX:MaxPermSize=512m -XX:ReservedCodeCacheSize=512m"
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=-Xmx2g -XX:MaxPermSize=512m -XX:ReservedCodeCacheSize=512m
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

gradlew.bat

@@ -1,10 +1,10 @@
 dependencies {
-  provided "io.snappydata:snappydata-core_2.11:${snappyVersion}"
-  provided "io.snappydata:snappydata-cluster_2.11:${snappyVersion}"
-  provided "io.snappydata:snappy-spark-core_2.11:${sparkVersion}"
-  provided "io.snappydata:snappy-spark-catalyst_2.11:${sparkVersion}"
-  provided "io.snappydata:snappy-spark-sql_2.11:${sparkVersion}"
-  provided "io.snappydata:snappy-spark-streaming_2.11:${sparkVersion}"
+  compileOnly "io.snappydata:snappydata-core_2.11:${snappyVersion}"
+  compileOnly "io.snappydata:snappydata-cluster_2.11:${snappyVersion}"
+  compileOnly "io.snappydata:snappy-spark-core_2.11:${sparkVersion}"
+  compileOnly "io.snappydata:snappy-spark-catalyst_2.11:${sparkVersion}"
+  compileOnly "io.snappydata:snappy-spark-sql_2.11:${sparkVersion}"
+  compileOnly "io.snappydata:snappy-spark-streaming_2.11:${sparkVersion}"
   compile 'com.rabbitmq:amqp-client:3.5.7'
   compile project(':')
 }

rabbitmq-snappy/build.gradle

@@ -1,9 +1,9 @@
 dependencies {
-  provided "org.apache.spark:spark-core_2.11:1.6.0"
-  provided "org.apache.spark:spark-streaming_2.11:1.6.0"
-  provided "org.apache.spark:spark-streaming-kafka_2.11:1.6.0"
+  compileOnly "org.apache.spark:spark-core_2.11:1.6.0"
+  compileOnly "org.apache.spark:spark-streaming_2.11:1.6.0"
+  compileOnly "org.apache.spark:spark-streaming-kafka_2.11:1.6.0"
   // compile "org.apache.spark:spark-streaming-kafka_2.10:1.6.0" //required in assemble jar in cluster mode
-  provided "org.apache.spark:spark-sql_2.11:1.6.0"
+  compileOnly "org.apache.spark:spark-sql_2.11:1.6.0"
 
   compile project(':')
   compile 'com.datastax.spark:spark-cassandra-connector_2.11:1.6.0-M2'

spark-cassandra/build.gradle

@@ -1,10 +1,9 @@
 dependencies {
-
-    provided "org.apache.spark:spark-core_2.10:1.5.2"
-    provided "org.apache.spark:spark-streaming_2.10:1.5.2"
-    provided "org.apache.spark:spark-streaming-kafka_2.10:1.5.2"
-    provided "org.apache.spark:spark-sql_2.10:1.5.2"
-    provided "org.apache.spark:spark-catalyst_2.10:1.5.2"
+    compileOnly "org.apache.spark:spark-core_2.10:1.5.2"
+    compileOnly "org.apache.spark:spark-streaming_2.10:1.5.2"
+    compileOnly "org.apache.spark:spark-streaming-kafka_2.10:1.5.2"
+    compileOnly "org.apache.spark:spark-sql_2.10:1.5.2"
+    compileOnly "org.apache.spark:spark-catalyst_2.10:1.5.2"
 
     compile project(':')
     compile 'com.memsql:memsql-connector_2.10:1.3.2'