This is an automated email from the ASF dual-hosted git repository. vladimirsitnikov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push: new 6ef7d17 Update Gradle to 6.0 6ef7d17 is described below commit 6ef7d17fc345117dc61fcaa8603a3c71efd6fed3 Author: Vladimir Sitnikov <sitnikov.vladi...@gmail.com> AuthorDate: Sat Nov 9 14:26:21 2019 +0300 Update Gradle to 6.0 --- .github/workflows/main.yml | 14 ++++++++------ .travis.yml | 18 ++++++++++-------- checksum.xml | 10 +++++----- gradle.properties | 10 +++++----- gradle/wrapper/gradle-wrapper.jar | Bin 55741 -> 55616 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradlew | 22 +++++++++++++++++++--- gradlew.bat | 18 +++++++++++++++++- 8 files changed, 66 insertions(+), 30 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7c685bd..d2edf7a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,34 +8,36 @@ on: branches: - '*' +# https://help.github.com/en/actions/automating-your-workflow-with-github-actions/software-installed-on-github-hosted-runners + jobs: windows: - name: 'Windows (JDK 12)' + name: 'Windows (JDK 13)' runs-on: windows-latest steps: - uses: actions/checkout@master with: fetch-depth: 50 - - name: 'Set up JDK 12' + - name: 'Set up JDK 13' uses: actions/setup-java@v1 with: - java-version: 12 + java-version: 13 - name: 'Test' shell: bash run: | ./gradlew --no-parallel build -x distTar -x distTarSource mac: - name: 'macOS (JDK 12)' + name: 'macOS (JDK 13)' runs-on: macos-latest steps: - uses: actions/checkout@master with: fetch-depth: 50 - - name: 'Set up JDK 12' + - name: 'Set up JDK 13' uses: actions/setup-java@v1 with: - java-version: 12 + java-version: 13 - name: 'Test' run: | ./gradlew --no-parallel build -x distTar -x distTarSource -Dskip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server=true diff --git a/.travis.yml b/.travis.yml index 6db683d..8618c1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,12 +44,14 @@ matrix: # 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 + addons: + apt: + packages: + - language-pack-fr + env: + - TZ=America/New_York # flips between −05:00 and −04:00 + - LANG=fr_FR.UTF-8 + - LC_ALL=fr_FR.UTF-8 script: - # ./gradlew wrapper task kills license header from gradle-wrapper.properties, so we use grep/echo to update the file - - grep -v Sha256 gradle/wrapper/gradle-wrapper.properties | grep -v Url > gradle/wrapper/gradle-wrapper.properties2 - - echo 'distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-6.0-20191001230020+0000-bin.zip' >> gradle/wrapper/gradle-wrapper.properties2 - - mv gradle/wrapper/gradle-wrapper.properties2 gradle/wrapper/gradle-wrapper.properties - # Spotless and Checkstyle are executed here as well to test if the plugins are compatible with Gradle 6.0 / Java 13 - - xvfb-run ./gradlew build -PchecksumFailOn=never -PchecksumPrint=false $SKIP_TAR - # Show difference between the new dependencies and old ones. It is expected that new Gradle version might bring new dependencies - - diff -u checksum.xml build/checksum/checksum.xml || true + # Spotless, Checksyle, and JaCoCo are verified here to ensure they all work with the latest supported Java + - xvfb-run ./gradlew build jacocoReport -Duser.language=fr -Duser.country=FR $SKIP_TAR diff --git a/checksum.xml b/checksum.xml index eb30516..c02bb85 100644 --- a/checksum.xml +++ b/checksum.xml @@ -144,17 +144,17 @@ <dependency group='com.github.bulenkov.darcula' module='darcula' version='e208efb96f70e4be9dc362fbb46f6e181ef501dd'> <sha512>80F3335D8EA3FB3FF07A12A79C958C4E3F8BB542511C52825A8B3694AC96F027E24396CE9EDCEFA44EE93B5CBED4E4AED4575E6AAED56F363BAE92C52EE85D22</sha512> </dependency> - <dependency group='com.github.vlsi.gradle' module='crlf-plugin' version='1.42.0'> + <dependency group='com.github.vlsi.gradle' module='crlf-plugin' version='1.43.0'> <sha512>6DF347AE68A114D5FCF561163921A19E299DEB3D5E4EF721602B0144A6AFB8D202C04884DA047E53E0E815101DAAF52858FE33A4C92D5936D5DC9DE300842DA4</sha512> </dependency> - <dependency group='com.github.vlsi.gradle' module='ide-plugin' version='1.42.0'> + <dependency group='com.github.vlsi.gradle' module='ide-plugin' version='1.43.0'> <sha512>15BF2B9C358CE9DB843862E26BA130383A41B429FA0B46C53E18C4D0AB55921526502D9D8BEA4F4041BBF0496B5E93C811DAC786CC6A2A8EF5C53C234254D409</sha512> </dependency> - <dependency group='com.github.vlsi.gradle' module='license-gather-plugin' version='1.42.0'> + <dependency group='com.github.vlsi.gradle' module='license-gather-plugin' version='1.43.0'> <sha512>2BD5C985444B8AD3899F6210A0889D08FBDF35320D1BA6DF15E7436A345C88BC66B5905FD6DC5BE304E6C2CB08093B6578FF3DC13304EA0B3CE943E3544A0A4B</sha512> </dependency> - <dependency group='com.github.vlsi.gradle' module='stage-vote-release-plugin' version='1.42.0'> - <sha512>EC8B465F4F6FBF928131D3E3626554F5E1857979CE7A764FBD887E1689DFBF3FD79F8CDFE3EE225EB16A8173B8F06421A153B9FD29E6EAD4AD53DEE950C9E7CD</sha512> + <dependency group='com.github.vlsi.gradle' module='stage-vote-release-plugin' version='1.43.0'> + <sha512>6BE9C5E6AB9A9BE55D87B7DC5CB00EA9FB35E2A25303767574B7F443CFDDD545F4754A087645B842C7540B9C6A9BDD7CEB032AEAC6D45066DE29043C68A8EC2C</sha512> </dependency> <dependency group='commons-logging' module='commons-logging' version='1.0.4'> <sha512>C8D2D39A60ADCC49091D393DAF30473D1776E4B6B09BB86639171F660833A17AFBDC9F3E85843093535DA16FA664CD7CD4CA38F54E141018DD1B78DE681AD668</sha512> diff --git a/gradle.properties b/gradle.properties index 704b867..d0b3f13 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,7 +24,7 @@ jmeter.version=5.2.1 # Tools checkstyle.version=8.22 -jacoco.version=0.8.2 +jacoco.version=0.8.5 spotbugs.version=3.1.12 velocity.version=1.7 @@ -32,10 +32,10 @@ velocity.version=1.7 com.diffplug.gradle.spotless.version=3.25.0 com.github.spotbugs.version=2.0.0 com.github.vlsi.checksum-dependency.sha512=A86B9B2CBA7BA99860EF2F23555F1E1C1D5CB790B1C47536C32FE7A0FDA48A55694A5457B9F42C60B4725F095B90506324BDE0299F08E9E76B5944FB308375AC -com.github.vlsi.checksum-dependency.version=1.42.0 -com.github.vlsi.crlf.version=1.42.0 -com.github.vlsi.ide.version=1.42.0 -com.github.vlsi.stage-vote-release.version=1.42.0 +com.github.vlsi.checksum-dependency.version=1.43.0 +com.github.vlsi.crlf.version=1.43.0 +com.github.vlsi.ide.version=1.43.0 +com.github.vlsi.stage-vote-release.version=1.43.0 org.jetbrains.gradle.plugin.idea-ext.version=0.5 org.nosphere.apache.rat.version=0.5.2 org.sonarqube.version=2.7.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 457aad0..5c2d1cf 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a1b83de..9f08c4c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -15,7 +15,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=027fdd265d277bae65a0d349b6b8da02135b0b8e14ba891e26281fa877fe37a2 -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip +distributionSha256Sum=a1eb4439c0a85bc7e64a22658d862e43b7d0ddfbf69a7abf6256e0b7514295df +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index af6708f..83f2acf 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ 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='"-Xmx64m"' +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -109,8 +125,8 @@ 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 +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` diff --git a/gradlew.bat b/gradlew.bat index 6d57edc..9618d8d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@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. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -14,7 +30,7 @@ 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="-Xmx64m" +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome