You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2009/01/30 02:32:38 UTC

svn commit: r739127 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/

Author: brett
Date: Fri Jan 30 01:32:37 2009
New Revision: 739127

URL: http://svn.apache.org/viewvc?rev=739127&view=rev
Log:
dropping the reinstatement version until they are reinstated

Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3920PlexusComponentApiTest.java

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java?rev=739127&r1=739126&r2=739127&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java Fri Jan 30 01:32:37 2009
@@ -33,7 +33,7 @@
     public MavenITmng0553SettingsAuthzEncryptionTest()
     {
         // TODO: reintroduce for 3.0
-        super( "(2.1.0-M1,3.0-alpha-1),(3.0-alpha-3,)" ); // 2.1.0-M2+
+        super( "(2.1.0-M1,3.0-alpha-1)" ); // 2.1.0-M2+
     }
 
     /**

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java?rev=739127&r1=739126&r2=739127&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java Fri Jan 30 01:32:37 2009
@@ -40,7 +40,7 @@
     public MavenITmng1830ShowVersionTest()
     {
         // TODO: reinstate for 3.0
-        super( "(2.0.10,2.1.0-M1),(2.1.0-M1,3.0-alpha-1),(3.0-alpha-3,)" ); // Maven 2.0.11 + , 2.1.0-M2 +
+        super( "(2.0.10,2.1.0-M1),(2.1.0-M1,3.0-alpha-1)" ); // Maven 2.0.11 + , 2.1.0-M2 +
     }
 
     /**

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java?rev=739127&r1=739126&r2=739127&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java Fri Jan 30 01:32:37 2009
@@ -29,8 +29,8 @@
 {
     public MavenITmng2668UsePluginDependenciesForSortingTest()
     {
-        // TODO: estimated fix by 3.0-alpha-4
-        super( "(2.1.0-M1,3.0-alpha-1),(3.0-alpha-3,)" ); // 2.1.0-M2+
+        // TODO: fix for 3.0+
+        super( "(2.1.0-M1,3.0-alpha-1)" ); // 2.1.0-M2+
     }
 
     public void testmng2668()

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java?rev=739127&r1=739126&r2=739127&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java Fri Jan 30 01:32:37 2009
@@ -183,7 +183,7 @@
         throws Exception
     {
         // TODO: implement equivalent test for 3.0 once supported
-        if ( matchesVersionRange( "[2.1.0-M1,3.0-alpha-1),(3.0-alpha-3,)" ) ) //2.1.0-M1+
+        if ( matchesVersionRange( "[2.1.0-M1,3.0-alpha-1)" ) ) //2.1.0-M1+
         {
             File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3599" );
 

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java?rev=739127&r1=739126&r2=739127&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java Fri Jan 30 01:32:37 2009
@@ -33,7 +33,7 @@
     public MavenITmng3600DeploymentModeDefaultsTest()
     {
         // TODO: implement for 3.0
-        super( "(2.1.0-M1,3.0-alpha-1),(3.0-alpha-3,)" );
+        super( "(2.1.0-M1,3.0-alpha-1)" );
     }
 
     public void testitMNG3600NoSettings()

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java?rev=739127&r1=739126&r2=739127&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java Fri Jan 30 01:32:37 2009
@@ -47,7 +47,7 @@
     public MavenITmng3652UserAgentHeaderTest()
     {
         // TODO: re-instate feature in 3.0
-        super( "[2.1.0-M1,3.0-alpha-1),(3.0-alpha-3,)" ); // 2.1.0-M1+
+        super( "[2.1.0-M1,3.0-alpha-1)" ); // 2.1.0-M1+
     }
 
     public void setUp()

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java?rev=739127&r1=739126&r2=739127&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java Fri Jan 30 01:32:37 2009
@@ -52,7 +52,7 @@
 {
     public MavenITmng3729MultiForkAggregatorsTest()
     {
-        super( "(2.0.8,3.0-alpha-1),(3.0-alpha-3,)" ); // only test in 2.0.9+
+        super( "(2.0.8,3.0-alpha-1)" ); // only test in 2.0.9+
         //TODO: FIX: Disabled for 3.0.x, causes infinite looping on Mac.
     }
 

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java?rev=739127&r1=739126&r2=739127&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java Fri Jan 30 01:32:37 2009
@@ -40,7 +40,7 @@
     public MavenITmng3760BaseUriPropertyTest()
     {
         // TODO: fix for 3.0
-        super( "(2.1.0-M1,3.0-alpha-1),(3.0-alpha-3,)" ); // 2.1.0-M2+
+        super( "(2.1.0-M1,3.0-alpha-1)" ); // 2.1.0-M2+
     }
 
     public void testitMNG3760()

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java?rev=739127&r1=739126&r2=739127&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java Fri Jan 30 01:32:37 2009
@@ -38,7 +38,7 @@
     public MavenITmng3810BadProfileActivationTest()
     {
         // TODO: implement for 3.0
-        super( "(2.0.10,2.1.0-M1),(2.1.0-M1,3.0-alpha-1),(3.0-alpha-3,)" ); // 2.0.11+, 2.1.0-M2+
+        super( "(2.0.10,2.1.0-M1),(2.1.0-M1,3.0-alpha-1)" ); // 2.0.11+, 2.1.0-M2+
     }
 
     public void testitMNG3810Property()

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3920PlexusComponentApiTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3920PlexusComponentApiTest.java?rev=739127&r1=739126&r2=739127&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3920PlexusComponentApiTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3920PlexusComponentApiTest.java Fri Jan 30 01:32:37 2009
@@ -33,8 +33,7 @@
 {
     public MavenITmng3920PlexusComponentApiTest()
     {
-        // TODO: implement for 3.0
-        super( "(2.0.10,2.1.0-M1),(2.1.0-M1,3.0-alpha-1),(3.0-alpha-3,)" ); // 2.0.11+, 2.1.0-M2+
+        super( "(2.0.10,2.1.0-M1),(2.1.0-M1,)" ); // 2.0.11+, 2.1.0-M2+
     }
 
     public void testitMNG3920()