You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/09/13 12:09:31 UTC
svn commit: r996478 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-4666/
resources/mng-4666/repo/org/sonatype/sisu/
resources/mng-4666/repo/org/sonatype/sisu/sisu-inject-plexus/
resources/mng-...
Author: bentmann
Date: Mon Sep 13 10:09:31 2010
New Revision: 996478
URL: http://svn.apache.org/viewvc?rev=996478&view=rev
Log:
[MNG-4807] Extend core artifact filter to exclude relocated Guice-based Plexus shim
o Extended relevant IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4666/repo/org/sonatype/sisu/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4666/repo/org/sonatype/sisu/sisu-inject-plexus/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4666/repo/org/sonatype/sisu/sisu-inject-plexus/0.1-stub/
maven/core-integration-testing/trunk/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 (with props)
maven/core-integration-testing/trunk/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
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4666/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java?rev=996478&r1=996477&r2=996478&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java Mon Sep 13 10:09:31 2010
@@ -70,6 +70,7 @@ public class MavenITmng4666CoreRealmImpo
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 MavenITmng4666CoreRealmImpo
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(); )
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4666/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4666/pom.xml?rev=996478&r1=996477&r2=996478&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4666/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4666/pom.xml Mon Sep 13 10:09:31 2010
@@ -112,6 +112,11 @@ under the License.
<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>
<version>0.1-stub</version>
@@ -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>
Added: maven/core-integration-testing/trunk/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
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/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?rev=996478&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/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
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/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
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/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?rev=996478&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/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 (added)
+++ maven/core-integration-testing/trunk/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 Mon Sep 13 10:09:31 2010
@@ -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>