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 2009/06/13 17:09:19 UTC
svn commit: r784406 -
/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java
Author: bentmann
Date: Sat Jun 13 15:09:19 2009
New Revision: 784406
URL: http://svn.apache.org/viewvc?rev=784406&view=rev
Log:
o Updated IT for 3.x which keeps the original dependeny type such that reactor resolution is transparent to clients
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java?rev=784406&r1=784405&r2=784406&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java Sat Jun 13 15:09:19 2009
@@ -57,14 +57,32 @@
verifier.resetStreams();
List artifacts = verifier.loadLines( "consumer/target/artifacts.txt", "UTF-8" );
- assertTrue( artifacts.toString(),
- artifacts.contains( "org.apache.maven.its.mng4056:producer:test-jar:tests:0.1" ) );
- assertTrue( artifacts.toString(),
- artifacts.contains( "org.apache.maven.its.mng4056:producer:java-source:sources:0.1" ) );
- assertTrue( artifacts.toString(),
- artifacts.contains( "org.apache.maven.its.mng4056:producer:javadoc:javadoc:0.1" ) );
- assertTrue( artifacts.toString(),
- artifacts.contains( "org.apache.maven.its.mng4056:producer:ejb-client:client:0.1" ) );
+ if ( matchesVersionRange( "[3.0-alpha-3,)" ) )
+ {
+ // artifact type unchanged to match type as declared in dependency
+
+ assertTrue( artifacts.toString(),
+ artifacts.contains( "org.apache.maven.its.mng4056:producer:jar:tests:0.1" ) );
+ assertTrue( artifacts.toString(),
+ artifacts.contains( "org.apache.maven.its.mng4056:producer:jar:sources:0.1" ) );
+ assertTrue( artifacts.toString(),
+ artifacts.contains( "org.apache.maven.its.mng4056:producer:jar:javadoc:0.1" ) );
+ assertTrue( artifacts.toString(),
+ artifacts.contains( "org.apache.maven.its.mng4056:producer:jar:client:0.1" ) );
+ }
+ else
+ {
+ // artifact type updated to match type of active artifact
+
+ assertTrue( artifacts.toString(),
+ artifacts.contains( "org.apache.maven.its.mng4056:producer:test-jar:tests:0.1" ) );
+ assertTrue( artifacts.toString(),
+ artifacts.contains( "org.apache.maven.its.mng4056:producer:java-source:sources:0.1" ) );
+ assertTrue( artifacts.toString(),
+ artifacts.contains( "org.apache.maven.its.mng4056:producer:javadoc:javadoc:0.1" ) );
+ assertTrue( artifacts.toString(),
+ artifacts.contains( "org.apache.maven.its.mng4056:producer:ejb-client:client:0.1" ) );
+ }
List classpath = verifier.loadLines( "consumer/target/compile.txt", "UTF-8" );
assertTrue( classpath.toString(), classpath.contains( "producer/test.jar" ) );