Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-4807] Extend core artifact filter to exclude relocated Guice-based Plexus shim 

o Extended relevant IT

git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@996478 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2010-09-13 10:09:31 +00:00
parent b2577e5ac3
commit c1b11a5900
4 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java
View File

@ -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(); )

6
its/core-it-suite/src/test/resources/mng-4666/pom.xml
View File

@ -111,6 +111,11 @@ under the License.
<artifactId>spice-inject-plexus</artifactId>
<version>0.1-stub</version>
</dependency>
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-inject-plexus</artifactId>
<version>0.1-stub</version>
</dependency>
<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-api</artifactId>
@ -142,6 +147,7 @@ under the License.
<className>org.apache.maven.model.Model</className>
<className>org.apache.maven.settings.Settings</className>
<className>org.codehaus.plexus.logging.LogEnabled</className>
<className>org.codehaus.plexus.logging.Logger</className>
<className>org.codehaus.plexus.configuration.PlexusConfiguration</className>
<className>org.codehaus.plexus.classworlds.realm.ClassRealm</className>
<className>org.codehaus.classworlds.ClassRealm</className>

BIN
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 Normal file
View File

Binary file not shown.

55
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 Normal file
View File

@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-inject-plexus</artifactId>
<version>0.1-stub</version>
<packaging>jar</packaging>
<distributionManagement>
<repository>
<id>maven-core-it</id>
<url>file:///${basedir}/repo</url>
</repository>
</distributionManagement>
<properties>
<maven.test.skip>true</maven.test.skip>
</properties>
<build>
<resources>
<resource>
<directory>.</directory>
<includes>
<include>pom.xml</include>
<include>src/**</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
</build>
</project>