From d184346f384b671d1ba6578f895ca1beda841e4e Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Fri, 30 Jan 2009 01:32:37 +0000 Subject: [PATCH] dropping the reinstatement version until they are reinstated git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@739127 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java | 2 +- .../org/apache/maven/it/MavenITmng1830ShowVersionTest.java | 2 +- .../it/MavenITmng2668UsePluginDependenciesForSortingTest.java | 4 ++-- .../maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java | 2 +- .../maven/it/MavenITmng3600DeploymentModeDefaultsTest.java | 2 +- .../apache/maven/it/MavenITmng3652UserAgentHeaderTest.java | 2 +- .../maven/it/MavenITmng3729MultiForkAggregatorsTest.java | 2 +- .../apache/maven/it/MavenITmng3760BaseUriPropertyTest.java | 2 +- .../maven/it/MavenITmng3810BadProfileActivationTest.java | 2 +- .../apache/maven/it/MavenITmng3920PlexusComponentApiTest.java | 3 +-- 10 files changed, 11 insertions(+), 12 deletions(-) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java index e665c13b7d..30048e8409 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java @@ -33,7 +33,7 @@ public class MavenITmng0553SettingsAuthzEncryptionTest 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+ } /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java index db59506a07..3cb74f8363 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java @@ -40,7 +40,7 @@ public class MavenITmng1830ShowVersionTest 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 + } /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java index c4318fafd9..bdcac2654a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java @@ -29,8 +29,8 @@ public class MavenITmng2668UsePluginDependenciesForSortingTest { 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() diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java index ce2c401345..d0ade6d597 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java @@ -183,7 +183,7 @@ public class MavenITmng3599useHttpProxyForWebDAVTest 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" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java index 58ccf3d6ac..faf7b9e644 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java @@ -33,7 +33,7 @@ public class MavenITmng3600DeploymentModeDefaultsTest 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() diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java index 5a0eb17a96..8c2f0fe182 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java @@ -47,7 +47,7 @@ public class MavenITmng3652UserAgentHeaderTest 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() diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java index ea6a5642e3..130f0889a9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java @@ -52,7 +52,7 @@ public class MavenITmng3729MultiForkAggregatorsTest { 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. } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java index 9faa18cd6c..518e58f1fc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java @@ -40,7 +40,7 @@ public class MavenITmng3760BaseUriPropertyTest 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() diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java index 0c1f3150c4..11844a22ca 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java @@ -38,7 +38,7 @@ public class MavenITmng3810BadProfileActivationTest 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() diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3920PlexusComponentApiTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3920PlexusComponentApiTest.java index bb5b093abd..c75d32a172 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3920PlexusComponentApiTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3920PlexusComponentApiTest.java @@ -33,8 +33,7 @@ public class MavenITmng3920PlexusComponentApiTest { 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()