diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/LayerResolver.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/LayerResolver.java index fad76ac364..82213fc902 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/LayerResolver.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/LayerResolver.java @@ -17,8 +17,12 @@ package org.springframework.boot.gradle.tasks.bundling; import java.io.File; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; +import java.util.Set; import org.gradle.api.artifacts.ArtifactCollection; import org.gradle.api.artifacts.Configuration; @@ -92,6 +96,10 @@ class LayerResolver { */ private static class ResolvedDependencies { + private static final Set DEPRECATED_FOR_RESOLUTION_CONFIGURATIONS = Collections + .unmodifiableSet(new HashSet<>(Arrays.asList("archives", "compile", "compileOnly", "default", "runtime", + "testCompile", "testCompileOnly", "testRuntime"))); + private final Map configurationDependencies = new LinkedHashMap<>(); ResolvedDependencies(Iterable configurations) { @@ -99,7 +107,8 @@ class LayerResolver { } private void processConfiguration(Configuration configuration) { - if (configuration.isCanBeResolved()) { + if (configuration.isCanBeResolved() + && !DEPRECATED_FOR_RESOLUTION_CONFIGURATIONS.contains(configuration.getName())) { this.configurationDependencies.put(configuration, new ResolvedConfigurationDependencies(configuration.getIncoming().getArtifacts())); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PublishingDocumentationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PublishingDocumentationTests.java index aa5660a858..82404882f7 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PublishingDocumentationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PublishingDocumentationTests.java @@ -39,8 +39,9 @@ class PublishingDocumentationTests { @TestTemplate void mavenUpload() throws IOException { - assertThat(this.gradleBuild.script("src/docs/gradle/publishing/maven").build("deployerRepository").getOutput()) - .contains("https://repo.example.com"); + assertThat(this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("5.6") + .script("src/docs/gradle/publishing/maven").build("deployerRepository").getOutput()) + .contains("https://repo.example.com"); } @TestTemplate diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java index 60a6c07113..41522140ac 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java @@ -89,7 +89,7 @@ public class GradleBuild { } void after() { - GradleBuild.this.script = null; + this.script = null; FileSystemUtils.deleteRecursively(this.projectDir); } @@ -127,8 +127,8 @@ public class GradleBuild { public BuildResult build(String... arguments) { try { BuildResult result = prepareRunner(arguments).build(); - if (this.gradleVersion != null && this.expectDeprecationWarnings != null - && this.expectDeprecationWarnings.compareTo(GradleVersion.version(this.gradleVersion)) > 0) { + if (this.expectDeprecationWarnings == null || (this.gradleVersion != null + && this.expectDeprecationWarnings.compareTo(GradleVersion.version(this.gradleVersion)) > 0)) { assertThat(result.getOutput()).doesNotContain("Deprecated").doesNotContain("deprecated"); } return result; @@ -167,6 +167,8 @@ public class GradleBuild { allArguments.add("-PbootVersion=" + getBootVersion()); allArguments.add("--stacktrace"); allArguments.addAll(Arrays.asList(arguments)); + allArguments.add("--warning-mode"); + allArguments.add("all"); return gradleRunner.withArguments(allArguments); }