Author: brett
Date: Thu Jan 29 20:30:16 2009
New Revision: 738998
URL: http://svn.apache.org/viewvc?rev=738998&view=rev
Log:
lock in the release version for things that won't be supported in 3.0-alpha-1,
or only started being supported in 3.0-alpha-1
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3530DynamicPOMInterpolationTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051Test.java?rev=738998&r1=738997&r2=738998&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051Test.java
Thu Jan 29 20:30:16 2009
@@ -29,7 +29,7 @@
{
public MavenIT0051Test()
{
- super( "(2.0.2,2.99.99)" );
+ super( "(2.0.2,3.0-alpha-1)" ); // no longer supported in 3.0+
}
/**
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java?rev=738998&r1=738997&r2=738998&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
Thu Jan 29 20:30:16 2009
@@ -37,7 +37,7 @@
public MavenITmng1323AntrunDependenciesTest()
{
- super( "(2.999,)" );
+ super( "[3.0-alpha-1,)" );
}
/**
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java?rev=738998&r1=738997&r2=738998&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java
Thu Jan 29 20:30:16 2009
@@ -37,7 +37,7 @@
public MavenITmng1992SystemPropOverridesPomPropTest()
{
- super( "(2.999,)" );
+ super( "[3.0-alpha-1,)" );
}
/**
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java?rev=738998&r1=738997&r2=738998&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java
Thu Jan 29 20:30:16 2009
@@ -37,7 +37,7 @@
public MavenITmng1995InterpolateBooleanModelElementsTest()
{
- super( "(2.999.0,)" );
+ super( "[3.0-alpha-1,)" );
}
/**
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java?rev=738998&r1=738997&r2=738998&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
Thu Jan 29 20:30:16 2009
@@ -31,7 +31,7 @@
public MavenITmng2196ParentResolutionTest()
{
- super( "(,2.0.2)(2.0.2,)" );
+ super( "(,2.0.2),(2.0.2,)" );
}
/**
@@ -46,7 +46,7 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- if ( matchesVersionRange( "(, 2.99.99)" ) )
+ if ( matchesVersionRange( "(,3.0-alpha-1)" ) )
{
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java?rev=738998&r1=738997&r2=738998&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java
Thu Jan 29 20:30:16 2009
@@ -37,7 +37,7 @@
public MavenITmng2749ExtensionAvailableToPluginTest()
{
- super( "(2.0.2,2.99)" );
+ super( "(2.0.2,3.0-alpha-1)" ); // not supported in 3.0+
}
/**
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java?rev=738998&r1=738997&r2=738998&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java
Thu Jan 29 20:30:16 2009
@@ -30,7 +30,7 @@
public MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest()
{
- super( "(2.0.1,2.0.5),(2.0.6,2.99.99)" ); //extension support removed
from 3.0
+ super( "(2.0.1,2.0.5),(2.0.6,3.0-alpha-1)" ); //extension support
removed from 3.0
}
/**
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java?rev=738998&r1=738997&r2=738998&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java
Thu Jan 29 20:30:16 2009
@@ -37,7 +37,7 @@
public MavenITmng2871PrePackageSubartifactResolutionTest()
{
- super( "(2.999,)" );
+ super( "[3.0-alpha-1,)" );
}
/**
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java?rev=738998&r1=738997&r2=738998&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
Thu Jan 29 20:30:16 2009
@@ -32,7 +32,7 @@
{
public MavenITmng3220ImportScopeTest()
{
- super( "(2.0.8,2.99.99)" );
+ super( "(2.0.8,3.0-alpha-1)" ); // not supported in 3.0+
}
public void testitMNG3220a()
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java?rev=738998&r1=738997&r2=738998&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java
Thu Jan 29 20:30:16 2009
@@ -31,7 +31,7 @@
{
public MavenITmng3221InfiniteForkingTest()
{
- super( "(2.0.8,2.99.99)" );
+ super( "(2.0.8,3.0-alpha-1)" ); // irrelevant in 3.0+
}
public void testitMNG3221a()
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java?rev=738998&r1=738997&r2=738998&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
Thu Jan 29 20:30:16 2009
@@ -33,7 +33,7 @@
public MavenITmng3284UsingCachedPluginsTest()
{
- super( "(2.999,)" );
+ super( "[3.0-alpha-1,)" );
}
/**
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java?rev=738998&r1=738997&r2=738998&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
Thu Jan 29 20:30:16 2009
@@ -276,7 +276,7 @@
dir.mkdirs();
// < 3.0 (including snapshots)
- if ( matchesVersionRange( "(2.0.8,2.999)" ) )
+ if ( matchesVersionRange( "(2.0.8,3.0-alpha-1)" ) )
{
return new File( dir, "maven-metadata-testing-repo.xml" );
}
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java?rev=738998&r1=738997&r2=738998&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
Thu Jan 29 20:30:16 2009
@@ -31,7 +31,7 @@
{
public MavenITmng3485OverrideWagonExtensionTest()
{
- super( "(2.0.8,2.99.99)" );
+ super( "(2.0.8,3.0-alpha-1)" ); // extensions not supported in 3.0+
}
public void testitMNG3485 ()
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3530DynamicPOMInterpolationTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3530DynamicPOMInterpolationTest.java?rev=738998&r1=738997&r2=738998&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3530DynamicPOMInterpolationTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3530DynamicPOMInterpolationTest.java
Thu Jan 29 20:30:16 2009
@@ -40,7 +40,7 @@
public MavenITmng3530DynamicPOMInterpolationTest()
{ //Dynamic properties for forked lifecycles not supported in 3.0
- super( "[2.1.0-M1,2.999)" );
+ super( "[2.1.0-M1,3.0-alpha-1)" );
}
public void testitMNG3530_BuildPath()
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java?rev=738998&r1=738997&r2=738998&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java
Thu Jan 29 20:30:16 2009
@@ -32,7 +32,7 @@
public MavenITmng3535SelfReferentialPropertiesTest()
{
- super( "[2.1.0-M1,2.99.99)" );
+ super( "[2.1.0-M1,3.0-alpha-1)" ); // handled differently in 3.0+
}
public void testitMNG3535_ShouldSucceed()
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java?rev=738998&r1=738997&r2=738998&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java
Thu Jan 29 20:30:16 2009
@@ -37,7 +37,7 @@
public MavenITmng3805ExtensionClassPathOrderingTest()
{
- super( "(2.0.9,2.1.0-M1),(2.1.0-M1,2.999)" );
+ super( "(2.0.9,2.1.0-M1),(2.1.0-M1,3.0-alpha-1)" ); // extensions not
supported in 3.0+
}
/**
