From d23f37d1b65b2c3a8c4b88aac4cd13d7e4024115 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Tue, 11 Aug 2009 19:52:59 +0000 Subject: [PATCH] o Re-enabled IT for 3.x git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@803268 13f79535-47bb-0310-9956-ffa450edef68 --- ...avenITmng0449PluginVersionResolutionTest.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java index a28cfe1a0a..e83cc7e662 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java @@ -46,9 +46,6 @@ public class MavenITmng0449PluginVersionResolutionTest 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 @@ public class MavenITmng0449PluginVersionResolutionTest 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" ); }