Author: bentmann
Date: Wed Sep 8 10:19:28 2010
New Revision: 994972
URL: http://svn.apache.org/viewvc?rev=994972&view=rev
Log:
[MNG-4800] Conflict resolution does not pick sub tree of nearest dependency if
farther conflicting dependency has wider scope
o Added IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/a/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/a/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/a/0.1/a-0.1.jar
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/a/0.1/a-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/b/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/b/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/b/0.1/b-0.1.jar
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/b/0.1/b-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/c/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/c/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/c/0.1/c-0.1.jar
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/c/0.1/c-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/s/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/s/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/s/0.1/s-0.1.jar
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/s/0.1/s-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/s/0.2/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/s/0.2/s-0.2.jar
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/s/0.2/s-0.2.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/x/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/x/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/x/0.1/x-0.1.jar
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/x/0.1/x-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/y/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/y/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/y/0.1/y-0.1.jar
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/y/0.1/y-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/settings-template.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/test-ab/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/test-ab/pom.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/test-ba/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/test-ba/pom.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=994972&r1=994971&r2=994972&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
Wed Sep 8 10:19:28 2010
@@ -81,6 +81,7 @@ public class IntegrationTestSuite
//
-------------------------------------------------------------------------------------------------------------
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); --
MNG-3137
+ suite.addTestSuite( MavenITmng4800NearestWinsVsScopeWideningTest.class
);
suite.addTestSuite(
MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.class );
suite.addTestSuite(
MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.class );
suite.addTestSuite(
MavenITmng4789ScopeInheritanceMeetsConflictTest.class );
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java?rev=994972&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java
Wed Sep 8 10:19:28 2010
@@ -0,0 +1,96 @@
+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.List;
+
+/**
+ * This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-4800";>MNG-4800</a>.
+ *
+ * @author Benjamin Bentmann
+ */
+public class MavenITmng4800NearestWinsVsScopeWideningTest
+ extends AbstractMavenIntegrationTestCase
+{
+
+ public MavenITmng4800NearestWinsVsScopeWideningTest()
+ {
+ super( "[3.0-beta-4,)" );
+ }
+
+ public void testitAB()
+ throws Exception
+ {
+ testit( "test-ab" );
+ }
+
+ public void testitBA()
+ throws Exception
+ {
+ testit( "test-ba" );
+ }
+
+ /**
+ * Verify that nearest-wins conflict resolution doesn't get confused when
a farther conflicting dependency has
+ * a wider scope than the nearer dependency, i.e. one should still end up
with the nearer dependency (s:1) and
+ * its sub tree (x) but in the wider scope (compile).
+ */
+ private void testit( String test )
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-4800" );
+
+ Verifier verifier = newVerifier( new File( testDir, test
).getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng4800" );
+ verifier.getCliOptions().add( "-s" );
+ verifier.getCliOptions().add( "settings.xml" );
+ verifier.filterFile( "../settings-template.xml", "settings.xml",
"UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ List compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
+
+ assertTrue( test + " > " + compile.toString(), compile.contains(
"b-0.1.jar" ) );
+ assertTrue( test + " > " + compile.toString(), compile.contains(
"c-0.1.jar" ) );
+ assertTrue( test + " > " + compile.toString(), compile.contains(
"s-0.1.jar" ) );
+ assertTrue( test + " > " + compile.toString(), compile.contains(
"x-0.1.jar" ) );
+ assertFalse( test + " > " + compile.toString(), compile.contains(
"a-0.1.jar" ) );
+ assertFalse( test + " > " + compile.toString(), compile.contains(
"s-0.2.jar" ) );
+ assertFalse( test + " > " + compile.toString(), compile.contains(
"y-0.1.jar" ) );
+
+ List runtime = verifier.loadLines( "target/runtime.txt", "UTF-8" );
+
+ assertTrue( test + " > " + runtime.toString(), runtime.contains(
"b-0.1.jar" ) );
+ assertTrue( test + " > " + runtime.toString(), runtime.contains(
"c-0.1.jar" ) );
+ assertTrue( test + " > " + runtime.toString(), runtime.contains(
"s-0.1.jar" ) );
+ assertTrue( test + " > " + runtime.toString(), runtime.contains(
"x-0.1.jar" ) );
+ assertTrue( test + " > " + runtime.toString(), runtime.contains(
"a-0.1.jar" ) );
+ assertFalse( test + " > " + runtime.toString(), runtime.contains(
"s-0.2.jar" ) );
+ assertFalse( test + " > " + runtime.toString(), runtime.contains(
"y-0.1.jar" ) );
+ }
+
+}
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/a/0.1/a-0.1.jar
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/a/0.1/a-0.1.jar?rev=994972&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/a/0.1/a-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/a/0.1/a-0.1.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/a/0.1/a-0.1.pom?rev=994972&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/a/0.1/a-0.1.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/a/0.1/a-0.1.pom
Wed Sep 8 10:19:28 2010
@@ -0,0 +1,45 @@
+<?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.mng4800</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4800</groupId>
+ <artifactId>s</artifactId>
+ <version>0.1</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+</project>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/b/0.1/b-0.1.jar
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/b/0.1/b-0.1.jar?rev=994972&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/b/0.1/b-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/b/0.1/b-0.1.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/b/0.1/b-0.1.pom?rev=994972&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/b/0.1/b-0.1.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/b/0.1/b-0.1.pom
Wed Sep 8 10:19:28 2010
@@ -0,0 +1,45 @@
+<?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.mng4800</groupId>
+ <artifactId>b</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4800</groupId>
+ <artifactId>c</artifactId>
+ <version>0.1</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+</project>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/c/0.1/c-0.1.jar
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/c/0.1/c-0.1.jar?rev=994972&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/c/0.1/c-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/c/0.1/c-0.1.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/c/0.1/c-0.1.pom?rev=994972&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/c/0.1/c-0.1.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/c/0.1/c-0.1.pom
Wed Sep 8 10:19:28 2010
@@ -0,0 +1,45 @@
+<?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.mng4800</groupId>
+ <artifactId>c</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4800</groupId>
+ <artifactId>s</artifactId>
+ <version>0.2</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+</project>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/s/0.1/s-0.1.jar
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/s/0.1/s-0.1.jar?rev=994972&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/s/0.1/s-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/s/0.1/s-0.1.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/s/0.1/s-0.1.pom?rev=994972&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/s/0.1/s-0.1.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/s/0.1/s-0.1.pom
Wed Sep 8 10:19:28 2010
@@ -0,0 +1,45 @@
+<?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.mng4800</groupId>
+ <artifactId>s</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4800</groupId>
+ <artifactId>x</artifactId>
+ <version>0.1</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+</project>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/s/0.2/s-0.2.jar
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/s/0.2/s-0.2.jar?rev=994972&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/s/0.2/s-0.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/s/0.2/s-0.2.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/s/0.2/s-0.2.pom?rev=994972&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/s/0.2/s-0.2.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/s/0.2/s-0.2.pom
Wed Sep 8 10:19:28 2010
@@ -0,0 +1,45 @@
+<?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.mng4800</groupId>
+ <artifactId>s</artifactId>
+ <version>0.2</version>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4800</groupId>
+ <artifactId>y</artifactId>
+ <version>0.1</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+</project>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/x/0.1/x-0.1.jar
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/x/0.1/x-0.1.jar?rev=994972&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/x/0.1/x-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/x/0.1/x-0.1.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/x/0.1/x-0.1.pom?rev=994972&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/x/0.1/x-0.1.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/x/0.1/x-0.1.pom
Wed Sep 8 10:19:28 2010
@@ -0,0 +1,36 @@
+<?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.mng4800</groupId>
+ <artifactId>x</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+</project>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/y/0.1/y-0.1.jar
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/y/0.1/y-0.1.jar?rev=994972&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/y/0.1/y-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/y/0.1/y-0.1.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/y/0.1/y-0.1.pom?rev=994972&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/y/0.1/y-0.1.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/repo/org/apache/maven/its/mng4800/y/0.1/y-0.1.pom
Wed Sep 8 10:19:28 2010
@@ -0,0 +1,36 @@
+<?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.mng4800</groupId>
+ <artifactId>y</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+</project>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/settings-template.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/settings-template.xml?rev=994972&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/settings-template.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/settings-template.xml
Wed Sep 8 10:19:28 2010
@@ -0,0 +1,43 @@
+<?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.
+-->
+
+<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>
+ </profile>
+ </profiles>
+ <activeProfiles>
+ <activeProfile>maven-core-it-repo</activeProfile>
+ </activeProfiles>
+</settings>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/settings-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/settings-template.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/test-ab/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/test-ab/pom.xml?rev=994972&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/test-ab/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/test-ab/pom.xml
Wed Sep 8 10:19:28 2010
@@ -0,0 +1,87 @@
+<?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.mng4800</groupId>
+ <artifactId>ab</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-4800</name>
+ <description>
+ Verify that nearest-wins conflict resolution doesn't get confused when a
farther conflicting dependency has
+ a wider scope than the nearer dependency, i.e. one should still end up
with the nearer dependency (s:1) and
+ its sub tree (x) but in the wider scope (compile).
+ </description>
+
+ <dependencies>
+ <!--
+ project
+ +- a:runtime
+ | \- s:1:runtime
+ | \- x:runtime
+ \- b:compile
+ \- c:compile
+ \- s:2:compile
+ \- y:compile
+ -->
+ <dependency>
+ <groupId>org.apache.maven.its.mng4800</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <!-- NOTE: This dependency having a narrower scope than compile is the
crucial piece of this test -->
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4800</groupId>
+ <artifactId>b</artifactId>
+ <version>0.1</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <configuration>
+ <compileClassPath>target/compile.txt</compileClassPath>
+ <runtimeClassPath>target/runtime.txt</runtimeClassPath>
+ <significantPathLevels>1</significantPathLevels>
+ </configuration>
+ <executions>
+ <execution>
+ <id>resolve</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>compile</goal>
+ <goal>runtime</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/test-ab/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/test-ab/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/test-ba/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/test-ba/pom.xml?rev=994972&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/test-ba/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/test-ba/pom.xml
Wed Sep 8 10:19:28 2010
@@ -0,0 +1,87 @@
+<?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.mng4800</groupId>
+ <artifactId>ba</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-4800</name>
+ <description>
+ Verify that nearest-wins conflict resolution doesn't get confused when a
farther conflicting dependency has
+ a wider scope than the nearer dependency, i.e. one should still end up
with the nearer dependency (s:1) and
+ its sub tree (x) but in the wider scope (compile).
+ </description>
+
+ <dependencies>
+ <!--
+ project
+ +- b:compile
+ | \- c:compile
+ | \- s:2:compile
+ | \- y:compile
+ \- a:runtime
+ \- s:1:runtime
+ \- x:runtime
+ -->
+ <dependency>
+ <groupId>org.apache.maven.its.mng4800</groupId>
+ <artifactId>b</artifactId>
+ <version>0.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4800</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <!-- NOTE: This dependency having a narrower scope than compile is the
crucial piece of this test -->
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <configuration>
+ <compileClassPath>target/compile.txt</compileClassPath>
+ <runtimeClassPath>target/runtime.txt</runtimeClassPath>
+ <significantPathLevels>1</significantPathLevels>
+ </configuration>
+ <executions>
+ <execution>
+ <id>resolve</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>compile</goal>
+ <goal>runtime</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/test-ba/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4800/test-ba/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
