Test Gradle plugin against Gradle 8.7

wilkinsona · wilkinsona · commit aee88115ea8d · 2024-03-25T10:24:21.000Z
This commit includes some changes to test Gradle scripts to avoid Gradle 8.7's new deprecation warning about URI conversion. Closes gh-40093
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/DependencyManagementPluginActionIntegrationTests.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/DependencyManagementPluginActionIntegrationTests.gradle
@@ -17,7 +17,7 @@ if (project.hasProperty('applyDependencyManagementPlugin')) {
 }
 
 repositories {
-	maven { url 'file:repository' }
+	maven { url 'repository' }
 }
 
 task doesNotHaveDependencyManagement {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests-kotlinVersionPropertyIsSet.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests-kotlinVersionPropertyIsSet.gradle
@@ -17,7 +17,7 @@ dependencyManagement {
 
 repositories {
 	mavenCentral()
-	maven { url 'file:repository' }
+	maven { url 'repository' }
 }
 
 dependencies {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/OnlyDependencyManagementIntegrationTests.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/OnlyDependencyManagementIntegrationTests.gradle
@@ -6,7 +6,7 @@ plugins {
 apply plugin: 'io.spring.dependency-management'
 
 repositories {
-	maven { url 'file:repository' }
+	maven { url 'repository' }
 }
 
 dependencyManagement {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/SpringBootAotPluginIntegrationTests-processTestAotDoesNotHaveDevelopmentOnlyDependenciesOnItsClasspath.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/SpringBootAotPluginIntegrationTests-processTestAotDoesNotHaveDevelopmentOnlyDependenciesOnItsClasspath.gradle
@@ -7,7 +7,7 @@ apply plugin: 'org.springframework.boot.aot'
 
 repositories {
 	mavenCentral()
-	maven { url 'file:repository' }
+	maven { url 'repository' }
 }
 
 configurations.all {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/SpringBootAotPluginIntegrationTests-processTestAotHasLibraryResourcesOnItsClasspath.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/SpringBootAotPluginIntegrationTests-processTestAotHasLibraryResourcesOnItsClasspath.gradle
@@ -6,7 +6,7 @@ plugins {
 
 repositories {
 	mavenCentral()
-	maven { url 'file:repository' }
+	maven { url 'repository' }
 }
 
 configurations.all {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/SpringBootAotPluginIntegrationTests-processTestAotHasTransitiveRuntimeDependenciesOnItsClasspath.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/SpringBootAotPluginIntegrationTests-processTestAotHasTransitiveRuntimeDependenciesOnItsClasspath.gradle
@@ -6,7 +6,7 @@ plugins {
 
 repositories {
 	mavenCentral()
-	maven { url 'file:repository' }
+	maven { url 'repository' }
 }
 
 configurations.all {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-customLayers.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-customLayers.gradle
@@ -27,7 +27,7 @@ bootJar {
 
 repositories {
 	mavenCentral()
-	maven { url "file:repository" }
+	maven { url 'repository' }
 }
 
 dependencies {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-explodedApplicationClasspath.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-explodedApplicationClasspath.gradle
@@ -5,7 +5,7 @@ plugins {
 
 repositories {
 	mavenCentral()
-	maven { url "file:repository" }
+	maven { url 'repository' }
 }
 
 dependencies {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-implicitLayers.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-implicitLayers.gradle
@@ -9,7 +9,7 @@ bootJar {
 
 repositories {
 	mavenCentral()
-	maven { url "file:repository" }
+	maven { url 'repository' }
 }
 
 dependencies {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-layersWithCustomSourceSet.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-layersWithCustomSourceSet.gradle
@@ -13,7 +13,7 @@ bootJar {
 
 repositories {
 	mavenCentral()
-	maven { url "file:repository" }
+	maven { url 'repository' }
 }
 
 dependencies {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-multiModuleCustomLayers.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-multiModuleCustomLayers.gradle
@@ -42,7 +42,7 @@ bootJar {
 
 repositories {
 	mavenCentral()
-	maven { url "file:repository" }
+	maven { url 'repository' }
 }
 
 dependencies {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-multiModuleImplicitLayers.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-multiModuleImplicitLayers.gradle
@@ -20,7 +20,7 @@ bootJar {
 
 repositories {
 	mavenCentral()
-	maven { url "file:repository" }
+	maven { url 'repository' }
 }
 
 dependencies {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-packagedApplicationClasspath.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-packagedApplicationClasspath.gradle
@@ -10,7 +10,7 @@ task launch(type: JavaExec) {
 
 repositories {
 	mavenCentral()
-	maven { url "file:repository" }
+	maven { url 'repository' }
 }
 
 dependencies {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-customLayers.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-customLayers.gradle
@@ -28,7 +28,7 @@ bootWar {
 
 repositories {
 	mavenCentral()
-	maven { url "file:repository" }
+	maven { url 'repository' }
 }
 
 dependencies {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-implicitLayers.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-implicitLayers.gradle
@@ -10,7 +10,7 @@ bootWar {
 
 repositories {
 	mavenCentral()
-	maven { url "file:repository" }
+	maven { url 'repository' }
 }
 
 dependencies {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-layersWithCustomSourceSet.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-layersWithCustomSourceSet.gradle
@@ -14,7 +14,7 @@ bootWar {
 
 repositories {
 	mavenCentral()
-	maven { url "file:repository" }
+	maven { url 'repository' }
 }
 
 dependencies {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-multiModuleCustomLayers.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-multiModuleCustomLayers.gradle
@@ -43,7 +43,7 @@ bootWar {
 
 repositories {
 	mavenCentral()
-	maven { url "file:repository" }
+	maven { url 'repository' }
 }
 
 dependencies {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-multiModuleImplicitLayers.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-multiModuleImplicitLayers.gradle
@@ -21,7 +21,7 @@ bootWar {
 
 repositories {
 	mavenCentral()
-	maven { url "file:repository" }
+	maven { url 'repository' }
 }
 
 dependencies {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java
@@ -35,9 +35,9 @@ private GradleVersions() {
 	@SuppressWarnings("UnstableApiUsage")
 	public static List<String> allCompatible() {
 		if (isJavaVersion(JavaVersion.VERSION_20)) {
-			return Arrays.asList("8.1.1", "8.6");
+			return Arrays.asList("8.1.1", "8.7");
 		}
-		return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.6");
+		return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.7");
 	}
 
 	public static String minimumCompatible() {

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ if (project.hasProperty('applyDependencyManagementPlugin')) {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`repositories {`
`20`		`- maven { url 'file:repository' }`
	`20`	`+ maven { url 'repository' }`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`task doesNotHaveDependencyManagement {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ dependencyManagement {`
`17`	`17`
`18`	`18`	`repositories {`
`19`	`19`	`mavenCentral()`
`20`		`- maven { url 'file:repository' }`
	`20`	`+ maven { url 'repository' }`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ plugins {`
`6`	`6`	`apply plugin: 'io.spring.dependency-management'`
`7`	`7`
`8`	`8`	`repositories {`
`9`		`- maven { url 'file:repository' }`
	`9`	`+ maven { url 'repository' }`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`dependencyManagement {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ apply plugin: 'org.springframework.boot.aot'`
`7`	`7`
`8`	`8`	`repositories {`
`9`	`9`	`mavenCentral()`
`10`		`- maven { url 'file:repository' }`
	`10`	`+ maven { url 'repository' }`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`configurations.all {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ bootJar {`
`27`	`27`
`28`	`28`	`repositories {`
`29`	`29`	`mavenCentral()`
`30`		`- maven { url "file:repository" }`
	`30`	`+ maven { url 'repository' }`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ plugins {`
`5`	`5`
`6`	`6`	`repositories {`
`7`	`7`	`mavenCentral()`
`8`		`- maven { url "file:repository" }`
	`8`	`+ maven { url 'repository' }`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ bootJar {`
`9`	`9`
`10`	`10`	`repositories {`
`11`	`11`	`mavenCentral()`
`12`		`- maven { url "file:repository" }`
	`12`	`+ maven { url 'repository' }`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ bootJar {`
`13`	`13`
`14`	`14`	`repositories {`
`15`	`15`	`mavenCentral()`
`16`		`- maven { url "file:repository" }`
	`16`	`+ maven { url 'repository' }`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`dependencies {`