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 2008/07/27 18:49:17 UTC
svn commit: r680148 -
/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/
Author: brett
Date: Sun Jul 27 09:49:16 2008
New Revision: 680148
URL: http://svn.apache.org/viewvc?rev=680148&view=rev
Log:
various versions cannot be < both SNAPSHOT and alpha-1-SNAPSHOT, so use a (hopefully!) unrealistic version in the 2.0.x series as a boundary. Once we get the first 2.1 alpha out, these can be switched to be < 2.1-alpha-1
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0026Test.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3415JunkRepositoryMetadataTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3485OverrideWagonExtensionTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3599useHttpProxyForWebDAV.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0026Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0026Test.java?rev=680148&r1=680147&r2=680148&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0026Test.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0026Test.java Sun Jul 27 09:49:16 2008
@@ -13,7 +13,8 @@
public MavenIT0026Test()
throws InvalidVersionSpecificationException
{
- super( "[,2.1-ALPHA-1-SNAPSHOT)" );
+ // < 2.1 (including snapshots)
+ super( "[,2.0.99)" );
}
/**
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java?rev=680148&r1=680147&r2=680148&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java Sun Jul 27 09:49:16 2008
@@ -14,7 +14,8 @@
public MavenIT0051Test()
throws InvalidVersionSpecificationException
{
- super( "[,2.1-ALPHA-1-SNAPSHOT)" );
+ // < 2.1 (including snapshots)
+ super( "[,2.0.99)" );
}
/**
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java?rev=680148&r1=680147&r2=680148&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java Sun Jul 27 09:49:16 2008
@@ -14,7 +14,8 @@
public MavenIT0092Test()
throws InvalidVersionSpecificationException
{
- super( "[,2.1-ALPHA-1-SNAPSHOT)" );
+ // < 2.1 (including snapshots)
+ super( "[,2.0.99)" );
}
/**
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java?rev=680148&r1=680147&r2=680148&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java Sun Jul 27 09:49:16 2008
@@ -14,7 +14,8 @@
public MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest()
throws InvalidVersionSpecificationException
{
- super( "(,2.1-ALPHA-1-SNAPSHOT)" );
+ // < 2.1 (including snapshots)
+ super( "(,2.0.99)" );
}
public void testit0111()
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java?rev=680148&r1=680147&r2=680148&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java Sun Jul 27 09:49:16 2008
@@ -14,7 +14,8 @@
public MavenIT0114ExtensionThatProvidesResources()
throws InvalidVersionSpecificationException
{
- super( "(,2.1-ALPHA-1-SNAPSHOT)" );
+ // < 2.1 (including snapshots)
+ super( "(,2.0.99)" );
}
public void testit0114()
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.java?rev=680148&r1=680147&r2=680148&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.java Sun Jul 27 09:49:16 2008
@@ -15,7 +15,7 @@
public MavenITmng1493NonStandardModulePomNames()
throws InvalidVersionSpecificationException
{
- super( "[2.1-ALPHA-1-SNAPSHOT,)" ); // 2.1+
+ super( "[2.0.99,)" ); // 2.1+ (including snapshots)
}
public void testitMNG1493 ()
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java?rev=680148&r1=680147&r2=680148&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java Sun Jul 27 09:49:16 2008
@@ -14,7 +14,7 @@
public MavenITmng3221InfiniteForking()
throws InvalidVersionSpecificationException
{
- super( "(2.0.8,2.1-ALPHA-1-SNAPSHOT)" ); // only test in 2.0.9+
+ super( "(2.0.8,2.0.99)" ); // only test in 2.0.9+, not 2.1+ (including snapshots)
}
public void testitMNG3221a()
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3415JunkRepositoryMetadataTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3415JunkRepositoryMetadataTest.java?rev=680148&r1=680147&r2=680148&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3415JunkRepositoryMetadataTest.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3415JunkRepositoryMetadataTest.java Sun Jul 27 09:49:16 2008
@@ -273,7 +273,8 @@
dir.mkdirs();
- if ( matchesVersionRange( "(2.0.8,2.1-ALPHA-1-SNAPSHOT)" ) )
+ // < 2.1 (including snapshots)
+ if ( matchesVersionRange( "(2.0.8,2.0.99)" ) )
{
return new File( dir, "maven-metadata-testing-repo.xml" );
}
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3485OverrideWagonExtensionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3485OverrideWagonExtensionTest.java?rev=680148&r1=680147&r2=680148&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3485OverrideWagonExtensionTest.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3485OverrideWagonExtensionTest.java Sun Jul 27 09:49:16 2008
@@ -14,7 +14,7 @@
public MavenITmng3485OverrideWagonExtensionTest()
throws InvalidVersionSpecificationException
{
- super( "(2.0.8,2.1-ALPHA-1-SNAPSHOT)" ); // only test in 2.0.9+
+ super( "(2.0.8,2.0.99)" ); // only test in 2.0.9+, < 2.1 (including snapshots)
}
public void testitMNG3485 ()
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3599useHttpProxyForWebDAV.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3599useHttpProxyForWebDAV.java?rev=680148&r1=680147&r2=680148&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3599useHttpProxyForWebDAV.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3599useHttpProxyForWebDAV.java Sun Jul 27 09:49:16 2008
@@ -94,7 +94,7 @@
// Doesn't work until 2.0.10+
// TODO: reinstate for 2.1 when WebDAV works
- if ( matchesVersionRange( "(2.0.9,2.1-ALPHA-1-SNAPSHOT)" ) )
+ if ( matchesVersionRange( "(2.0.9,2.0.99)" ) )
{
newSettings = StringUtils.replace( settings, "@protocol@", "dav" );
FileUtils.fileWrite( new File( testDir, "settings.xml" ).getAbsolutePath(), newSettings );
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java?rev=680148&r1=680147&r2=680148&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java Sun Jul 27 09:49:16 2008
@@ -36,7 +36,7 @@
// TODO: fix support for this in 2.1-SNAPSHOT
// 2.0.10+
//super( "(2.0.9,)" );
- super( "(2.0.9,2.1-ALPHA-1-SNAPSHOT)" );
+ super( "(2.0.9,2.0.99)" );
}
public void setUp()