Merge pull request #18082 from gradle/donat/fix-release6x

Fix build failure on release6x branch
gradle · Aug 20, 2021 · f0ddb54 · f0ddb54
2 parents 8b422dc + da0652d
commit f0ddb54
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...sting/src/main/groovy/org/gradle/integtests/fixtures/executer/AbstractGradleExecuter.java b/...sting/src/main/groovy/org/gradle/integtests/fixtures/executer/AbstractGradleExecuter.java
@@ -1320,7 +1320,7 @@ private void validate(String output, String displayName) {
                         i++;
                     } else if (isDeprecationMessageInHelpDescription(line)) {
                         i++;
-                    } else if (expectedDeprecationWarnings.remove(line)) {
+                    } else if (expectedDeprecationWarnings.removeIf(warning -> line.contains(warning))) {
                         // Deprecation warning is expected
                         i++;
                         i = skipStackTrace(lines, i);

diff --git a/...egTest/groovy/org/gradle/connectivity/MavenJcenterDependencyResolveIntegrationTest.groovy b/...egTest/groovy/org/gradle/connectivity/MavenJcenterDependencyResolveIntegrationTest.groovy
@@ -23,6 +23,8 @@ import org.gradle.util.TestPrecondition
 class MavenJcenterDependencyResolveIntegrationTest extends AbstractIntegrationSpec {
     def "resolves a minimal dependency from bintray's jcenter"() {
         given:
+        executer.expectDeprecationWarning("The RepositoryHandler.jcenter() method has been deprecated.")
+        executer.expectDeprecationWarning("The RepositoryHandler.jcenter(Action<MavenArtifactRepository>) method has been deprecated.")
         buildFile << """
 repositories {
     jcenter()