Skip to content

Commit a12e3d4

Browse files
committed
Merge branch '3.2.x'
Closes gh-40530
2 parents 592571c + 5707ca8 commit a12e3d4

File tree

1 file changed

+2
-4
lines changed
  • spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit

1 file changed

+2
-4
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuild.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,8 @@ public BuildResult build(String... arguments) {
198198
if (this.expectDeprecationWarnings == null || (this.gradleVersion != null
199199
&& this.expectDeprecationWarnings.compareTo(GradleVersion.version(this.gradleVersion)) > 0)) {
200200
String buildOutput = result.getOutput();
201-
if (this.expectedDeprecationMessages != null) {
202-
for (String message : this.expectedDeprecationMessages) {
203-
buildOutput = buildOutput.replaceAll(message, "");
204-
}
201+
for (String message : this.expectedDeprecationMessages) {
202+
buildOutput = buildOutput.replaceAll(message, "");
205203
}
206204
assertThat(buildOutput).doesNotContainIgnoringCase("deprecated");
207205
}

0 commit comments

Comments
 (0)