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 2010/08/23 20:30:19 UTC
svn commit: r988243 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-1895/
resources/mng-1895/direct-vs-indirect/
resources/mng-1895/direct-vs-indirect/repo/
resources/mng-1895/direct-vs-indirec...
Author: bentmann
Date: Mon Aug 23 18:30:18 2010
New Revision: 988243
URL: http://svn.apache.org/viewvc?rev=988243&view=rev
Log:
[MNG-2686] POM dependency scope auto-downgrades from provided to test
o Extended relevant IT to capture issue
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/a/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/a/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/a/0.1/a-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/a/0.1/a-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/b/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/b/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/b/0.1/b-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/b/0.1/b-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/c/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/c/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/c/0.1/c-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/c/0.1/c-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/d/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/d/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/d/0.1/d-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/d/0.1/d-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/settings-template.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/pom-template.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/a/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/a/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/a/0.1/a-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/a/0.1/a-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/b/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/b/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/b/0.1/b-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/b/0.1/b-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/c/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/c/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/c/0.1/c-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/c/0.1/c-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/x/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/x/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/x/0.1/x-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/x/0.1/x-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/settings-template.xml (with props)
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/settings-template.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java?rev=988243&r1=988242&r2=988243&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java Mon Aug 23 18:30:18 2010
@@ -24,6 +24,7 @@ import org.apache.maven.it.util.Resource
import java.io.File;
import java.util.List;
+import java.util.Properties;
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-1895">MNG-1895</a>.
@@ -40,17 +41,18 @@ public class MavenITmng1895ScopeConflict
}
/**
- * Verify that for dependencies in conflicting scopes the strongest scope wins unless the scope is given
- * directly in the project POM.
+ * Verify that for a dependency being referenced in two different scopes, the scope given directly in the POM
+ * always wins, even if weaker than the scope of the transitive dependency.
*/
- public void testit()
+ public void testitDirectVsIndirect()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1895" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1895/direct-vs-indirect" );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng1895" );
+ verifier.deleteDirectory( "target" );
verifier.getCliOptions().add( "-s" );
verifier.getCliOptions().add( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
@@ -59,15 +61,15 @@ public class MavenITmng1895ScopeConflict
verifier.resetStreams();
List compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
- assertFalse( compile.toString(), compile.contains( "a-0.1.jar" ) );
- assertTrue( compile.toString(), compile.contains( "b-0.1.jar" ) );
- assertTrue( compile.toString(), compile.contains( "c-0.1.jar" ) );
+ assertTrue( compile.toString(), compile.contains( "a-0.1.jar" ) );
+ assertFalse( compile.toString(), compile.contains( "b-0.1.jar" ) );
+ assertFalse( compile.toString(), compile.contains( "c-0.1.jar" ) );
assertTrue( compile.toString(), compile.contains( "d-0.1.jar" ) );
List runtime = verifier.loadLines( "target/runtime.txt", "UTF-8" );
assertFalse( runtime.toString(), runtime.contains( "a-0.1.jar" ) );
assertTrue( runtime.toString(), runtime.contains( "b-0.1.jar" ) );
- assertTrue( runtime.toString(), runtime.contains( "c-0.1.jar" ) );
+ assertFalse( runtime.toString(), runtime.contains( "c-0.1.jar" ) );
assertTrue( runtime.toString(), runtime.contains( "d-0.1.jar" ) );
List test = verifier.loadLines( "target/test.txt", "UTF-8" );
@@ -77,4 +79,156 @@ public class MavenITmng1895ScopeConflict
assertTrue( test.toString(), test.contains( "d-0.1.jar" ) );
}
+ /**
+ * Verify that for a dependency being referenced in compile and in runtime scope, compile scope wins.
+ */
+ public void testitCompileVsRuntime()
+ throws Exception
+ {
+ Verifier verifier = run( "compile", "runtime" );
+
+ List compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
+ assertTrue( compile.toString(), compile.contains( "x-0.1.jar" ) );
+ assertFalse( compile.toString(), compile.contains( "a-0.1.jar" ) );
+
+ List runtime = verifier.loadLines( "target/runtime.txt", "UTF-8" );
+ assertTrue( runtime.toString(), runtime.contains( "x-0.1.jar" ) );
+ assertTrue( runtime.toString(), runtime.contains( "a-0.1.jar" ) );
+
+ List test = verifier.loadLines( "target/test.txt", "UTF-8" );
+ assertTrue( test.toString(), test.contains( "x-0.1.jar" ) );
+ assertTrue( test.toString(), test.contains( "a-0.1.jar" ) );
+ }
+
+ /**
+ * Verify that for a dependency being referenced in compile and in test scope, compile scope wins.
+ */
+ public void testitCompileVsTest()
+ throws Exception
+ {
+ Verifier verifier = run( "compile", "test" );
+
+ List compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
+ assertTrue( compile.toString(), compile.contains( "x-0.1.jar" ) );
+ assertFalse( compile.toString(), compile.contains( "a-0.1.jar" ) );
+
+ List runtime = verifier.loadLines( "target/runtime.txt", "UTF-8" );
+ assertTrue( runtime.toString(), runtime.contains( "x-0.1.jar" ) );
+ assertFalse( runtime.toString(), runtime.contains( "a-0.1.jar" ) );
+
+ List test = verifier.loadLines( "target/test.txt", "UTF-8" );
+ assertTrue( test.toString(), test.contains( "x-0.1.jar" ) );
+ assertTrue( test.toString(), test.contains( "a-0.1.jar" ) );
+ }
+
+ /**
+ * Verify that for a dependency being referenced in compile and in provided scope, compile scope wins.
+ */
+ public void testitCompileVsProvided()
+ throws Exception
+ {
+ Verifier verifier = run( "compile", "provided" );
+
+ List compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
+ assertTrue( compile.toString(), compile.contains( "x-0.1.jar" ) );
+ assertTrue( compile.toString(), compile.contains( "a-0.1.jar" ) );
+
+ List runtime = verifier.loadLines( "target/runtime.txt", "UTF-8" );
+ assertTrue( runtime.toString(), runtime.contains( "x-0.1.jar" ) );
+ assertFalse( runtime.toString(), runtime.contains( "a-0.1.jar" ) );
+
+ List test = verifier.loadLines( "target/test.txt", "UTF-8" );
+ assertTrue( test.toString(), test.contains( "x-0.1.jar" ) );
+ assertTrue( test.toString(), test.contains( "a-0.1.jar" ) );
+ }
+
+ /**
+ * Verify that for a dependency being referenced in runtime and in test scope, runtime scope wins.
+ */
+ public void testitRuntimeVsTest()
+ throws Exception
+ {
+ Verifier verifier = run( "runtime", "test" );
+
+ List compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
+ assertFalse( compile.toString(), compile.contains( "x-0.1.jar" ) );
+ assertFalse( compile.toString(), compile.contains( "a-0.1.jar" ) );
+
+ List runtime = verifier.loadLines( "target/runtime.txt", "UTF-8" );
+ assertTrue( runtime.toString(), runtime.contains( "x-0.1.jar" ) );
+ assertFalse( runtime.toString(), runtime.contains( "a-0.1.jar" ) );
+
+ List test = verifier.loadLines( "target/test.txt", "UTF-8" );
+ assertTrue( test.toString(), test.contains( "x-0.1.jar" ) );
+ assertTrue( test.toString(), test.contains( "a-0.1.jar" ) );
+ }
+
+ /**
+ * Verify that for a dependency being referenced in runtime and in provided scope, runtime scope wins.
+ */
+ public void testitRuntimeVsProvided()
+ throws Exception
+ {
+ Verifier verifier = run( "runtime", "provided" );
+
+ List compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
+ assertFalse( compile.toString(), compile.contains( "x-0.1.jar" ) );
+ assertTrue( compile.toString(), compile.contains( "a-0.1.jar" ) );
+
+ List runtime = verifier.loadLines( "target/runtime.txt", "UTF-8" );
+ assertTrue( runtime.toString(), runtime.contains( "x-0.1.jar" ) );
+ assertFalse( runtime.toString(), runtime.contains( "a-0.1.jar" ) );
+
+ List test = verifier.loadLines( "target/test.txt", "UTF-8" );
+ assertTrue( test.toString(), test.contains( "x-0.1.jar" ) );
+ assertTrue( test.toString(), test.contains( "a-0.1.jar" ) );
+ }
+
+ /**
+ * Verify that for a dependency being referenced in provided and in test scope, provided scope wins.
+ */
+ public void testitProvidedVsTest()
+ throws Exception
+ {
+ requiresMavenVersion( "[4.0,)" ); // MNG-2686
+
+ Verifier verifier = run( "provided", "test" );
+
+ List compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
+ assertTrue( compile.toString(), compile.contains( "x-0.1.jar" ) );
+ assertFalse( compile.toString(), compile.contains( "a-0.1.jar" ) );
+
+ List runtime = verifier.loadLines( "target/runtime.txt", "UTF-8" );
+ assertFalse( runtime.toString(), runtime.contains( "x-0.1.jar" ) );
+ assertFalse( runtime.toString(), runtime.contains( "a-0.1.jar" ) );
+
+ List test = verifier.loadLines( "target/test.txt", "UTF-8" );
+ assertTrue( test.toString(), test.contains( "x-0.1.jar" ) );
+ assertTrue( test.toString(), test.contains( "a-0.1.jar" ) );
+ }
+
+ private Verifier run( String scopeB, String scopeA )
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1895/strong-vs-weak" );
+
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng1895" );
+ verifier.deleteDirectory( "target" );
+ verifier.getCliOptions().add( "-s" );
+ verifier.getCliOptions().add( "settings.xml" );
+ Properties props = verifier.newDefaultFilterProperties();
+ props.setProperty( "@scope.a@", scopeA );
+ props.setProperty( "@scope.b@", scopeB );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", props );
+ verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", props );
+ verifier.setLogFileName( "log-" + scopeB + "-vs-" + scopeA + ".txt" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ return verifier;
+ }
+
}
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/pom.xml?rev=988243&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/pom.xml Mon Aug 23 18:30:18 2010
@@ -0,0 +1,99 @@
+<?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.mng1895</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-1895</name>
+ <description>
+ Verify that for a dependency being referenced in two different scopes, the scope given directly in the POM
+ always wins, even if weaker than the scope of the transitive dependency.
+ </description>
+
+ <dependencies>
+ <!--
+ test
+ +- a:provided
+ +- b:runtime
+ +- c:test
+ \- d:compile
+ +- a:compile
+ +- b:compile
+ \- c:compile
+ -->
+ <dependency>
+ <groupId>org.apache.maven.its.mng1895</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng1895</groupId>
+ <artifactId>b</artifactId>
+ <version>0.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng1895</groupId>
+ <artifactId>c</artifactId>
+ <version>0.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng1895</groupId>
+ <artifactId>d</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>
+ <testClassPath>target/test.txt</testClassPath>
+ <significantPathLevels>1</significantPathLevels>
+ </configuration>
+ <executions>
+ <execution>
+ <id>resolve</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>compile</goal>
+ <goal>runtime</goal>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/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-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/a/0.1/a-0.1.jar?rev=988243&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/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-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/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-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/a/0.1/a-0.1.pom?rev=988243&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/a/0.1/a-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/a/0.1/a-0.1.pom Mon Aug 23 18:30:18 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.mng1895</groupId>
+ <artifactId>a</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-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/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-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/b/0.1/b-0.1.jar?rev=988243&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/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-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/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-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/b/0.1/b-0.1.pom?rev=988243&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/b/0.1/b-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/b/0.1/b-0.1.pom Mon Aug 23 18:30:18 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.mng1895</groupId>
+ <artifactId>b</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-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/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-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/c/0.1/c-0.1.jar?rev=988243&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/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-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/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-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/c/0.1/c-0.1.pom?rev=988243&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/c/0.1/c-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/c/0.1/c-0.1.pom Mon Aug 23 18:30:18 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.mng1895</groupId>
+ <artifactId>c</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-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/d/0.1/d-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/d/0.1/d-0.1.jar?rev=988243&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/d/0.1/d-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/d/0.1/d-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/d/0.1/d-0.1.pom?rev=988243&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/d/0.1/d-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/repo/org/apache/maven/its/mng1895/d/0.1/d-0.1.pom Mon Aug 23 18:30:18 2010
@@ -0,0 +1,57 @@
+<?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.mng1895</groupId>
+ <artifactId>d</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng1895</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng1895</groupId>
+ <artifactId>b</artifactId>
+ <version>0.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng1895</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-1895/direct-vs-indirect/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/settings-template.xml?rev=988243&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/settings-template.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/settings-template.xml Mon Aug 23 18:30:18 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-1895/direct-vs-indirect/settings-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/direct-vs-indirect/settings-template.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/pom-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/pom-template.xml?rev=988243&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/pom-template.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/pom-template.xml Mon Aug 23 18:30:18 2010
@@ -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.mng1895</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-1895</name>
+ <description>
+ Verify that for a dependency being referenced in two different scopes, the stronger scope wins.
+ </description>
+
+ <dependencies>
+ <!--
+ test
+ +- a
+ | \- x
+ \- b
+ \- c
+ \- x
+ -->
+ <dependency>
+ <groupId>org.apache.maven.its.mng1895</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <scope>@scope.a@</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng1895</groupId>
+ <artifactId>b</artifactId>
+ <version>0.1</version>
+ <scope>@scope.b@</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>
+ <testClassPath>target/test.txt</testClassPath>
+ <significantPathLevels>1</significantPathLevels>
+ </configuration>
+ <executions>
+ <execution>
+ <id>resolve</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>compile</goal>
+ <goal>runtime</goal>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/pom-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/pom-template.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/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-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/a/0.1/a-0.1.jar?rev=988243&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/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-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/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-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/a/0.1/a-0.1.pom?rev=988243&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/a/0.1/a-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/a/0.1/a-0.1.pom Mon Aug 23 18:30:18 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.mng1895</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng1895</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-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/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-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/b/0.1/b-0.1.jar?rev=988243&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/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-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/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-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/b/0.1/b-0.1.pom?rev=988243&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/b/0.1/b-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/b/0.1/b-0.1.pom Mon Aug 23 18:30:18 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.mng1895</groupId>
+ <artifactId>b</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng1895</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-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/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-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/c/0.1/c-0.1.jar?rev=988243&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/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-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/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-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/c/0.1/c-0.1.pom?rev=988243&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/c/0.1/c-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/c/0.1/c-0.1.pom Mon Aug 23 18:30:18 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.mng1895</groupId>
+ <artifactId>c</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng1895</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-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/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-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/x/0.1/x-0.1.jar?rev=988243&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/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-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/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-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/x/0.1/x-0.1.pom?rev=988243&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/x/0.1/x-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/repo/org/apache/maven/its/mng1895/x/0.1/x-0.1.pom Mon Aug 23 18:30:18 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.mng1895</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-1895/strong-vs-weak/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/settings-template.xml?rev=988243&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/settings-template.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/settings-template.xml Mon Aug 23 18:30:18 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-1895/strong-vs-weak/settings-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1895/strong-vs-weak/settings-template.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision