Skip to content

Commit aee8811

Browse files
wilkinsonawilkinsona
committed
Test Gradle plugin against Gradle 8.7
This commit includes some changes to test Gradle scripts to avoid Gradle 8.7's new deprecation warning about URI conversion. Closes gh-40093
1 parent 5c184f8 commit aee8811

19 files changed

+20
-20
lines changed

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/DependencyManagementPluginActionIntegrationTests.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if (project.hasProperty('applyDependencyManagementPlugin')) {
1717
}
1818

1919
repositories {
20-
maven { url 'file:repository' }
20+
maven { url 'repository' }
2121
}
2222

2323
task doesNotHaveDependencyManagement {

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests-kotlinVersionPropertyIsSet.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencyManagement {
1717

1818
repositories {
1919
mavenCentral()
20-
maven { url 'file:repository' }
20+
maven { url 'repository' }
2121
}
2222

2323
dependencies {

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/OnlyDependencyManagementIntegrationTests.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
apply plugin: 'io.spring.dependency-management'
77

88
repositories {
9-
maven { url 'file:repository' }
9+
maven { url 'repository' }
1010
}
1111

1212
dependencyManagement {

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/SpringBootAotPluginIntegrationTests-processTestAotDoesNotHaveDevelopmentOnlyDependenciesOnItsClasspath.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ apply plugin: 'org.springframework.boot.aot'
77

88
repositories {
99
mavenCentral()
10-
maven { url 'file:repository' }
10+
maven { url 'repository' }
1111
}
1212

1313
configurations.all {

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/SpringBootAotPluginIntegrationTests-processTestAotHasLibraryResourcesOnItsClasspath.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66

77
repositories {
88
mavenCentral()
9-
maven { url 'file:repository' }
9+
maven { url 'repository' }
1010
}
1111

1212
configurations.all {

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/SpringBootAotPluginIntegrationTests-processTestAotHasTransitiveRuntimeDependenciesOnItsClasspath.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66

77
repositories {
88
mavenCentral()
9-
maven { url 'file:repository' }
9+
maven { url 'repository' }
1010
}
1111

1212
configurations.all {

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-customLayers.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ bootJar {
2727

2828
repositories {
2929
mavenCentral()
30-
maven { url "file:repository" }
30+
maven { url 'repository' }
3131
}
3232

3333
dependencies {

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-explodedApplicationClasspath.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55

66
repositories {
77
mavenCentral()
8-
maven { url "file:repository" }
8+
maven { url 'repository' }
99
}
1010

1111
dependencies {

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-implicitLayers.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ bootJar {
99

1010
repositories {
1111
mavenCentral()
12-
maven { url "file:repository" }
12+
maven { url 'repository' }
1313
}
1414

1515
dependencies {

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-layersWithCustomSourceSet.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ bootJar {
1313

1414
repositories {
1515
mavenCentral()
16-
maven { url "file:repository" }
16+
maven { url 'repository' }
1717
}
1818

1919
dependencies {

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-multiModuleCustomLayers.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ bootJar {
4242

4343
repositories {
4444
mavenCentral()
45-
maven { url "file:repository" }
45+
maven { url 'repository' }
4646
}
4747

4848
dependencies {

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-multiModuleImplicitLayers.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ bootJar {
2020

2121
repositories {
2222
mavenCentral()
23-
maven { url "file:repository" }
23+
maven { url 'repository' }
2424
}
2525

2626
dependencies {

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-packagedApplicationClasspath.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ task launch(type: JavaExec) {
1010

1111
repositories {
1212
mavenCentral()
13-
maven { url "file:repository" }
13+
maven { url 'repository' }
1414
}
1515

1616
dependencies {

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-customLayers.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ bootWar {
2828

2929
repositories {
3030
mavenCentral()
31-
maven { url "file:repository" }
31+
maven { url 'repository' }
3232
}
3333

3434
dependencies {

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-implicitLayers.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ bootWar {
1010

1111
repositories {
1212
mavenCentral()
13-
maven { url "file:repository" }
13+
maven { url 'repository' }
1414
}
1515

1616
dependencies {

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-layersWithCustomSourceSet.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ bootWar {
1414

1515
repositories {
1616
mavenCentral()
17-
maven { url "file:repository" }
17+
maven { url 'repository' }
1818
}
1919

2020
dependencies {

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-multiModuleCustomLayers.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ bootWar {
4343

4444
repositories {
4545
mavenCentral()
46-
maven { url "file:repository" }
46+
maven { url 'repository' }
4747
}
4848

4949
dependencies {

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-multiModuleImplicitLayers.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ bootWar {
2121

2222
repositories {
2323
mavenCentral()
24-
maven { url "file:repository" }
24+
maven { url 'repository' }
2525
}
2626

2727
dependencies {

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ private GradleVersions() {
3535
@SuppressWarnings("UnstableApiUsage")
3636
public static List<String> allCompatible() {
3737
if (isJavaVersion(JavaVersion.VERSION_20)) {
38-
return Arrays.asList("8.1.1", "8.6");
38+
return Arrays.asList("8.1.1", "8.7");
3939
}
40-
return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.6");
40+
return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.7");
4141
}
4242

4343
public static String minimumCompatible() {

0 commit comments

Comments
 (0)