Merge branch '6.0.x' into 6.1.x

marcusdacoregio · marcusdacoregio · commit 84df78af1257 · 2023-10-10T13:18:24.000-03:00
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/IntegrationTestPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/IntegrationTestPlugin.groovy
@@ -70,11 +70,9 @@ public class IntegrationTestPlugin implements Plugin<Project> {
 			}
 			integrationTestCompileClasspath {
 				extendsFrom integrationTestCompile
-				canBeResolved = true
 			}
 			integrationTestRuntimeClasspath {
 				extendsFrom integrationTestRuntime
-				canBeResolved = true
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -70,11 +70,9 @@ public class IntegrationTestPlugin implements Plugin<Project> {`
`70`	`70`	`}`
`71`	`71`	`integrationTestCompileClasspath {`
`72`	`72`	`extendsFrom integrationTestCompile`
`73`		`- canBeResolved = true`
`74`	`73`	`}`
`75`	`74`	`integrationTestRuntimeClasspath {`
`76`	`75`	`extendsFrom integrationTestRuntime`
`77`		`- canBeResolved = true`
`78`	`76`	`}`
`79`	`77`	`}`
`80`	`78`