Merge branch '3.1.x' into 3.2.x

Closes gh-40529
This commit is contained in:
Moritz Halbritter 2024-04-26 11:12:46 +02:00
commit 5707ca83e9

View File

@ -198,10 +198,8 @@ public class GradleBuild {
if (this.expectDeprecationWarnings == null || (this.gradleVersion != null if (this.expectDeprecationWarnings == null || (this.gradleVersion != null
&& this.expectDeprecationWarnings.compareTo(GradleVersion.version(this.gradleVersion)) > 0)) { && this.expectDeprecationWarnings.compareTo(GradleVersion.version(this.gradleVersion)) > 0)) {
String buildOutput = result.getOutput(); String buildOutput = result.getOutput();
if (this.expectedDeprecationMessages != null) { for (String message : this.expectedDeprecationMessages) {
for (String message : this.expectedDeprecationMessages) { buildOutput = buildOutput.replaceAll(message, "");
buildOutput = buildOutput.replaceAll(message, "");
}
} }
assertThat(buildOutput).doesNotContainIgnoringCase("deprecated"); assertThat(buildOutput).doesNotContainIgnoringCase("deprecated");
} }