Browse Source

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
pull/47140/head
Andy Wilkinson 4 months ago
parent
commit
c13a47e8cc
  1. 3
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-additionalMetadataLocationsConfiguredWhenProcessorIsPresent.gradle
  2. 4
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-jarTypeFilteringIsApplied.gradle
  3. 4
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-jarTypeFilteringIsApplied.gradle
  4. 4
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/run/BootRunIntegrationTests-jarTypeFilteringIsAppliedToTheClasspath.gradle
  5. 4
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/run/BootTestRunIntegrationTests-jarTypeFilteringIsAppliedToTheClasspath.gradle
  6. 10
      spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java

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

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

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

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

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

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

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

@ -26,6 +26,6 @@ repositories {
} }
dependencies { dependencies {
implementation(name: "standard") implementation(":standard:")
implementation(name: "starter") 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

@ -26,6 +26,6 @@ repositories {
} }
dependencies { dependencies {
implementation(name: "standard") implementation(":standard:")
implementation(name: "starter") 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

@ -34,18 +34,18 @@ public final class GradleVersions {
public static List<String> allCompatible() { public static List<String> allCompatible() {
if (isJavaVersion(JavaVersion.VERSION_24)) { 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)) { 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)) { 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)) { 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() { public static String minimumCompatible() {

Loading…
Cancel
Save