Merge branch '1.3.x' into 1.4.x

shakuzen · shakuzen · commit 4dc6911a3f77 · 2025-04-14T13:12:21.000+09:00
diff --git a/build.gradle b/build.gradle
@@ -170,7 +170,7 @@ subprojects {
 			}
 		}
 
-		task dockerTest(type: Test) {
+		tasks.register('dockerTest', Test) {
 			// set heap size for the test JVM(s)
 			maxHeapSize = '1500m'
 
diff --git a/docs/src/test/resources/docs-generator-build.gradle b/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

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ subprojects {`
`170`	`170`	`}`
`171`	`171`	`}`
`172`	`172`
`173`		`- task dockerTest(type: Test) {`
	`173`	`+ tasks.register('dockerTest', Test) {`
`174`	`174`	`// set heap size for the test JVM(s)`
`175`	`175`	`maxHeapSize = '1500m'`
`176`	`176`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ dependencies {`
`32`	`32`	`adoc "io.micrometer:micrometer-docs-generator:$micrometerDocsVersion"`
`33`	`33`	`}`
`34`	`34`
`35`		`-task generateObservabilityDocs(type: JavaExec) {`
	`35`	`+tasks.register('generateObservabilityDocs', JavaExec) {`
`36`	`36`	`mainClass = "io.micrometer.docs.DocsGeneratorCommand"`
`37`	`37`	`classpath configurations.adoc`
`38`	`38`	`// input folder, inclusion pattern, output folder`