Upgrade Gradle: 6.1 -> 6.3

This brings Java 14 compatibility
markus-h · Mar 28, 2020 · d26f390 · d26f390
1 parent 0123013
commit d26f390
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 51 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,32 +12,32 @@ on:
 
 jobs:
   windows:
-    name: 'Windows (JDK 13)'
+    name: 'Windows (JDK 14)'
     runs-on: windows-latest
     steps:
     - uses: actions/[email protected]
       with:
         fetch-depth: 50
-    - name: 'Set up JDK 13'
+    - name: 'Set up JDK 14'
       uses: actions/setup-java@v1
       with:
-        java-version: 13
+        java-version: 14
     - name: 'Test'
       shell: bash
       run: |
         ./gradlew --no-parallel build -x distTar -x distTarSource
 
   mac:
-    name: 'macOS (JDK 13)'
+    name: 'macOS (JDK 14)'
     runs-on: macos-latest
     steps:
     - uses: actions/[email protected]
       with:
         fetch-depth: 50
-    - name: 'Set up JDK 13'
+    - name: 'Set up JDK 14'
       uses: actions/setup-java@v1
       with:
-        java-version: 13
+        java-version: 14
     - name: 'Test'
       run: |
         ./gradlew --no-parallel build -x distTar -x distTarSource -Dskip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server=true
diff --git a/.travis.yml b/.travis.yml
@@ -48,24 +48,24 @@ matrix:
         # This job verifies headless mode to ensure Apache JMeter is workable in headless as well
         # Spotless and Checkstyle are skipped here to save some time. They are verified anyway in Java 8 and Java 13 builds, so skipping them for Java 11 does not harm
         - ./gradlew build -Djava.awt.headless=true -Duser.language=fr -Duser.country=FR -PskipCheckstyle -PskipSpotless $SKIP_TAR
-    - name: Tests with OpenJDK 11 on s390x 
-      os: linux  
-      arch: s390x  
-      dist: bionic 
-      jdk: openjdk11 
-      addons: 
-        apt: 
-          packages: 
-            - language-pack-fr 
-      script: 
-        - sudo apt-get install -y openjdk-11-jdk  
-        - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-s390x/  
-        - export PATH=$JAVA_HOME/bin:$PATH   
+    - name: Tests with OpenJDK 11 on s390x
+      os: linux
+      arch: s390x
+      dist: bionic
+      jdk: openjdk11
+      addons:
+        apt:
+          packages:
+            - language-pack-fr
+      script:
+        - sudo apt-get install -y openjdk-11-jdk
+        - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-s390x/
+        - export PATH=$JAVA_HOME/bin:$PATH
         - ./gradlew build -Djava.awt.headless=true -PskipCheckstyle -PskipSpotless $SKIP_TAR
     # Java 12 is not here because it has been superceeded by Java 13
     # Tests with Java 12 do not surface much new, so Java 11 (LTS) and Java 13 (non-LTS) are enough for "post Java 9" testing
-    - name: Tests with OpenJDK 13
-      jdk: openjdk13
+    - name: Tests with OpenJDK 14
+      jdk: openjdk14
       addons:
         apt:
           packages:
@@ -86,15 +86,15 @@ matrix:
         - cd jmeter-maven-plugin
         - mvn verify -Djmeter.version=42.0-SNAPSHOT
     - name: jmeter-maven-plugin tests on s390x
-      os: linux  
-      arch: s390x  
-      jdk: openjdk11 
-      script: 
-        - wget http://www.eu.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz  
-        - tar -xvzf apache-maven-3.6.3-bin.tar.gz  
-        - export PATH=`pwd`/apache-maven-3.6.3/bin/:$PATH  
-        - ./gradlew -PskipJavadoc publishToMavenLocal -Pjmeter.version=42.0 -PchecksumIgnore 
-        - cd .. 
-        - git clone --depth 100 https://github.com/jmeter-maven-plugin/jmeter-maven-plugin.git 
-        - cd jmeter-maven-plugin 
+      os: linux
+      arch: s390x
+      jdk: openjdk11
+      script:
+        - wget http://www.eu.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
+        - tar -xvzf apache-maven-3.6.3-bin.tar.gz
+        - export PATH=`pwd`/apache-maven-3.6.3/bin/:$PATH
+        - ./gradlew -PskipJavadoc publishToMavenLocal -Pjmeter.version=42.0 -PchecksumIgnore
+        - cd ..
+        - git clone --depth 100 https://github.com/jmeter-maven-plugin/jmeter-maven-plugin.git
+        - cd jmeter-maven-plugin
         - mvn verify -Djmeter.version=42.0-SNAPSHOT
diff --git a/buildSrc/checksum.xml b/buildSrc/checksum.xml
@@ -51,6 +51,9 @@
     <dependency group='org.gradle.kotlin' module='plugins' version='1.3.3'>
       <sha512>651EACA737F0F794E5805ED6503E4E00A8105BD97DA60A6A75C161C03F2DCF649466D35831D9466D7B1297C707EBEC33D75B2C7FD411F713EB51522629995206</sha512>
     </dependency>
+    <dependency group='org.gradle.kotlin' module='plugins' version='1.3.4'>
+      <sha512>B6F05B16B1826C3FD50D80AFD14965566B27313691A111EC8589867678D6B92AF827E5E098BECCE8F911D8B479AF5303322A6B2ECA971D1A2D985F42BD1AAA87</sha512>
+    </dependency>
     <dependency group='org.slf4j' module='jcl-over-slf4j' version='1.6.2'>
       <sha512>3BA508C96EE0985865C9E86EBE803D1903835F7C198EB15723CDC86B028D6C82DBB7E96ECB01CEFAD7CC6EC7023155676D034B6B730A911D0FFE9F91FE532592</sha512>
     </dependency>

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
@@ -17,7 +17,7 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=634f972af958e3c753aeb42d7a688fab6820b527a0aef9eed03d7f3f6f9c7c06
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip
+distributionSha256Sum=0f316a67b971b7b571dac7215dcf2591a30994b3450e0629925ffcfe2c68cc5c
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $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" ;;
+        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
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+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" "$@"
diff --git a/gradlew.bat b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @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="-Xmx64m" "-Xms64m"
 

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
@@ -154,6 +154,7 @@ For instance: log viewer, JSR223 code editor were not previously scaled with zoo
 
 <ch_section>Non-functional changes</ch_section>
 <ul>
+    <li>Build system upgraded from Gradle to 6.3 (from 6.1), Java 14 can be used now for the build</li>
     <li><bug>63963</bug><pr>546</pr>Updated jackson to 2.10.2 (from 2.9.10)</li>
     <li><bug>64120</bug>Updated jsoup to 1.13.1 (from 1.12.1)</li>
     <li><bug>63809</bug>Updated commons-dbcp2 to 2.7.0 (from 2.5.0)</li>