[maven-integration-testing] branch MNG-6965 updated (0c1c8ea -> 068dcf2)

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a change to branch MNG-6965
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git.


 discard 0c1c8ea  Explicitly igonre Plexus Utils in 3.7.0
 discard d376d57  Test not valid for 3.7.0 anymore
     new 068dcf2  [MNG-6965] Extensions suddenly have org.codehaus.plexus:plexus-utils:jar:1.1 on their classpath

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (0c1c8ea)
            \
             N -- N -- N   refs/heads/MNG-6965 (068dcf2)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:

[maven-integration-testing] 01/01: [MNG-6965] Extensions suddenly have org.codehaus.plexus:plexus-utils:jar:1.1 on their classpath

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch MNG-6965
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git

commit 068dcf29118ebc462368afd94cfae2ae52b8d71b
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Oct 3 16:48:16 2020 +0200

    [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
---
 .../maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java   |  2 +-
 .../maven/it/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 47ff8a2..c7b08cc 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 ec5242c..17efc24 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 class MavenITmng5783PluginDependencyFiltering
         // Note that plugin dependencies always include plugin itself and plexus-utils
 
         List<String> 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 ) );
+        }
     }
 }