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 2008/10/11 19:28:04 UTC
svn commit: r703693 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-2892/ resources/mng-2892/repo/
resources/mng-2892/repo/org/ resources/mng-2892/repo/org/codehaus/
resources/mng-2892/repo/org...
Author: bentmann
Date: Sat Oct 11 10:28:03 2008
New Revision: 703693
URL: http://svn.apache.org/viewvc?rev=703693&view=rev
Log:
o Added IT for MNG-2892
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892Test.java (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/repo/org/codehaus/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/repo/org/codehaus/plexus/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/repo/org/codehaus/plexus/plexus-utils/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/repo/org/codehaus/plexus/plexus-utils/0.1-stub/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/repo/org/codehaus/plexus/plexus-utils/0.1-stub/plexus-utils-0.1-stub.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/repo/org/codehaus/plexus/plexus-utils/0.1-stub/plexus-utils-0.1-stub.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/repo/org/codehaus/plexus/plexus-utils/maven-metadata.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=703693&r1=703692&r2=703693&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 Sat Oct 11 10:28:03 2008
@@ -130,6 +130,7 @@
suite.addTestSuite( MavenITmng3099SettingsProfilesWithNoPOM.class );
suite.addTestSuite( MavenITmng3052DepRepoAggregationTest.class );
suite.addTestSuite( MavenITmng2972OverridePluginDependency.class );
+ suite.addTestSuite( MavenITmng2892Test.class );
suite.addTestSuite( MavenITmng2861RelocationsAndRanges.class );
suite.addTestSuite( MavenITmng2744checksumVerificationTest.class );
suite.addTestSuite( MavenITmng2739RequiredRepositoryElements.class );
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892Test.java?rev=703693&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892Test.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892Test.java Sat Oct 11 10:28:03 2008
@@ -0,0 +1,54 @@
+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;
+
+public class MavenITmng2892Test
+ extends AbstractMavenIntegrationTestCase
+{
+
+ /**
+ * Verify that plugins can use their own version of plexus-utils and are not bound to the version bundled in the
+ * core.
+ */
+ public void testitMNG2892()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2892" );
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
+ assertEquals( "methodStub", pclProps.getProperty( "org.codehaus.plexus.util.StringUtils.methods" ) );
+
+ Properties tcclProps = verifier.loadProperties( "target/tccl.properties" );
+ assertEquals( pclProps, tcclProps );
+ }
+
+}
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892Test.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892Test.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/pom.xml?rev=703693&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/pom.xml Sat Oct 11 10:28:03 2008
@@ -0,0 +1,77 @@
+<?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.mng2892</groupId>
+ <artifactId>maven-it-mng2892</artifactId>
+ <version>1.0</version>
+
+ <name>Maven Integration Test :: MNG-2892</name>
+ <description>
+ Verify that plugins can use their own version of plexus-utils and are not bound to the version bundled in the core.
+ </description>
+
+ <repositories>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-class-loader</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>0.1-stub</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>load</id>
+ <phase>validate</phase>
+ <configuration>
+ <classNames>org.codehaus.plexus.util.StringUtils</classNames>
+ <pluginClassLoaderOutput>target/pcl.properties</pluginClassLoaderOutput>
+ <contextClassLoaderOutput>target/tccl.properties</contextClassLoaderOutput>
+ </configuration>
+ <goals>
+ <goal>load</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/repo/org/codehaus/plexus/plexus-utils/0.1-stub/plexus-utils-0.1-stub.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/repo/org/codehaus/plexus/plexus-utils/0.1-stub/plexus-utils-0.1-stub.jar?rev=703693&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/repo/org/codehaus/plexus/plexus-utils/0.1-stub/plexus-utils-0.1-stub.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/repo/org/codehaus/plexus/plexus-utils/0.1-stub/plexus-utils-0.1-stub.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/repo/org/codehaus/plexus/plexus-utils/0.1-stub/plexus-utils-0.1-stub.pom?rev=703693&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/repo/org/codehaus/plexus/plexus-utils/0.1-stub/plexus-utils-0.1-stub.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/repo/org/codehaus/plexus/plexus-utils/0.1-stub/plexus-utils-0.1-stub.pom Sat Oct 11 10:28:03 2008
@@ -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.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</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>src</directory>
+ <targetPath>src</targetPath>
+ </resource>
+ </resources>
+ </build>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/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-2892/repo/org/codehaus/plexus/plexus-utils/maven-metadata.xml?rev=703693&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/repo/org/codehaus/plexus/plexus-utils/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/repo/org/codehaus/plexus/plexus-utils/maven-metadata.xml Sat Oct 11 10:28:03 2008
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>0.1-stub</version>
+ <versioning>
+ <versions>
+ <version>0.1-stub</version>
+ </versions>
+ <lastUpdated>20081011153209</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2892/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-2892/repo/org/codehaus/plexus/plexus-utils/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision