Author: bentmann
Date: Sun Aug 2 11:01:52 2009
New Revision: 800027
URL: http://svn.apache.org/viewvc?rev=800027&view=rev
Log:
[MNG-4276] Plugins with indirect dependency on plexus-utils are stuck with
plexus-utils:1.1
o Added IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/pom.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/maven/its/mng4276/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/maven/its/mng4276/dep/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/maven/its/mng4276/dep/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/maven/its/mng4276/dep/0.1/dep-0.1.jar
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/maven/its/mng4276/dep/0.1/dep-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/maven/its/mng4276/dep/maven-metadata.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/codehaus/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/codehaus/plexus/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/codehaus/plexus/plexus-utils/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/codehaus/plexus/plexus-utils/1.1.4276/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/codehaus/plexus/plexus-utils/1.1.4276/plexus-utils-1.1.4276.jar
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/codehaus/plexus/plexus-utils/1.1.4276/plexus-utils-1.1.4276.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/codehaus/plexus/plexus-utils/maven-metadata.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/settings-template.xml
(with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=800027&r1=800026&r2=800027&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
Sun Aug 2 11:01:52 2009
@@ -86,6 +86,7 @@
// suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); --
MNG-3137
+ suite.addTestSuite( MavenITmng4276WrongTransitivePlexusUtilsTest.class
);
suite.addTestSuite( MavenITmng4274PluginRealmArtifactsTest.class );
suite.addTestSuite(
MavenITmng4273RestrictedCoreRealmAccessForPluginTest.class );
suite.addTestSuite(
MavenITmng4270ArtifactHandlersFromPluginDepsTest.class );
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java?rev=800027&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java
Sun Aug 2 11:01:52 2009
@@ -0,0 +1,68 @@
+package org.apache.maven.it;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.util.Properties;
+
+/**
+ * This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-4276";>MNG-4276</a>.
+ *
+ * @author Benjamin Bentmann
+ */
+public class MavenITmng4276WrongTransitivePlexusUtilsTest
+ extends AbstractMavenIntegrationTestCase
+{
+
+ public MavenITmng4276WrongTransitivePlexusUtilsTest()
+ {
+ super( "[3.0-alpha-3,)" );
+ }
+
+ /**
+ * Verify that plugins that have a *transitive* dependency on
plexus-utils:x.y get that version and not a random
+ * version injected by the core like 1.1.
+ */
+ public void testit()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-4276" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng4276" );
+ verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils",
"1.1.4276", "jar" );
+ verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils",
"1.1.4276", "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"
);
+ assertNotNull( props.getProperty(
"org.apache.maven.its.mng4276.CoreIt" ) );
+ }
+
+}
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/pom.xml?rev=800027&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/pom.xml
Sun Aug 2 11:01:52 2009
@@ -0,0 +1,67 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng4276</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-4276</name>
+ <description>
+ Verify that plugins that have a *transitive* dependency on
plexus-utils:x.y get that version and not a random
+ version injected by the core like 1.1.
+ </description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-class-loader</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <!-- NOTE: This has a dependency on our plexus-utils stub version
1.1.4276 -->
+ <groupId>org.apache.maven.its.mng4276</groupId>
+ <artifactId>dep</artifactId>
+ <version>0.1</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+
<pluginClassLoaderOutput>target/class.properties</pluginClassLoaderOutput>
+ <!-- This class is provided by our plexus-utils stub -->
+ <classNames>org.apache.maven.its.mng4276.CoreIt</classNames>
+ </configuration>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>load</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/maven/its/mng4276/dep/0.1/dep-0.1.jar
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/maven/its/mng4276/dep/0.1/dep-0.1.jar?rev=800027&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/maven/its/mng4276/dep/0.1/dep-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/maven/its/mng4276/dep/0.1/dep-0.1.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/maven/its/mng4276/dep/0.1/dep-0.1.pom?rev=800027&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/maven/its/mng4276/dep/0.1/dep-0.1.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/maven/its/mng4276/dep/0.1/dep-0.1.pom
Sun Aug 2 11:01:52 2009
@@ -0,0 +1,49 @@
+<?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.its.mng4276</groupId>
+ <artifactId>dep</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-4276 :: Plugin Dependency</name>
+ <description>
+ An ordinary dependency that depends on our stub version of plexus-utils.
+ </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.4276</version>
+ </dependency>
+ </dependencies>
+</project>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/maven/its/mng4276/dep/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/maven/its/mng4276/dep/maven-metadata.xml?rev=800027&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/maven/its/mng4276/dep/maven-metadata.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/maven/its/mng4276/dep/maven-metadata.xml
Sun Aug 2 11:01:52 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.mng4276</groupId>
+ <artifactId>dep</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20090802104203</lastUpdated>
+ </versioning>
+</metadata>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/maven/its/mng4276/dep/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/apache/maven/its/mng4276/dep/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/codehaus/plexus/plexus-utils/1.1.4276/plexus-utils-1.1.4276.jar
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/codehaus/plexus/plexus-utils/1.1.4276/plexus-utils-1.1.4276.jar?rev=800027&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/codehaus/plexus/plexus-utils/1.1.4276/plexus-utils-1.1.4276.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/codehaus/plexus/plexus-utils/1.1.4276/plexus-utils-1.1.4276.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/codehaus/plexus/plexus-utils/1.1.4276/plexus-utils-1.1.4276.pom?rev=800027&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/codehaus/plexus/plexus-utils/1.1.4276/plexus-utils-1.1.4276.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/codehaus/plexus/plexus-utils/1.1.4276/plexus-utils-1.1.4276.pom
Sun Aug 2 11:01:52 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.4276</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-4276 :: 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-4276/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-4276/repo/org/codehaus/plexus/plexus-utils/maven-metadata.xml?rev=800027&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/codehaus/plexus/plexus-utils/maven-metadata.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/repo/org/codehaus/plexus/plexus-utils/maven-metadata.xml
Sun Aug 2 11:01:52 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.4276</version>
+ <versioning>
+ <release>1.1.4276</release>
+ <versions>
+ <version>1.1.4276</version>
+ </versions>
+ <lastUpdated>20090802103251</lastUpdated>
+ </versioning>
+</metadata>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/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-4276/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-4276/settings-template.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/settings-template.xml?rev=800027&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/settings-template.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/settings-template.xml
Sun Aug 2 11:01:52 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-4276/settings-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4276/settings-template.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
