Merge branch '1.13.x' into 1.14.x

Author: shakuzen

build.gradle

@@ -194,7 +194,7 @@ subprojects {
             }
         }
 
-        task dockerTest(type: Test) {
+        tasks.register("dockerTest", Test) {
             // set heap size for the test JVM(s)
             maxHeapSize = "1500m"
 
@@ -343,7 +343,7 @@ subprojects {
                 }
             }
 
-            task testModules(type: Exec) {
+            tasks.register("testModules", Exec) {
                 dependsOn jar
                 String executablePath = javaToolchains.launcherFor { languageVersion = javaLanguageVersion }.get().executablePath
                 commandLine "$executablePath", '-p', "$jar.archivePath", '--list-modules'
@@ -363,7 +363,7 @@ subprojects {
                 apply plugin: 'me.champeau.gradle.japicmp'
                 apply plugin: 'de.undercouch.download'
 
-                task downloadBaseline(type: Download) {
+                tasks.register("downloadBaseline", Download) {
                     onlyIf {
                         if (project.gradle.startParameter.isOffline()) {
                             println 'Offline: skipping downloading of baseline and JAPICMP'
@@ -392,7 +392,7 @@ subprojects {
                     dest layout.buildDirectory.file("baselineLibs/${project.name}-${compatibleVersion}.jar")
                 }
 
-                task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask) {
+                tasks.register("japicmp", me.champeau.gradle.japicmp.JapicmpTask) {
                     oldClasspath.from(layout.buildDirectory.file("baselineLibs/${project.name}-${compatibleVersion}.jar"))
                     newClasspath.from(files(jar.archiveFile, project(":${project.name}").jar))
                     onlyBinaryIncompatibleModified = true

docs/src/test/resources/docs-generator-build.gradle

@@ -32,7 +32,7 @@ dependencies {
 	adoc "io.micrometer:micrometer-docs-generator:$micrometerDocsVersion"
 }
 
-task generateObservabilityDocs(type: JavaExec) {
+tasks.register("generateObservabilityDocs", JavaExec) {
 	mainClass = "io.micrometer.docs.DocsGeneratorCommand"
 	classpath configurations.adoc
 	// input folder, inclusion pattern, output folder

implementations/micrometer-registry-stackdriver/build.gradle

@@ -23,7 +23,7 @@ test {
     }
 }
 
-task stackdriverTest(type: Test) {
+tasks.register("stackdriverTest", Test) {
     useJUnitPlatform {
         includeTags 'gcp-it'
     }

micrometer-core/build.gradle

@@ -215,7 +215,7 @@ dependencies {
     testImplementation libs.aspectjweaver
 }
 
-task shenandoahTest(type: Test) {
+tasks.register("shenandoahTest", Test) {
     // set heap size for the test JVM(s)
     maxHeapSize = "1500m"
 
@@ -226,7 +226,7 @@ task shenandoahTest(type: Test) {
     jvmArgs '-XX:+UseShenandoahGC'
 }
 
-task zgcTest(type: Test) {
+tasks.register("zgcTest", Test) {
     // set heap size for the test JVM(s)
     maxHeapSize = "1500m"
 
@@ -237,7 +237,7 @@ task zgcTest(type: Test) {
     jvmArgs '-XX:+UseZGC'
 }
 
-task zgcGenerationalTest(type: Test) {
+tasks.register("zgcGenerationalTest", Test) {
     // set heap size for the test JVM(s)
     maxHeapSize = "1500m"
 
@@ -248,7 +248,7 @@ task zgcGenerationalTest(type: Test) {
     jvmArgs '-XX:+UseZGC', '-XX:+ZGenerational'
 }
 
-task openj9BalancedTest(type: Test) {
+tasks.register("openj9BalancedTest", Test) {
     // set heap size for the test JVM(s)
     maxHeapSize = "1500m"
 
@@ -259,7 +259,7 @@ task openj9BalancedTest(type: Test) {
     jvmArgs '-Xgcpolicy:balanced'
 }
 
-task openj9ConcurrentScavengeTest(type: Test) {
+tasks.register("openj9ConcurrentScavengeTest", Test) {
     // set heap size for the test JVM(s)
     maxHeapSize = "1500m"