Update to Gradle 7.0

See https://docs.gradle.org/7.0/release-notes.html
apache · Apr 12, 2021 · fcfabce · fcfabce
1 parent d4b48df
commit fcfabce
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -27,7 +27,8 @@ jobs:
       with:
         job-id: jdk14
         multi-cache-enabled: false
-        arguments: --scan --no-parallel build -x distTar -x distTarSource
+        # An explicit skip for Sha512 tasks is required due to https://github.com/gradle/gradle/issues/16789
+        arguments: --scan --no-parallel build -x distTar -x distTarSource -x distTarSha512 -x distTarSourceSha512
 
   mac:
     name: 'macOS (JDK 14)'
@@ -45,7 +46,7 @@ jobs:
       with:
         job-id: jdk14
         multi-cache-enabled: false
-        arguments: --scan --no-parallel build -x distTar -x distTarSource -Dskip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server=true
+        arguments: --scan --no-parallel build -x distTar -x distTarSource -x distTarSha512 -x distTarSourceSha512 -Dskip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server=true
 
   errorprone:
     name: 'Error Prone (JDK 11)'

diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ cache:
 
 env:
   global:
-    - SKIP_TAR="-x distTar -x distTarSource"
+    - SKIP_TAR="-x distTar -x distTarSource -x distTarSha512 -x distTarSourceSha512"
     - ORG_GRADLE_PROJECT_checksumFailOn=build_finish
     - ORG_GRADLE_PROJECT_checksumPrint=true
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -500,7 +500,7 @@ allprojects {
         }
 
         repositories {
-            jcenter()
+            mavenCentral()
         }
 
         tasks {

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -25,13 +25,11 @@ plugins {
 }
 
 repositories {
-    jcenter()
     gradlePluginPortal()
 }
 
 allprojects {
     repositories {
-        jcenter()
         gradlePluginPortal()
     }
     applyKotlinProjectConventions()
@@ -40,12 +38,6 @@ allprojects {
 fun Project.applyKotlinProjectConventions() {
     apply(plugin = "org.gradle.kotlin.kotlin-dsl")
 
-    plugins.withType<KotlinDslPlugin> {
-        configure<KotlinDslPluginOptions> {
-            experimentalWarning.set(false)
-        }
-    }
-
     tasks.withType<KotlinCompile> {
         sourceCompatibility = "unused"
         targetCompatibility = "unused"

diff --git a/buildSrc/checksum.xml b/buildSrc/checksum.xml
@@ -44,6 +44,9 @@
     <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='1.4.9'>
       <sha512>E2E7D75380BBFB3A6DAA93A75FAB9D8F4038D42FFBA93B9FE8A350C1BD735FF746A01E3FB76A62DFA7B26EDADA638EB045D45F47568A427E6C1505F70A92AE79</sha512>
     </dependency>
+    <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='2.1.4'>
+      <sha512>A343D64A4A607CD30B8464391FA542CDD11B3CAE65A589134DFADF298867B938A79CB752EC709614CB9F2E3080341936FDD40223EBFE414399D0FDAF15ACD358</sha512>
+    </dependency>
     <dependency group='org.gradle.kotlin' module='plugins' version='1.2.8'>
       <sha512>8EA1B7517CCCC6DD1A41CF0E88613F14548AF9052A0A8E1C68004F3B58A1D26B47A8BDA2D9F663213F59FCDBCEC4BE1A596D8B0B50013C7DD0276140D9DE3391</sha512>
     </dependency>

diff --git a/buildSrc/subprojects/batchtest/batchtest.gradle.kts b/buildSrc/subprojects/batchtest/batchtest.gradle.kts
@@ -17,7 +17,8 @@
  */
 
 dependencies {
-    implementation("org.ajoberstar.grgit:grgit-gradle:3.1.1")
+    implementation("org.ajoberstar.grgit:grgit-gradle:4.1.0")
+    implementation("org.eclipse.jgit:org.eclipse.jgit:5.11.0.202103091610-r")
 }
 
 gradlePlugin {

diff --git a/...ects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt b/...ects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt
@@ -35,4 +35,4 @@ fun Writer.withPrefix(prefix: String) =
                 throw failure
             }
         }
-    })
+    }, System.lineSeparator())
diff --git a/checksum.xml b/checksum.xml
@@ -12,6 +12,7 @@
     <trusted-key id='105cb91cac2aee0e' group='com.github.autostyle' />
     <trusted-key id='07d3516820bcf6b1' group='com.github.ben-manes.caffeine' />
     <trusted-key id='3c0a8f4744f37328' group='com.github.ben-manes.caffeine' />
+    <trusted-key id='379ce192d401ab61' group='com.github.javaparser' />
     <trusted-key id='8ea48d105232855d' group='com.github.jknack' />
     <trusted-key id='218fa0f6a941a037' group='com.github.kevinstern' />
     <trusted-key id='461a804f2609fd89' group='com.github.shyiko.klob' />
@@ -47,6 +48,7 @@
     <trusted-key id='aa49c633b4734832' group='com.pinterest.ktlint' />
     <trusted-key id='1063fe98bcecb758' group='com.puppycrawl.tools' />
     <trusted-key id='6425559c47cc79c4' group='com.sun.activation' />
+    <trusted-key id='1b2718089ce964b8' group='com.thoughtworks.qdox' />
     <trusted-key id='602ec18d20c4661c' group='com.thoughtworks.xstream' />
     <trusted-key id='1861c322c56014b2' group='commons-beanutils' />
     <trusted-key id='3faad2cd5ecbb314' group='commons-beanutils' />

diff --git a/gradle.properties b/gradle.properties
@@ -42,9 +42,9 @@ velocity.version=1.7
 # Plugins
 com.github.autostyle.version=3.0
 com.github.spotbugs.version=4.5.0
-com.github.vlsi.checksum-dependency.sha512=4D1A76F38F327CEA0C723D9BDD9ABFE16933769052F47BCECD555DDD1A6CD0A9C21E3CC8F9E1B92780F9B443070D4844889EE9ECB0690D30E50AAB085096D8E1
-com.github.vlsi.checksum-dependency.version=1.70
-com.github.vlsi.vlsi-release-plugins.version=1.70
+com.github.vlsi.checksum-dependency.sha512=84572B7F654D1F9842DDD7E0D4331461DC55B92CDC1DA8EBA2269870CE027B021AB91D1942043145825B00521A92029C969BFA388A27BD63CC509BF7AB18E35F
+com.github.vlsi.checksum-dependency.version=1.74
+com.github.vlsi.vlsi-release-plugins.version=1.74
 net.ltgt.errorprone.version=1.2.1
 org.jetbrains.gradle.plugin.idea-ext.version=0.5
 org.nosphere.apache.rat.version=0.7.0

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=fd591a34af7385730970399f473afabdb8b28d57fd97d6625c388d090039d6fd
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
+distributionSha256Sum=eb8b89184261025b0430f5b2233701ff1377f96da1ef5e278af6ae8bac5cc305
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -130,6 +130,8 @@ val expectedSha512 = mapOf(
             to "gradle-enterprise-gradle-plugin-3.4.1.jar",
     "AA8D06BDF95A6BAAEFE2B0DAE530FCD324A92238F7B790C0FF4A4B5C6454A6BE83D2C81BFEC013A7368697A0A9FC61B97E91775EF9948EF5572FA1DAA9E82052"
             to "gradle-enterprise-gradle-plugin-3.5.jar",
+    "2A01A91008DF02AA0256D64EAB9238B23B85EA2A886E024E07C3880D642C5E4B96E66DE0D90832BCCEFE5F7C8EF045EBB9905B2A74398E38FAD6A5B28BEBA54D"
+            to "gradle-enterprise-gradle-plugin-3.6.jar",
     "43BC9061DFDECA0C421EDF4A76E380413920E788EF01751C81BDC004BD28761FBD4A3F23EA9146ECEDF10C0F85B7BE9A857E9D489A95476525565152E0314B5B"
             to "bcpg-jdk15on-1.62.jar",
     "2BA6A5DEC9C8DAC2EB427A65815EB3A9ADAF4D42D476B136F37CD57E6D013BF4E9140394ABEEA81E42FBDB8FC59228C7B85C549ED294123BF898A7D048B3BD95"

diff --git a/src/build.gradle.kts b/src/build.gradle.kts
@@ -109,7 +109,6 @@ subprojects {
     }
 
     val testClasses by configurations.creating {
-        extendsFrom(configurations["testRuntime"])
     }
 
     if (testsPresent) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -500,7 +500,7 @@ allprojects { @@
             }
             repositories {
-                jcenter()
+                mavenCentral()
             }
             tasks {
@@ Expand Down @@