From 068dcf29118ebc462368afd94cfae2ae52b8d71b Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Sat, 3 Oct 2020 16:48:16 +0200 Subject: [PATCH] [MNG-6965] Extensions suddenly have org.codehaus.plexus:plexus-utils:jar:1.1 on their classpath Scope a few ITs for (,3.7.0). This closes #73 --- .../it/MavenITmng3819PluginDepPlexusUtilsTest.java | 2 +- .../MavenITmng5783PluginDependencyFiltering.java | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java index 47ff8a2fb..c7b08ccd2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java @@ -37,7 +37,7 @@ public class MavenITmng3819PluginDepPlexusUtilsTest public MavenITmng3819PluginDepPlexusUtilsTest() { - super( "(2.0.1,)" ); + super( "(2.0.1,3.7.0)" ); } /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java index ec5242c95..17efc24fe 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java @@ -31,10 +31,20 @@ public void testSLF4j() // Note that plugin dependencies always include plugin itself and plexus-utils List dependencies = verifier.loadLines( "target/dependencies.txt", "UTF-8" ); - assertEquals( 3, dependencies.size() ); + if ( matchesVersionRange( "(,3.7.0)" ) ) + { + assertEquals( 3, dependencies.size() ); + } + else + { + assertEquals( 2, dependencies.size() ); + } assertEquals( "mng-5783-plugin-dependency-filtering:mng-5783-plugin-dependency-filtering-plugin:maven-plugin:0.1", dependencies.get( 0 ) ); assertEquals( "org.slf4j:slf4j-api:jar:1.7.5", dependencies.get( 1 ) ); - assertEquals( "org.codehaus.plexus:plexus-utils:jar:1.1", dependencies.get( 2 ) ); + if ( matchesVersionRange( "(,3.7.0)" ) ) + { + assertEquals( "org.codehaus.plexus:plexus-utils:jar:1.1", dependencies.get( 2 ) ); + } } }