Skip to content

Commit 693fa91

Browse files
committed
Tolerate deprecation warnings generated by Gradle 6.4
The warnings will be addressed by gh-20759. CreateBootStartScripts must be excluded from the classes that are validated by the ValidatePlugins task. It is invalid, but only for Gradle 6.4. gh-20759 will cause it to only be used with Gradle 6.3 and earlier. See gh-21329
1 parent 02aacf4 commit 693fa91

File tree

2 files changed

+23
-12
lines changed

2 files changed

+23
-12
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,17 @@ gradlePlugin {
5656
}
5757
}
5858

59+
task preparePluginValidationClasses(type: Copy) {
60+
destinationDir = file("$buildDir/classes/java/pluginValidation")
61+
from(sourceSets.main.output.classesDirs) {
62+
exclude "**/CreateBootStartScripts.class"
63+
}
64+
}
65+
66+
validatePlugins {
67+
classes.setFrom preparePluginValidationClasses
68+
}
69+
5970
task dependencyVersions(type: org.springframework.boot.build.constraints.ExtractVersionConstraints) {
6071
enforcedPlatform(":spring-boot-project:spring-boot-dependencies")
6172
}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/ApplicationPluginActionIntegrationTests.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ void createsBootStartScriptsTaskUsesApplicationPluginsDefaultJvmOpts() {
7979

8080
@TestTemplate
8181
void zipDistributionForJarCanBeBuilt() throws IOException {
82-
assertThat(this.gradleBuild.build("bootDistZip").task(":bootDistZip").getOutcome())
83-
.isEqualTo(TaskOutcome.SUCCESS);
82+
assertThat(this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("6.4").build("bootDistZip")
83+
.task(":bootDistZip").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
8484
String name = this.gradleBuild.getProjectDir().getName();
8585
File distribution = new File(this.gradleBuild.getProjectDir(), "build/distributions/" + name + "-boot.zip");
8686
assertThat(distribution).isFile();
@@ -91,8 +91,8 @@ void zipDistributionForJarCanBeBuilt() throws IOException {
9191

9292
@TestTemplate
9393
void tarDistributionForJarCanBeBuilt() throws IOException {
94-
assertThat(this.gradleBuild.build("bootDistTar").task(":bootDistTar").getOutcome())
95-
.isEqualTo(TaskOutcome.SUCCESS);
94+
assertThat(this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("6.4").build("bootDistTar")
95+
.task(":bootDistTar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
9696
String name = this.gradleBuild.getProjectDir().getName();
9797
File distribution = new File(this.gradleBuild.getProjectDir(), "build/distributions/" + name + "-boot.tar");
9898
assertThat(distribution).isFile();
@@ -103,8 +103,8 @@ void tarDistributionForJarCanBeBuilt() throws IOException {
103103

104104
@TestTemplate
105105
void zipDistributionForWarCanBeBuilt() throws IOException {
106-
assertThat(this.gradleBuild.build("bootDistZip").task(":bootDistZip").getOutcome())
107-
.isEqualTo(TaskOutcome.SUCCESS);
106+
assertThat(this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("6.4").build("bootDistZip")
107+
.task(":bootDistZip").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
108108
String name = this.gradleBuild.getProjectDir().getName();
109109
File distribution = new File(this.gradleBuild.getProjectDir(), "build/distributions/" + name + "-boot.zip");
110110
assertThat(distribution).isFile();
@@ -115,8 +115,8 @@ void zipDistributionForWarCanBeBuilt() throws IOException {
115115

116116
@TestTemplate
117117
void tarDistributionForWarCanBeBuilt() throws IOException {
118-
assertThat(this.gradleBuild.build("bootDistTar").task(":bootDistTar").getOutcome())
119-
.isEqualTo(TaskOutcome.SUCCESS);
118+
assertThat(this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("6.4").build("bootDistTar")
119+
.task(":bootDistTar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
120120
String name = this.gradleBuild.getProjectDir().getName();
121121
File distribution = new File(this.gradleBuild.getProjectDir(), "build/distributions/" + name + "-boot.tar");
122122
assertThat(distribution).isFile();
@@ -127,8 +127,8 @@ void tarDistributionForWarCanBeBuilt() throws IOException {
127127

128128
@TestTemplate
129129
void applicationNameCanBeUsedToCustomizeDistributionName() throws IOException {
130-
assertThat(this.gradleBuild.build("bootDistTar").task(":bootDistTar").getOutcome())
131-
.isEqualTo(TaskOutcome.SUCCESS);
130+
assertThat(this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("6.4").build("bootDistTar")
131+
.task(":bootDistTar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
132132
File distribution = new File(this.gradleBuild.getProjectDir(), "build/distributions/custom-boot.tar");
133133
assertThat(distribution).isFile();
134134
String name = this.gradleBuild.getProjectDir().getName();
@@ -139,8 +139,8 @@ void applicationNameCanBeUsedToCustomizeDistributionName() throws IOException {
139139

140140
@TestTemplate
141141
void scriptsHaveCorrectPermissions() throws IOException {
142-
assertThat(this.gradleBuild.build("bootDistTar").task(":bootDistTar").getOutcome())
143-
.isEqualTo(TaskOutcome.SUCCESS);
142+
assertThat(this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("6.4").build("bootDistTar")
143+
.task(":bootDistTar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
144144
String name = this.gradleBuild.getProjectDir().getName();
145145
File distribution = new File(this.gradleBuild.getProjectDir(), "build/distributions/" + name + "-boot.tar");
146146
assertThat(distribution).isFile();

0 commit comments

Comments
 (0)