diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java index 1b77172652..b639971764 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java @@ -70,6 +70,7 @@ public class MavenITmng4666CoreRealmImportTest verifier.deleteArtifacts( "org.sonatype.aether", "aether-api", "0.1-stub" ); verifier.deleteArtifacts( "org.sonatype.aether", "aether-spi", "0.1-stub" ); verifier.deleteArtifacts( "org.sonatype.aether", "aether-impl", "0.1-stub" ); + verifier.deleteArtifacts( "org.sonatype.sisu", "sisu-inject-plexus", "0.1-stub" ); verifier.deleteArtifacts( "org.sonatype.spice", "spice-inject-plexus", "0.1-stub" ); verifier.deleteArtifacts( "classworlds", "classworlds", "0.1-stub" ); verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); @@ -81,9 +82,11 @@ public class MavenITmng4666CoreRealmImportTest Properties props = verifier.loadProperties( "target/type.properties" ); List types = getTypes( props ); - if ( !matchesVersionRange( "[3.0-beta-2,)" ) ) + if ( !matchesVersionRange( "[3.0-beta-4,)" ) ) { + // MNG-4725, MNG-4807 types.remove( "org.codehaus.plexus.configuration.PlexusConfiguration" ); + types.remove( "org.codehaus.plexus.logging.Logger" ); } assertFalse( types.isEmpty() ); for ( Iterator it = types.iterator(); it.hasNext(); ) diff --git a/its/core-it-suite/src/test/resources/mng-4666/pom.xml b/its/core-it-suite/src/test/resources/mng-4666/pom.xml index 690cc7060e..0e6642d6c0 100644 --- a/its/core-it-suite/src/test/resources/mng-4666/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-4666/pom.xml @@ -111,6 +111,11 @@ under the License. spice-inject-plexus 0.1-stub + + org.sonatype.sisu + sisu-inject-plexus + 0.1-stub + org.sonatype.aether aether-api @@ -142,6 +147,7 @@ under the License. org.apache.maven.model.Model org.apache.maven.settings.Settings org.codehaus.plexus.logging.LogEnabled + org.codehaus.plexus.logging.Logger org.codehaus.plexus.configuration.PlexusConfiguration org.codehaus.plexus.classworlds.realm.ClassRealm org.codehaus.classworlds.ClassRealm diff --git a/its/core-it-suite/src/test/resources/mng-4666/repo/org/sonatype/sisu/sisu-inject-plexus/0.1-stub/sisu-inject-plexus-0.1-stub.jar b/its/core-it-suite/src/test/resources/mng-4666/repo/org/sonatype/sisu/sisu-inject-plexus/0.1-stub/sisu-inject-plexus-0.1-stub.jar new file mode 100644 index 0000000000..8f47ee4fc9 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-4666/repo/org/sonatype/sisu/sisu-inject-plexus/0.1-stub/sisu-inject-plexus-0.1-stub.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-4666/repo/org/sonatype/sisu/sisu-inject-plexus/0.1-stub/sisu-inject-plexus-0.1-stub.pom b/its/core-it-suite/src/test/resources/mng-4666/repo/org/sonatype/sisu/sisu-inject-plexus/0.1-stub/sisu-inject-plexus-0.1-stub.pom new file mode 100644 index 0000000000..9151ad88a1 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4666/repo/org/sonatype/sisu/sisu-inject-plexus/0.1-stub/sisu-inject-plexus-0.1-stub.pom @@ -0,0 +1,55 @@ + + + + + + 4.0.0 + + org.sonatype.sisu + sisu-inject-plexus + 0.1-stub + jar + + + + maven-core-it + file:///${basedir}/repo + + + + + true + + + + + + . + + pom.xml + src/** + + + + src/main/resources + + + +