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/08/11 21:52:59 UTC
svn commit: r803268 -
/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
Author: bentmann
Date: Tue Aug 11 19:52:59 2009
New Revision: 803268
URL: http://svn.apache.org/viewvc?rev=803268&view=rev
Log:
o Re-enabled IT for 3.x
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java?rev=803268&r1=803267&r2=803268&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java Tue Aug 11 19:52:59 2009
@@ -46,9 +46,6 @@
public void testitLifecycleInvocation()
throws Exception
{
- // automatic version resolution no longer supported in 3.x (see MNG-4173)
- requiresMavenVersion( "(,3.0-alpha-1)" );
-
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0449" );
testDir = new File( testDir, "lifecycle" );
@@ -63,8 +60,17 @@
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFileNotPresent( "target/touch-release.txt" );
- verifier.assertFilePresent( "target/touch-snapshot.txt" );
+ // Maven 3.x prefers RELEASE over LATEST (see MNG-4206)
+ if ( matchesVersionRange( "(,3.0-alpha-3)" ) )
+ {
+ verifier.assertFileNotPresent( "target/touch-release.txt" );
+ verifier.assertFilePresent( "target/touch-snapshot.txt" );
+ }
+ else
+ {
+ verifier.assertFilePresent( "target/touch-release.txt" );
+ verifier.assertFileNotPresent( "target/touch-snapshot.txt" );
+ }
verifier.assertFilePresent( "target/package.txt" );
}