Author: bentmann
Date: Mon Jul 12 15:14:27 2010
New Revision: 963315
URL: http://svn.apache.org/viewvc?rev=963315&view=rev
Log:
[MNG-4725] Extend core artifact filter to exclude Guice-based Plexus shim
o Extended related IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4666/repo/org/sonatype/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4666/repo/org/sonatype/spice/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4666/repo/org/sonatype/spice/spice-inject-plexus/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4666/repo/org/sonatype/spice/spice-inject-plexus/0.1-stub/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4666/repo/org/sonatype/spice/spice-inject-plexus/0.1-stub/spice-inject-plexus-0.1-stub.jar
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4666/repo/org/sonatype/spice/spice-inject-plexus/0.1-stub/spice-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=963315&r1=963314&r2=963315&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 Jul 12 15:14:27 2010
@@ -77,6 +77,10 @@ public class MavenITmng4666CoreRealmImpo
Properties props = verifier.loadProperties( "target/type.properties" );
List types = getTypes( props );
+ if ( !matchesVersionRange( "[3.0-beta-2,)" ) )
+ {
+ types.remove(
"org.codehaus.plexus.configuration.PlexusConfiguration" );
+ }
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=963315&r1=963314&r2=963315&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 Jul 12 15:14:27 2010
@@ -106,6 +106,11 @@ under the License.
<artifactId>classworlds</artifactId>
<version>0.1-stub</version>
</dependency>
+ <dependency>
+ <groupId>org.sonatype.spice</groupId>
+ <artifactId>spice-inject-plexus</artifactId>
+ <version>0.1-stub</version>
+ </dependency>
</dependencies>
<executions>
<execution>
@@ -122,6 +127,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.configuration.PlexusConfiguration</className>
<className>org.codehaus.plexus.classworlds.realm.ClassRealm</className>
<className>org.codehaus.classworlds.ClassRealm</className>
<className>org.codehaus.plexus.util.xml.Xpp3Dom</className>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4666/repo/org/sonatype/spice/spice-inject-plexus/0.1-stub/spice-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/spice/spice-inject-plexus/0.1-stub/spice-inject-plexus-0.1-stub.jar?rev=963315&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4666/repo/org/sonatype/spice/spice-inject-plexus/0.1-stub/spice-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/spice/spice-inject-plexus/0.1-stub/spice-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/spice/spice-inject-plexus/0.1-stub/spice-inject-plexus-0.1-stub.pom?rev=963315&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4666/repo/org/sonatype/spice/spice-inject-plexus/0.1-stub/spice-inject-plexus-0.1-stub.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4666/repo/org/sonatype/spice/spice-inject-plexus/0.1-stub/spice-inject-plexus-0.1-stub.pom
Mon Jul 12 15:14:27 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.spice</groupId>
+ <artifactId>spice-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>
