mirror of https://github.com/apache/maven.git
o Updated IT for 3.x which keeps the original dependeny type such that reactor resolution is transparent to clients
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@784406 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
17d348749f
commit
5265bc6bb4
|
@ -57,14 +57,32 @@ public class MavenITmng4056ClassifierBasedDepResolutionFromReactorTest
|
||||||
verifier.resetStreams();
|
verifier.resetStreams();
|
||||||
|
|
||||||
List artifacts = verifier.loadLines( "consumer/target/artifacts.txt", "UTF-8" );
|
List artifacts = verifier.loadLines( "consumer/target/artifacts.txt", "UTF-8" );
|
||||||
assertTrue( artifacts.toString(),
|
if ( matchesVersionRange( "[3.0-alpha-3,)" ) )
|
||||||
artifacts.contains( "org.apache.maven.its.mng4056:producer:test-jar:tests:0.1" ) );
|
{
|
||||||
assertTrue( artifacts.toString(),
|
// artifact type unchanged to match type as declared in dependency
|
||||||
artifacts.contains( "org.apache.maven.its.mng4056:producer:java-source:sources:0.1" ) );
|
|
||||||
assertTrue( artifacts.toString(),
|
assertTrue( artifacts.toString(),
|
||||||
artifacts.contains( "org.apache.maven.its.mng4056:producer:javadoc:javadoc:0.1" ) );
|
artifacts.contains( "org.apache.maven.its.mng4056:producer:jar:tests:0.1" ) );
|
||||||
assertTrue( artifacts.toString(),
|
assertTrue( artifacts.toString(),
|
||||||
artifacts.contains( "org.apache.maven.its.mng4056:producer:ejb-client:client:0.1" ) );
|
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" );
|
List classpath = verifier.loadLines( "consumer/target/compile.txt", "UTF-8" );
|
||||||
assertTrue( classpath.toString(), classpath.contains( "producer/test.jar" ) );
|
assertTrue( classpath.toString(), classpath.contains( "producer/test.jar" ) );
|
||||||
|
|
Loading…
Reference in New Issue