Skip to content

Commit c13a47e

Browse files
committed
Upgrade Gradle 9 versions used in compatibility tests
Gradle 9.1 will deprecate support for declaring dependencies using a map. To adapt to this, a handful of tests have been updated to use single-string notation instead. Closes gh-46902
1 parent 7fd38ef commit c13a47e

File tree

6 files changed

+14
-15
lines changed

6 files changed

+14
-15
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-additionalMetadataLocationsConfiguredWhenProcessorIsPresent.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ repositories {
2424
}
2525

2626
dependencies {
27-
def configurationName = configurations.findByName('annotationProcessor') != null ? 'annotationProcessor' : 'implementation'
28-
add(configurationName, [name: 'spring-boot-configuration-processor-1.2.3'])
27+
annotationProcessor(':spring-boot-configuration-processor:1.2.3')
2928
}
3029

3130
compileJava {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-jarTypeFilteringIsApplied.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ repositories {
3030
}
3131

3232
dependencies {
33-
implementation(name: "standard")
34-
implementation(name: "starter")
33+
implementation(":standard:")
34+
implementation(":starter:")
3535
}
3636

3737
bootJar {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-jarTypeFilteringIsApplied.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ repositories {
3030
}
3131

3232
dependencies {
33-
implementation(name: "standard")
34-
implementation(name: "starter")
33+
implementation(":standard:")
34+
implementation(":starter:")
3535
}
3636

3737
bootWar {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/run/BootRunIntegrationTests-jarTypeFilteringIsAppliedToTheClasspath.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ repositories {
2626
}
2727

2828
dependencies {
29-
implementation(name: "standard")
30-
implementation(name: "starter")
29+
implementation(":standard:")
30+
implementation(":starter:")
3131
}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/run/BootTestRunIntegrationTests-jarTypeFilteringIsAppliedToTheClasspath.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ repositories {
2626
}
2727

2828
dependencies {
29-
implementation(name: "standard")
30-
implementation(name: "starter")
29+
implementation(":standard:")
30+
implementation(":starter:")
3131
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,18 @@ private GradleVersions() {
3434

3535
public static List<String> allCompatible() {
3636
if (isJavaVersion(JavaVersion.VERSION_24)) {
37-
return Arrays.asList(GradleVersion.current().getVersion(), "9.0.0-rc-2");
37+
return Arrays.asList(GradleVersion.current().getVersion(), "9.0.0", "9.1.0-rc-1");
3838
}
3939
if (isJavaVersion(JavaVersion.VERSION_23)) {
40-
return Arrays.asList(GradleVersion.current().getVersion(), "9.0.0-rc-2");
40+
return Arrays.asList(GradleVersion.current().getVersion(), "9.0.0", "9.1.0-rc-1");
4141
}
4242
if (isJavaVersion(JavaVersion.VERSION_22)) {
43-
return Arrays.asList("8.8", GradleVersion.current().getVersion(), "9.0.0-rc-2");
43+
return Arrays.asList("8.8", GradleVersion.current().getVersion(), "9.0.0", "9.1.0-rc-1");
4444
}
4545
if (isJavaVersion(JavaVersion.VERSION_21)) {
46-
return Arrays.asList("8.5", GradleVersion.current().getVersion(), "9.0.0-rc-2");
46+
return Arrays.asList("8.5", GradleVersion.current().getVersion(), "9.0.0", "9.1.0-rc-1");
4747
}
48-
return Arrays.asList("7.6.6", "8.4", GradleVersion.current().getVersion(), "9.0.0-rc-2");
48+
return Arrays.asList("7.6.6", "8.4", GradleVersion.current().getVersion(), "9.0.0", "9.1.0-rc-1");
4949
}
5050

5151
public static String minimumCompatible() {

0 commit comments

Comments
 (0)