root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

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
This commit is contained in:
Andy Wilkinson 2025-08-19 08:38:46 +01:00
parent 7fd38efdf1
commit c13a47e8cc
6 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,8 +24,7 @@ repositories {
}
dependencies {
def configurationName = configurations.findByName('annotationProcessor') != null ? 'annotationProcessor' : 'implementation'
add(configurationName, [name: 'spring-boot-configuration-processor-1.2.3'])
annotationProcessor(':spring-boot-configuration-processor:1.2.3')
}
compileJava {

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

@ -30,8 +30,8 @@ repositories {
}
dependencies {
implementation(name: "standard")
implementation(name: "starter")
implementation(":standard:")
implementation(":starter:")
}
bootJar {

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

@ -30,8 +30,8 @@ repositories {
}
dependencies {
implementation(name: "standard")
implementation(name: "starter")
implementation(":standard:")
implementation(":starter:")
}
bootWar {

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

@ -26,6 +26,6 @@ repositories {
}
dependencies {
implementation(name: "standard")
implementation(name: "starter")
implementation(":standard:")
implementation(":starter:")
}

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

@ -26,6 +26,6 @@ repositories {
}
dependencies {
implementation(name: "standard")
implementation(name: "starter")
implementation(":standard:")
implementation(":starter:")
}

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

@ -34,18 +34,18 @@ public final class GradleVersions {
public static List<String> allCompatible() {
if (isJavaVersion(JavaVersion.VERSION_24)) {
return Arrays.asList(GradleVersion.current().getVersion(), "9.0.0-rc-2");
return Arrays.asList(GradleVersion.current().getVersion(), "9.0.0", "9.1.0-rc-1");
}
if (isJavaVersion(JavaVersion.VERSION_23)) {
return Arrays.asList(GradleVersion.current().getVersion(), "9.0.0-rc-2");
return Arrays.asList(GradleVersion.current().getVersion(), "9.0.0", "9.1.0-rc-1");
}
if (isJavaVersion(JavaVersion.VERSION_22)) {
return Arrays.asList("8.8", GradleVersion.current().getVersion(), "9.0.0-rc-2");
return Arrays.asList("8.8", GradleVersion.current().getVersion(), "9.0.0", "9.1.0-rc-1");
}
if (isJavaVersion(JavaVersion.VERSION_21)) {
return Arrays.asList("8.5", GradleVersion.current().getVersion(), "9.0.0-rc-2");
return Arrays.asList("8.5", GradleVersion.current().getVersion(), "9.0.0", "9.1.0-rc-1");
}
return Arrays.asList("7.6.6", "8.4", GradleVersion.current().getVersion(), "9.0.0-rc-2");
return Arrays.asList("7.6.6", "8.4", GradleVersion.current().getVersion(), "9.0.0", "9.1.0-rc-1");
}
public static String minimumCompatible() {