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/09/17 15:29:42 UTC

svn commit: r816183 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/IntegrationTestSuite.java java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java resources/mng-4048/sub-2/pom.xml

Author: bentmann
Date: Thu Sep 17 13:29:41 2009
New Revision: 816183

URL: http://svn.apache.org/viewvc?rev=816183&view=rev
Log:
[MNG-4048] Allow to resolve dependencies using version range from reactor

o Enabled IT

Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4048/sub-2/pom.xml

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=816183&r1=816182&r2=816183&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Thu Sep 17 13:29:41 2009
@@ -159,6 +159,7 @@
         suite.addTestSuite( MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.class );
         suite.addTestSuite( MavenITmng4052ReactorAwareImportScopeTest.class );
         suite.addTestSuite( MavenITmng4053PluginConfigAttributesTest.class );
+        suite.addTestSuite( MavenITmng4048VersionRangeReactorResolutionTest.class );
         suite.addTestSuite( MavenITmng4040ProfileInjectedModulesTest.class );
         suite.addTestSuite( MavenITmng4036ParentResolutionFromSettingsRepoTest.class );
         suite.addTestSuite( MavenITmng4034ManagedProfileDependencyTest.class );

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java?rev=816183&r1=816182&r2=816183&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java Thu Sep 17 13:29:41 2009
@@ -36,7 +36,7 @@
 
     public MavenITmng4048VersionRangeReactorResolutionTest()
     {
-        super( "[4.0,)" );
+        super( "[3.0-alpha-3,)" );
     }
 
     /**
@@ -50,6 +50,7 @@
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "sub-2/target" );
+        verifier.deleteArtifacts( "org.apache.maven.its.mng4048" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4048/sub-2/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4048/sub-2/pom.xml?rev=816183&r1=816182&r2=816183&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4048/sub-2/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4048/sub-2/pom.xml Thu Sep 17 13:29:41 2009
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.apache.maven.its.mng4048</groupId>
       <artifactId>sub-1</artifactId>
-      <version>[1.0,)</version>
+      <version>[1.0,1.1-SNAPSHOT]</version>
     </dependency>
   </dependencies>