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 2009/08/02 15:05:45 UTC
svn commit: r800061 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-4274/ resources/mng-4274/repo/
resources/mng-4274/repo/org/ resources/mng-4274/repo/org/apache/
resources/mng-4274/repo/org/a...
Author: bentmann
Date: Sun Aug 2 13:05:44 2009
New Revision: 800061
URL: http://svn.apache.org/viewvc?rev=800061&view=rev
Log:
[MNG-4274] Plugins with an undeclared but transitive dependency on plexus-utils via a core artifact get wrong version of p-u
o Strengthened IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/2.0.4274/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/2.0.4274/maven-core-2.0.4274.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/2.0.4274/maven-core-2.0.4274.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/1.1.4274/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/1.1.4274/plexus-utils-1.1.4274.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/1.1.4274/plexus-utils-1.1.4274.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/settings-template.xml (with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java?rev=800061&r1=800060&r2=800061&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java Sun Aug 2 13:05:44 2009
@@ -23,8 +23,6 @@
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-import java.util.Arrays;
-import java.util.Collection;
import java.util.Properties;
/**
@@ -38,7 +36,7 @@
public MavenITmng4274PluginRealmArtifactsTest()
{
- super( "[2.0.6,)" );
+ super( "[3.0-alpha-3,)" );
}
/**
@@ -53,15 +51,20 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.deleteArtifact( "org.apache.maven", "maven-core", "2.0.4274", "jar" );
+ verifier.deleteArtifact( "org.apache.maven", "maven-core", "2.0.4274", "pom" );
+ verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "1.1.4274", "jar" );
+ verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "1.1.4274", "pom" );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.getCliOptions().add( "-s" );
+ verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Properties props = verifier.loadProperties( "target/class.properties" );
- String prop = props.getProperty( "org.codehaus.plexus.util.Expand.methods", "" );
- Collection methods = Arrays.asList( prop.split( "," ) );
- assertTrue( methods.toString(), methods.contains( "normalize" ) );
- assertTrue( methods.toString(), methods.contains( "resolveFile" ) );
+ assertNotNull( props.getProperty( "org.apache.maven.its.mng4274.CoreIt" ) );
}
}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/pom.xml?rev=800061&r1=800060&r2=800061&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/pom.xml Sun Aug 2 13:05:44 2009
@@ -25,7 +25,7 @@
<groupId>org.apache.maven.its.mng4274</groupId>
<artifactId>test</artifactId>
<version>0.1</version>
- <packaging>maven-plugin</packaging>
+ <packaging>jar</packaging>
<name>Maven Integration Test :: MNG-4274</name>
<description>
@@ -42,16 +42,16 @@
<version>2.1-SNAPSHOT</version>
<dependencies>
<dependency>
- <!-- NOTE: This depends on plexus-utils:1.0.4 -->
+ <!-- NOTE: This has a dependency on our plexus-utils stub version 1.1.4274 -->
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0</version>
+ <artifactId>maven-core</artifactId>
+ <version>2.0.4274</version>
</dependency>
</dependencies>
<configuration>
<pluginClassLoaderOutput>target/class.properties</pluginClassLoaderOutput>
- <!-- NOTE: In newer version of plexus-utils, methods have been removed from this class -->
- <classNames>org.codehaus.plexus.util.Expand</classNames>
+ <!-- This class is provided by our plexus-utils stub -->
+ <classNames>org.apache.maven.its.mng4274.CoreIt</classNames>
</configuration>
<executions>
<execution>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/2.0.4274/maven-core-2.0.4274.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/2.0.4274/maven-core-2.0.4274.jar?rev=800061&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/2.0.4274/maven-core-2.0.4274.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/2.0.4274/maven-core-2.0.4274.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/2.0.4274/maven-core-2.0.4274.pom?rev=800061&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/2.0.4274/maven-core-2.0.4274.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/2.0.4274/maven-core-2.0.4274.pom Sun Aug 2 13:05:44 2009
@@ -0,0 +1,51 @@
+<?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.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>2.0.4274</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-4274 :: Maven Core Stub</name>
+ <description>
+ A stub version of some Maven core artifact, i.e. an artifact to be excluded from a plugin realm, that itself
+ depends on the stub version of plexus-utils. This mimics the dependency of maven-project:2.0 on
+ plexus-utils:1.0.4 for instance.
+ </description>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.1.4274</version>
+ </dependency>
+ </dependencies>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/maven-metadata.xml?rev=800061&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/maven-metadata.xml Sun Aug 2 13:05:44 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>2.0.4274</version>
+ <versioning>
+ <release>2.0.4274</release>
+ <versions>
+ <version>2.0.4274</version>
+ </versions>
+ <lastUpdated>20090802122327</lastUpdated>
+ </versioning>
+</metadata>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/1.1.4274/plexus-utils-1.1.4274.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/1.1.4274/plexus-utils-1.1.4274.jar?rev=800061&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/1.1.4274/plexus-utils-1.1.4274.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/1.1.4274/plexus-utils-1.1.4274.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/1.1.4274/plexus-utils-1.1.4274.pom?rev=800061&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/1.1.4274/plexus-utils-1.1.4274.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/1.1.4274/plexus-utils-1.1.4274.pom Sun Aug 2 13:05:44 2009
@@ -0,0 +1,56 @@
+<?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.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.1.4274</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-4274 :: Plexus Utils Stub</name>
+ <description>
+ A stub version of plexus-utils, must have the same groupId:artifactId as the real thing.
+ </description>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <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>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/maven-metadata.xml?rev=800061&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/maven-metadata.xml Sun Aug 2 13:05:44 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.1.4274</version>
+ <versioning>
+ <release>1.1.4274</release>
+ <versions>
+ <version>1.1.4274</version>
+ </versions>
+ <lastUpdated>20090802121446</lastUpdated>
+ </versioning>
+</metadata>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/settings-template.xml?rev=800061&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/settings-template.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/settings-template.xml Sun Aug 2 13:05:44 2009
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings>
+ <profiles>
+ <profile>
+ <id>maven-core-it-repo</id>
+ <repositories>
+ <repository>
+ <id>maven-core-it</id>
+ <url>@baseurl@/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>maven-core-it</id>
+ <url>@baseurl@/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+ <activeProfiles>
+ <activeProfile>maven-core-it-repo</activeProfile>
+ </activeProfiles>
+</settings>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/settings-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4274/settings-template.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision