You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2008/12/22 13:51:35 UTC
svn commit: r728668 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-3769/ resources/mng-3769/repo/
resources/mng-3769/repo/org/ resources/mng-3769/repo/org/apache/
resources/mng-3769/repo/org/a...
Author: brett
Date: Mon Dec 22 04:51:34 2008
New Revision: 728668
URL: http://svn.apache.org/viewvc?rev=728668&view=rev
Log:
[MNG-3769] add integration test for regression regarding excluding dependencies by their relocated ID
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/dependency/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/dependency/1.0/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/dependency/1.0/dependency-1.0.jar
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/dependency/1.0/dependency-1.0.pom (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/relocated-new/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/relocated-new/1.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/relocated-new/1.1/relocated-new-1.1.jar
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/relocated-new/1.1/relocated-new-1.1.pom (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/relocated-orig/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/relocated-orig/1.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/relocated-orig/1.1/relocated-orig-1.1.pom (with props)
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java?rev=728668&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java Mon Dec 22 04:51:34 2008
@@ -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.Collections;
+import java.util.List;
+
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3769">MNG-3769</a>.
+ *
+ * @version $Id: MavenITmng3380ManagedRelocatedTransdepsTest.java 721706 2008-11-29 19:13:17Z bentmann $
+ */
+public class MavenITmng3769ExclusionRelocatedTransdepsTest
+ extends AbstractMavenIntegrationTestCase
+{
+
+ public MavenITmng3769ExclusionRelocatedTransdepsTest()
+ {
+ // also didn't work in 2.0, but did in 2.0.1+ until regressed in 2.1.0-M1
+ super("[2.0.1,2.1.0-M1),(2.1.0-M1,)");
+ }
+
+ /**
+ * Verify that dependency resolution considers dependency management also for relocated artifacts.
+ */
+ public void testitMNG3769()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3769" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng3769" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ List artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
+ assertEquals( Collections.singletonList( "org.apache.maven.its.mng3769:dependency:jar:1.0" ), artifacts );
+
+ List paths = verifier.loadLines( "target/test.txt", "UTF-8" );
+ assertEquals( 3, paths.size() );
+ assertEquals( "dependency-1.0.jar", paths.get( 2 ) );
+ }
+
+}
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/pom.xml?rev=728668&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/pom.xml Mon Dec 22 04:51:34 2008
@@ -0,0 +1,84 @@
+<?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.mng3769</groupId>
+ <artifactId>test</artifactId>
+ <version>1.0</version>
+
+ <name>Maven Integration Test :: MNG-3769</name>
+ <description>
+ Verify that dependency resolution considers dependency management also for relocated artifacts.
+ </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>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng3769</groupId>
+ <artifactId>dependency</artifactId>
+ <version>1.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.mven.its.mng3769</groupId>
+ <artifactId>relocated-new</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>validate</phase>
+ <configuration>
+ <projectArtifacts>target/artifacts.txt</projectArtifacts>
+ <testClassPath>target/test.txt</testClassPath>
+ <significantPathLevels>1</significantPathLevels>
+ </configuration>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/dependency/1.0/dependency-1.0.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/dependency/1.0/dependency-1.0.jar?rev=728668&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/dependency/1.0/dependency-1.0.jar (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/dependency/1.0/dependency-1.0.jar Mon Dec 22 04:51:34 2008
@@ -0,0 +1 @@
+test file
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/dependency/1.0/dependency-1.0.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/dependency/1.0/dependency-1.0.pom?rev=728668&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/dependency/1.0/dependency-1.0.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/dependency/1.0/dependency-1.0.pom Mon Dec 22 04:51:34 2008
@@ -0,0 +1,14 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.mng3769</groupId>
+ <artifactId>dependency</artifactId>
+ <version>1.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng3769</groupId>
+ <artifactId>relocated-orig</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
+</project>
+
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/dependency/1.0/dependency-1.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/relocated-new/1.1/relocated-new-1.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/relocated-new/1.1/relocated-new-1.1.jar?rev=728668&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/relocated-new/1.1/relocated-new-1.1.jar (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/relocated-new/1.1/relocated-new-1.1.jar Mon Dec 22 04:51:34 2008
@@ -0,0 +1 @@
+test file
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/relocated-new/1.1/relocated-new-1.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/relocated-new/1.1/relocated-new-1.1.pom?rev=728668&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/relocated-new/1.1/relocated-new-1.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/relocated-new/1.1/relocated-new-1.1.pom Mon Dec 22 04:51:34 2008
@@ -0,0 +1,7 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.mng3769</groupId>
+ <artifactId>relocated-new</artifactId>
+ <version>1.1</version>
+</project>
+
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/relocated-new/1.1/relocated-new-1.1.pom
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/relocated-orig/1.1/relocated-orig-1.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/relocated-orig/1.1/relocated-orig-1.1.pom?rev=728668&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/relocated-orig/1.1/relocated-orig-1.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/relocated-orig/1.1/relocated-orig-1.1.pom Mon Dec 22 04:51:34 2008
@@ -0,0 +1,12 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.mng3769</groupId>
+ <artifactId>relocated-orig</artifactId>
+ <version>1.1</version>
+ <distributionManagement>
+ <relocation>
+ <artifactId>relocated-new</artifactId>
+ </relocation>
+ </distributionManagement>
+</project>
+
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3769/repo/org/apache/maven/its/mng3769/relocated-orig/1.1/relocated-orig-1.1.pom
------------------------------------------------------------------------------
svn:eol-style = native