From 0cde0f7207ae638666791bb3fedf35f5cbeddb90 Mon Sep 17 00:00:00 2001 From: Louis Jacomet Date: Tue, 14 Dec 2021 22:00:54 +0100 Subject: [PATCH] Fix tests following changes to constraint Issue #19328 --- .../resolve/ScriptDependencyResolveIntegrationTest.groovy | 4 ++-- .../groovy/org/gradle/scala/ScalaPluginIntegrationTest.groovy | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ScriptDependencyResolveIntegrationTest.groovy b/subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ScriptDependencyResolveIntegrationTest.groovy index 41b70ba816a4..e24beedff8fc 100644 --- a/subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ScriptDependencyResolveIntegrationTest.groovy +++ b/subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ScriptDependencyResolveIntegrationTest.groovy @@ -92,7 +92,7 @@ task check { expect: succeeds 'buildEnvironment' - outputContains('org.apache.logging.log4j:log4j-core:{require 2.16.0; reject [2.0, 2.15[} -> 2.16.0 (c)') + outputContains('org.apache.logging.log4j:log4j-core:{require 2.16.0; reject [2.0, 2.16)} -> 2.16.0 (c)') } @Issue("gradle/gradle#19328") @@ -132,6 +132,6 @@ task check { expect: succeeds 'buildEnvironment' - outputContains('org.apache.logging.log4j:log4j-core:{require 2.16.0; reject [2.0, 2.15[} -> 3.1.0 (c)') + outputContains('org.apache.logging.log4j:log4j-core:{require 2.16.0; reject [2.0, 2.16)} -> 3.1.0 (c)') } } diff --git a/subprojects/scala/src/integTest/groovy/org/gradle/scala/ScalaPluginIntegrationTest.groovy b/subprojects/scala/src/integTest/groovy/org/gradle/scala/ScalaPluginIntegrationTest.groovy index 455c3140f618..0232d8a643b7 100644 --- a/subprojects/scala/src/integTest/groovy/org/gradle/scala/ScalaPluginIntegrationTest.groovy +++ b/subprojects/scala/src/integTest/groovy/org/gradle/scala/ScalaPluginIntegrationTest.groovy @@ -273,7 +273,7 @@ task someTask def versionPattern = ~/.*-> 2\.(\d+).*/ expect: succeeds('dependencies', '--configuration', 'zinc') - def log4jOutput = result.getOutputLineThatContains("log4j-core:{require 2.16.0; reject [2.0, 2.15[}") + def log4jOutput = result.getOutputLineThatContains("log4j-core:{require 2.16.0; reject [2.0, 2.16)}") def matcher = log4jOutput =~ versionPattern matcher.find() Integer.valueOf(matcher.group(1)) >= 16