From dd6f516d66d5833f264e7fa3f84de0b38b205de1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 29 Apr 2024 17:33:21 +0100 Subject: [PATCH] Test Gradle Plugin against 8.8 Closes gh-40573 --- .../configure-bom-with-plugins.gradle.kts | 2 +- .../gradle/managing-dependencies/configure-bom.gradle | 2 +- .../gradle/managing-dependencies/configure-bom.gradle.kts | 2 +- .../managing-dependencies/configure-platform.gradle | 2 +- .../managing-dependencies/configure-platform.gradle.kts | 2 +- .../custom-version-with-platform.gradle | 2 +- .../custom-version-with-platform.gradle.kts | 2 +- .../gradle/managing-dependencies/custom-version.gradle | 2 +- .../managing-dependencies/custom-version.gradle.kts | 2 +- .../bundling/AbstractBootArchiveIntegrationTests.java | 8 ++++++-- .../boot/testsupport/gradle/testkit/GradleVersions.java | 4 ++-- 11 files changed, 17 insertions(+), 13 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom-with-plugins.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom-with-plugins.gradle.kts index 9f22625463d..5a655315076 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom-with-plugins.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom-with-plugins.gradle.kts @@ -26,6 +26,6 @@ the().apply { repositories { maven { - url = uri("file:repository") + url = uri("repository") } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom.gradle index 2c11b81900b..06de18146bb 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom.gradle @@ -24,5 +24,5 @@ dependencyManagement { } repositories { - maven { url 'file:repository' } + maven { url 'repository' } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom.gradle.kts index 43dd49deed8..7eb5f220695 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-bom.gradle.kts @@ -27,6 +27,6 @@ the().apply { repositories { maven { - url = uri("file:repository") + url = uri("repository") } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-platform.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-platform.gradle index 25a265efe18..0cb4a011f92 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-platform.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-platform.gradle @@ -14,7 +14,7 @@ dependencies { } repositories { - maven { url 'file:repository' } + maven { url 'repository' } } configurations.all { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-platform.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-platform.gradle.kts index 30cfc8ab044..3a94dc8adbd 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-platform.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/configure-platform.gradle.kts @@ -15,7 +15,7 @@ dependencies { repositories { maven { - url = uri("file:repository") + url = uri("repository") } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version-with-platform.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version-with-platform.gradle index d877c3df16d..bcd590932dd 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version-with-platform.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version-with-platform.gradle @@ -9,7 +9,7 @@ dependencies { } repositories { - maven { url 'file:repository' } + maven { url 'repository' } } configurations.all { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version-with-platform.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version-with-platform.gradle.kts index a0262204e94..69af1f2f288 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version-with-platform.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version-with-platform.gradle.kts @@ -10,7 +10,7 @@ dependencies { repositories { maven { - url = uri("file:repository") + url = uri("repository") } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version.gradle index ab3d25436f4..6c512f68dfe 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version.gradle @@ -19,7 +19,7 @@ ext['slf4j.version'] = '1.7.20' // end::custom-version[] repositories { - maven { url 'file:repository' } + maven { url 'repository' } } task slf4jVersion { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version.gradle.kts index a8359facf42..1886a90dbd9 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version.gradle.kts @@ -12,7 +12,7 @@ extra["slf4j.version"] = "1.7.20" repositories { maven { - url = uri("file:repository") + url = uri("repository") } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java index 4019ffbf6af..c70207eddbc 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -596,7 +596,11 @@ abstract class AbstractBootArchiveIntegrationTests { @TestTemplate void dirModeAndFileModeAreApplied() throws IOException { - BuildResult result = this.gradleBuild.build(this.taskName); + BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.8-rc-1") + .expectDeprecationMessages("The CopyProcessingSpec.setDirMode(Integer) method has been deprecated", + "The CopyProcessingSpec.setFileMode(Integer) method has been deprecated", + "upgrading_version_8.html#unix_file_permissions_deprecated") + .build(this.taskName); assertThat(result.task(":" + this.taskName).getOutcome()).isEqualTo(TaskOutcome.SUCCESS); try (ZipFile jarFile = new ZipFile(new File(this.gradleBuild.getProjectDir(), "build/libs").listFiles()[0])) { Enumeration entries = jarFile.getEntries(); 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 index a82c53ccef0..85d15de32d4 100644 --- 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 @@ public final class GradleVersions { @SuppressWarnings("UnstableApiUsage") public static List allCompatible() { if (isJavaVersion(JavaVersion.VERSION_20)) { - return Arrays.asList("8.1.1", "8.7"); + return Arrays.asList("8.1.1", "8.8"); } - return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.7"); + return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.8"); } public static String minimumCompatible() {