Repository: incubator-datafu Updated Branches: refs/heads/master ccde3f8c9 -> be116404b
DATAFU-125 Update Gradle version to 3.5.1 Project: http://git-wip-us.apache.org/repos/asf/incubator-datafu/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-datafu/commit/be116404 Tree: http://git-wip-us.apache.org/repos/asf/incubator-datafu/tree/be116404 Diff: http://git-wip-us.apache.org/repos/asf/incubator-datafu/diff/be116404 Branch: refs/heads/master Commit: be116404b8bd4bb0314c72182b50e3e5951d17dc Parents: ccde3f8 Author: Eyal Allweil <eallw...@paypal.com> Authored: Tue Nov 28 14:29:31 2017 +0200 Committer: Eyal Allweil <eallw...@paypal.com> Committed: Tue Nov 28 14:29:31 2017 +0200 ---------------------------------------------------------------------- .gitignore | 3 + datafu-pig/build.gradle | 25 ++-- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 49875 -> 0 bytes gradle/wrapper/gradle-wrapper.properties | 6 - gradlew | 164 -------------------------- 6 files changed, 19 insertions(+), 181 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/be116404/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index dc69125..eebd04a 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,6 @@ datafu-pig/docs datafu-pig/queries datafu-pig/query *.patch +gradle/wrapper/gradle-wrapper.jar +gradle/wrapper/gradle-wrapper.properties +gradlew* http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/be116404/datafu-pig/build.gradle ---------------------------------------------------------------------- diff --git a/datafu-pig/build.gradle b/datafu-pig/build.gradle index 30bdfc3..ce51f69 100644 --- a/datafu-pig/build.gradle +++ b/datafu-pig/build.gradle @@ -17,25 +17,30 @@ * under the License. */ -apply plugin: 'java' -apply plugin: 'gradle-autojar' -apply plugin: 'download-task' - -// append "-incubating" while still in the incubating process -archivesBaseName = 'datafu-pig-incubating' - -import groovy.xml.MarkupBuilder - buildscript { repositories { mavenCentral() } + + // autojar only works with gradle versions < 4.0 + // we need to fix it or find a different solution in order to upgrade gradle dependencies { classpath 'com.github.rholder:gradle-autojar:1.0.1' - classpath 'de.undercouch:gradle-download-task:0.5' } } +plugins { + id "de.undercouch.download" version "3.3.0" +} + +apply plugin: 'java' +apply plugin: 'gradle-autojar' + +// append "-incubating" while still in the incubating process +archivesBaseName = 'datafu-pig-incubating' + +import groovy.xml.MarkupBuilder + // the autojarred configuration includes all JARs that will be included // in the final JAR via autojar configurations.create('autojarred') http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/be116404/gradle.properties ---------------------------------------------------------------------- diff --git a/gradle.properties b/gradle.properties index 9f5ee7a..72ac771 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,6 +17,6 @@ group=org.apache.datafu version=1.3.3 -gradleVersion=2.4 +gradleVersion=3.5.1 org.gradle.jvmargs="-XX:MaxPermSize=512m" release=false \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/be116404/gradle/wrapper/gradle-wrapper.jar ---------------------------------------------------------------------- diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index a7634b0..0000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/be116404/gradle/wrapper/gradle-wrapper.properties ---------------------------------------------------------------------- diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 4bb5cab..0000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Thu Jul 11 22:18:11 PDT 2013 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-2.4-bin.zip http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/be116404/gradlew ---------------------------------------------------------------------- diff --git a/gradlew b/gradlew deleted file mode 100755 index 16bbbbf..0000000 --- a/gradlew +++ /dev/null @@ -1,164 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## 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="-XX:MaxPermSize=512m" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -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" -# 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. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - 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=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
