Repository: incubator-gobblin Updated Branches: refs/heads/master 81898c07a -> 2979d5e68
[GOBBLIN-563] Upgrade to gradle 4.x Closes #2426 from shirshanka/gradle-4-upgrade Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/2979d5e6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/2979d5e6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/2979d5e6 Branch: refs/heads/master Commit: 2979d5e689a928702efbf2c70d9b0a2af49664fa Parents: 81898c0 Author: Shirshanka Das <[email protected]> Authored: Tue Aug 14 18:58:14 2018 -0700 Committer: Abhishek Tiwari <[email protected]> Committed: Tue Aug 14 18:58:14 2018 -0700 ---------------------------------------------------------------------- build.gradle | 6 +-- gradle/scripts/idesSetup.gradle | 10 +--- gradle/scripts/jacoco-coveralls-support.gradle | 18 +------ gradle/wrapper/gradle-wrapper.jar | Bin 51348 -> 53556 bytes gradle/wrapper/gradle-wrapper.properties | 5 +- gradlew | 54 ++++++++++---------- gradlew.bat | 21 ++++---- travis/test-coverage.sh | 2 +- 8 files changed, 44 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2979d5e6/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 45ce66d..74eec27 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,7 @@ * limitations under the License. */ + apply from: 'gradle/scripts/environment.gradle' buildscript { @@ -30,9 +31,8 @@ buildscript { classpath 'org.apache.ant:ant:1.9.4' classpath 'gradle.plugin.org.inferred:gradle-processors:1.1.2' classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:1.0.2' - classpath 'gradle.plugin.com.palantir:jacoco-coverage:0.3.0' - classpath 'io.spring.gradle:dependency-management-plugin:0.5.4.RELEASE' - classpath 'me.champeau.gradle:jmh-gradle-plugin:0.3.1' + classpath 'io.spring.gradle:dependency-management-plugin:0.6.0.RELEASE' + classpath 'me.champeau.gradle:jmh-gradle-plugin:0.4.4' } repositories { http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2979d5e6/gradle/scripts/idesSetup.gradle ---------------------------------------------------------------------- diff --git a/gradle/scripts/idesSetup.gradle b/gradle/scripts/idesSetup.gradle index 35e92bc..fb4928a 100644 --- a/gradle/scripts/idesSetup.gradle +++ b/gradle/scripts/idesSetup.gradle @@ -17,11 +17,6 @@ apply plugin: 'idea' -idea.project { - ext.languageLevel = javaVersion - languageLevel = javaVersion -} - subprojects { plugins.withType(JavaPlugin) { plugins.apply('idea') @@ -29,10 +24,6 @@ subprojects { // Configure the IDEA plugin to (1) add the codegen as source dirs and (2) work around // an apparent bug in the plugin which doesn't set the outputDir/testOutputDir as documented - idea.project { - ext.languageLevel = javaVersion - languageLevel = javaVersion - } idea.module { // Gradle docs claim the two settings below are the default, but // the actual defaults appear to be "out/production/$MODULE_NAME" @@ -42,5 +33,6 @@ subprojects { outputDir = sourceSets.main.output.classesDir testOutputDir = sourceSets.test.output.classesDir } + } } http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2979d5e6/gradle/scripts/jacoco-coveralls-support.gradle ---------------------------------------------------------------------- diff --git a/gradle/scripts/jacoco-coveralls-support.gradle b/gradle/scripts/jacoco-coveralls-support.gradle index 3efac38..a1d622c 100644 --- a/gradle/scripts/jacoco-coveralls-support.gradle +++ b/gradle/scripts/jacoco-coveralls-support.gradle @@ -17,19 +17,11 @@ /** * Adds integration with the <a href="https://docs.gradle.org/current/userguide/jacoco_plugin.html";>Gradle JaCoCo Plugin</a> - * as well as with <a href="https://coveralls.io/";>Coveralls</a>. The script uses the - * <a href="https://github.com/palantir/gradle-jacoco-coverage";>JacocoFullReport</a> to aggregate the JaCoCo report for - * each Gradle sub-module into one master report. The Gradle JaCoCo plugin does not do the aggregation by default which - * is why this plugin is necessary. The master report is also needed for Coveralls integration which expects a single - * aggregated report in <code>xml</code> format. The aggregated report will be placed under - * <code>build/reports/jacocoFullReport/</code>. */ -apply plugin: 'com.github.kt3k.coveralls' -apply plugin: 'com.palantir.jacoco-full-report' apply plugin: 'jacoco' -ext.jacocoVersion = '0.7.2.201409121644' +ext.jacocoVersion = '0.8.1' jacoco { toolVersion = jacocoVersion @@ -58,12 +50,4 @@ subprojects { }) } } - - jacocoFullReport.dependsOn test -} - -// Configure the coveralls task to read the aggregated JaCoCo report -coveralls { - sourceDirs = subprojects.sourceSets.main.allSource.srcDirs.flatten() - jacocoReportPath = "build/reports/jacoco/jacocoFullReport/jacocoFullReport.xml" } http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2979d5e6/gradle/wrapper/gradle-wrapper.jar ---------------------------------------------------------------------- diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 0087cd3..ca78035 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2979d5e6/gradle/wrapper/gradle-wrapper.properties ---------------------------------------------------------------------- diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 43cbc4f..d1ff792 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -14,10 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -#Thu Nov 13 11:45:43 PST 2014 +#Mon Aug 13 16:50:54 PDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2979d5e6/gradlew ---------------------------------------------------------------------- diff --git a/gradlew b/gradlew index 248f016..7b21abf 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,4 @@ #!/usr/bin/env bash - # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -16,19 +15,36 @@ # See the License for the specific language governing permissions and # limitations under the License. # - ############################################################################## ## ## 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="" +# 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" @@ -47,6 +63,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -57,31 +74,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=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. @@ -107,7 +104,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 @@ -131,6 +128,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` http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2979d5e6/gradlew.bat ---------------------------------------------------------------------- diff --git a/gradlew.bat b/gradlew.bat index 9e12e8c..f74fcf1 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,10 +1,3 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - @rem Licensed to the Apache Software Foundation (ASF) under one or more @rem contributor license agreements. See the NOTICE file distributed with @rem this work for additional information regarding copyright ownership. @@ -19,18 +12,24 @@ @rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @rem See the License for the specific language governing permissions and @rem limitations under the License. +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## @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= - 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 @@ -61,7 +60,7 @@ 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 http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2979d5e6/travis/test-coverage.sh ---------------------------------------------------------------------- diff --git a/travis/test-coverage.sh b/travis/test-coverage.sh index 5ff7dc3..a2e1443 100755 --- a/travis/test-coverage.sh +++ b/travis/test-coverage.sh @@ -28,4 +28,4 @@ script_dir=$(dirname $0) source ${script_dir}/test-groups.inc echo "Starting $0 at " $(date) -time ./gradlew -PskipTestGroup=disabledOnTravis -Dorg.gradle.parallel=false -DjacocoBuild=1 $GOBBLIN_GRADLE_OPTS jacocoFullReport +time ./gradlew -PskipTestGroup=disabledOnTravis -Dorg.gradle.parallel=false -DjacocoBuild=1 $GOBBLIN_GRADLE_OPTS jacocoTestCoverage
