Author: bentmann
Date: Tue Dec 9 11:11:00 2008
New Revision: 724837
URL: http://svn.apache.org/viewvc?rev=724837&view=rev
Log:
o Fixed some version ranges to match actual release history
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/MavenIT0062Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0129ResourceProvidedToAPluginAsAPluginDependencyTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.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/MavenITmng2201PluginConfigInterpolationTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.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/MavenITmng2843PluginConfigPropertiesInjectionTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0081/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/pom.xml
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=724837&r1=724836&r2=724837&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
Tue Dec 9 11:11:00 2008
@@ -31,7 +31,7 @@
{
public MavenIT0051Test()
{
- super( "[,2.99.99)" );
+ super( "(2.0.2,2.99.99)" );
}
/**
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0062Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0062Test.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0062Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0062Test.java
Tue Dec 9 11:11:00 2008
@@ -28,6 +28,11 @@
extends AbstractMavenIntegrationTestCase
{
+ public MavenIT0062Test()
+ {
+ super( "(2.0.2,)" );
+ }
+
/**
* Test that a deployment of a snapshot falls back to a non-snapshot
repository if no snapshot repository is
* specified.
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086Test.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086Test.java
Tue Dec 9 11:11:00 2008
@@ -29,6 +29,11 @@
extends AbstractMavenIntegrationTestCase
{
+ public MavenIT0086Test()
+ {
+ super( "(2.0.2,)" );
+ }
+
/**
* Verify that a plugin dependency class/resource can be loaded from both
the plugin classloader and the
* context classloader available to the plugin.
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087Test.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087Test.java
Tue Dec 9 11:11:00 2008
@@ -29,6 +29,11 @@
extends AbstractMavenIntegrationTestCase
{
+ public MavenIT0087Test()
+ {
+ super( "(2.0.2,)" );
+ }
+
/**
* Verify that a project-level plugin dependency class/resource can be
loaded from both the plugin classloader
* and the context classloader available to the plugin.
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java
Tue Dec 9 11:11:00 2008
@@ -31,7 +31,7 @@
{
public MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest() {
- super( "[,2.99.99)" );//extension support removed from 3.0
+ super( "(2.0.1,2.99.99)" );//extension support removed from 3.0
}
public void testit0115()
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0129ResourceProvidedToAPluginAsAPluginDependencyTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0129ResourceProvidedToAPluginAsAPluginDependencyTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0129ResourceProvidedToAPluginAsAPluginDependencyTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0129ResourceProvidedToAPluginAsAPluginDependencyTest.java
Tue Dec 9 11:11:00 2008
@@ -29,6 +29,12 @@
public class MavenIT0129ResourceProvidedToAPluginAsAPluginDependencyTest
extends AbstractMavenIntegrationTestCase
{
+
+ public MavenIT0129ResourceProvidedToAPluginAsAPluginDependencyTest()
+ {
+ super( "(2.0.3,)" );
+ }
+
public void testit0129()
throws Exception
{
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
Tue Dec 9 11:11:00 2008
@@ -50,7 +50,10 @@
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "deploy" );
- verifier.assertFilePresent( "target/site-attach-descriptor.txt" );
+ if ( matchesVersionRange( "(2.0.1,)" ) )
+ {
+ verifier.assertFilePresent( "target/site-attach-descriptor.txt" );
+ }
verifier.assertFilePresent( "target/install-install.txt" );
verifier.assertFilePresent( "target/deploy-deploy.txt" );
verifier.verifyErrorFreeLog();
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java
Tue Dec 9 11:11:00 2008
@@ -38,6 +38,7 @@
public MavenIT0144LifecycleExecutionOrderTest()
{
+ super( "(2.0.4,)" );
}
/**
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
Tue Dec 9 11:11:00 2008
@@ -50,6 +50,8 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-0377" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
List cliOptions = new ArrayList();
cliOptions.add( "--settings settings.xml" );
verifier.setCliOptions( cliOptions );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java
Tue Dec 9 11:11:00 2008
@@ -35,6 +35,11 @@
extends AbstractMavenIntegrationTestCase
{
+ public MavenITmng1703PluginMgmtDepInheritanceTest()
+ {
+ super( "(2.0.2,)" );
+ }
+
/**
* Verify that a project-level plugin dependency class/resource inherited
from the parent can be loaded from both the plugin classloader
* and the context classloader available to the plugin.
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java
Tue Dec 9 11:11:00 2008
@@ -33,6 +33,11 @@
extends AbstractMavenIntegrationTestCase
{
+ public MavenITmng2054PluginExecutionInheritanceTest()
+ {
+ super( "(2.0.3,)" );
+ }
+
/**
* Test that plugin executions from >1 step of inheritance don't run
multiple times.
*/
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=724837&r1=724836&r2=724837&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
Tue Dec 9 11:11:00 2008
@@ -29,6 +29,11 @@
extends AbstractMavenIntegrationTestCase
{
+ public MavenITmng2196ParentResolutionTest()
+ {
+ super( "(,2.0.2)(2.0.2,)" );
+ }
+
/**
* Verify that multimodule builds where one project references another as
* a parent can build, even if that parent is not correctly referenced by
@@ -52,6 +57,7 @@
try
{
verifier.executeGoal( "package" );
+ verifier.verifyErrorFreeLog();
}
catch ( VerificationException e )
{
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
Tue Dec 9 11:11:00 2008
@@ -34,6 +34,11 @@
extends AbstractMavenIntegrationTestCase
{
+ public MavenITmng2201PluginConfigInterpolationTest()
+ {
+ super( "(2.0.8,)" );
+ }
+
/**
* Verify that plugin configurations are correctly interpolated
*/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java
Tue Dec 9 11:11:00 2008
@@ -35,6 +35,11 @@
extends AbstractMavenIntegrationTestCase
{
+ public MavenITmng2228ComponentInjectionTest()
+ {
+ super( "(2.0.4,)" );
+ }
+
/**
* Verify that components injected into plugins are actually
assignment-compatible with the corresponding mojo
* fields in case the field type is both provided by a plugin dependency
and by a build extension.
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java
Tue Dec 9 11:11:00 2008
@@ -35,6 +35,11 @@
extends AbstractMavenIntegrationTestCase
{
+ public MavenITmng2293CustomPluginParamImplTest()
+ {
+ super( "(2.0.4,)" );
+ }
+
/**
* Verify that default implementation of an implementation for a complex
object works as
* expected [MNG-2293]
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
Tue Dec 9 11:11:00 2008
@@ -33,6 +33,11 @@
extends AbstractMavenIntegrationTestCase
{
+ public MavenITmng2318LocalParentResolutionTest()
+ {
+ super( "(2.0.6,)" );
+ }
+
/**
* When a project has modules and its parent is not preinstalled [MNG-2318]
*/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java
Tue Dec 9 11:11:00 2008
@@ -29,6 +29,12 @@
public class MavenITmng2539PluginDependenciesComeFromPluginReposTest
extends AbstractMavenIntegrationTestCase
{
+
+ public MavenITmng2539PluginDependenciesComeFromPluginReposTest()
+ {
+ super( "(2.0.4,)" );
+ }
+
public void testitMNG2539()
throws Exception
{
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
Tue Dec 9 11:11:00 2008
@@ -35,6 +35,11 @@
extends AbstractMavenIntegrationTestCase
{
+ public MavenITmng2591MergeInheritedPluginConfigTest()
+ {
+ super( "(2.0.7,)" );
+ }
+
/**
* Test aggregation of list configuration items for build plugins when
using
* 'combine.children=append' attribute.
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=724837&r1=724836&r2=724837&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
Tue Dec 9 11:11:00 2008
@@ -37,7 +37,7 @@
public MavenITmng2749ExtensionAvailableToPluginTest()
{
- super( "[,2.99.99)" );
+ super( "(2.0.2,2.99)" );
}
/**
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java
Tue Dec 9 11:11:00 2008
@@ -37,6 +37,7 @@
public MavenITmng2843PluginConfigPropertiesInjectionTest()
{
+ super( "(2.0.5,)" );
}
/**
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java
Tue Dec 9 11:11:00 2008
@@ -35,6 +35,11 @@
extends AbstractMavenIntegrationTestCase
{
+ public MavenITmng2892HideCorePlexusUtilsTest()
+ {
+ super( "(2.0.8,)" );
+ }
+
/**
* Verify that plugins can use their own version of plexus-utils and are
not bound to the version bundled in the
* core.
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
Tue Dec 9 11:11:00 2008
@@ -34,6 +34,12 @@
public class MavenITmng2926PluginPrefixOrderTest
extends AbstractMavenIntegrationTestCase
{
+
+ public MavenITmng2926PluginPrefixOrderTest()
+ {
+ super( "(2.0.6,)" );
+ }
+
public void testitMNG2926()
throws Exception
{
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
Tue Dec 9 11:11:00 2008
@@ -46,6 +46,11 @@
extends TestCase
{
+ public MavenITmng3372DirectInvocationOfPluginsTest()
+ {
+ super( "(2.0.5,)" );
+ }
+
public void testitMNG3372()
throws Exception
{
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java
Tue Dec 9 11:11:00 2008
@@ -30,7 +30,7 @@
public MavenITmng3581PluginUsesWagonDependencyTest()
{
// Not 2.0.9
- super( "(,2.0.9),(2.0.9,)" );
+ super( "(2.0.4,2.0.9),(2.0.9,)" );
}
/**
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java
Tue Dec 9 11:11:00 2008
@@ -35,6 +35,11 @@
extends AbstractMavenIntegrationTestCase
{
+ public MavenITmng3796ClassImportInconsistencyTest()
+ {
+ super( "(2.0.2,)" );
+ }
+
/**
* Verify that classes shared with the Maven core realm are properly
imported into the plugin realm.
*/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java
Tue Dec 9 11:11:00 2008
@@ -35,6 +35,11 @@
extends AbstractMavenIntegrationTestCase
{
+ public MavenITmng3813PluginClassPathOrderingTest()
+ {
+ super( "(2.0.8,)" );
+ }
+
/**
* Verify that the ordering of the plugin class path matches the ordering
of the dependencies as given in the POM.
*/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java
Tue Dec 9 11:11:00 2008
@@ -35,6 +35,11 @@
extends AbstractMavenIntegrationTestCase
{
+ public MavenITmng3819PluginDepPlexusUtilsTest()
+ {
+ super( "(2.0.1,)" );
+ }
+
/**
* Verify that plexus-utils:1.1 is present on plugin class path if
plexus-utils is not explicitly declared in
* plugin POM for backward-compat with Maven 2.0.5- (due to MNG-2892,
plexus-utils is no longer part of the core
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
Tue Dec 9 11:11:00 2008
@@ -23,8 +23,10 @@
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
+import java.util.Collection;
import java.util.Iterator;
import java.util.Properties;
+import java.util.TreeSet;
/**
* This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-3843";>MNG-3843</a>.
@@ -139,7 +141,10 @@
assertEquals( "http://parent.url/snaps";, props.getProperty(
"project.distributionManagement.snapshotRepository.url" ) );
assertUrlCommon( "http://parent.url/site";, props.getProperty(
"project.distributionManagement.site.url" ) );
assertUrlCommon( "http://parent.url/download";, props.getProperty(
"project.distributionManagement.downloadUrl" ) );
- assertMissing( props, "project.distributionManagement.relocation." );
+ if ( matchesVersionRange( "(2.0.2,)" ) )
+ {
+ assertMissing( props, "project.distributionManagement.relocation."
);
+ }
assertMissing( props, "project.profiles." );
assertEquals( "child-1-0.1", props.getProperty(
"project.build.finalName" ) );
assertPathEquals( basedir, "src/main", props.getProperty(
"project.build.sourceDirectory" ) );
@@ -214,15 +219,30 @@
assertPathEquals( basedir, "docs", props.getProperty(
"project.reporting.outputDirectory" ) );
assertEquals( "false", props.getProperty(
"project.reporting.excludeDefaults" ) );
assertTrue( Integer.parseInt( props.getProperty(
"project.repositories" ) ) > 1 );
- assertEquals( "1", props.getProperty( "project.build.plugins" ) );
+ if ( matchesVersionRange( "(2.0.4,)" ) )
+ {
+ assertEquals( "1", props.getProperty( "project.build.plugins" ) );
+ }
assertEquals( "4", props.getProperty( "project.dependencies" ) );
- assertEquals( "parent-dep-b", props.getProperty(
"project.dependencies.0.artifactId" ) );
- assertEquals( "child-dep-b", props.getProperty(
"project.dependencies.1.artifactId" ) );
- assertEquals( "child-dep-c", props.getProperty(
"project.dependencies.2.artifactId" ) );
- assertEquals( "child-dep-d", props.getProperty(
"project.dependencies.3.artifactId" ) );
+ Collection actualDeps = new TreeSet();
+ actualDeps.add( props.getProperty( "project.dependencies.0.artifactId"
) );
+ actualDeps.add( props.getProperty( "project.dependencies.1.artifactId"
) );
+ actualDeps.add( props.getProperty( "project.dependencies.2.artifactId"
) );
+ actualDeps.add( props.getProperty( "project.dependencies.3.artifactId"
) );
+ Collection expectedDeps = new TreeSet();
+ expectedDeps.add( "parent-dep-b" );
+ expectedDeps.add( "child-dep-b" );
+ expectedDeps.add( "child-dep-c" );
+ expectedDeps.add( "child-dep-d" );
+ assertEquals( expectedDeps, actualDeps );
assertEquals( "2", props.getProperty(
"project.dependencyManagement.dependencies" ) );
- assertEquals( "parent-dep-a", props.getProperty(
"project.dependencyManagement.dependencies.0.artifactId" ) );
- assertEquals( "child-dep-a", props.getProperty(
"project.dependencyManagement.dependencies.1.artifactId" ) );
+ Collection actualMngtDeps = new TreeSet();
+ actualMngtDeps.add( props.getProperty(
"project.dependencyManagement.dependencies.0.artifactId" ) );
+ actualMngtDeps.add( props.getProperty(
"project.dependencyManagement.dependencies.1.artifactId" ) );
+ Collection expectedMngtDeps = new TreeSet();
+ expectedMngtDeps.add( "parent-dep-a" );
+ expectedMngtDeps.add( "child-dep-a" );
+ assertEquals( expectedMngtDeps, actualMngtDeps );
basedir = new File( verifier.getBasedir(), "test-3/sub-parent/child-a"
);
props = verifier.loadProperties(
"test-3/sub-parent/child-a/target/pom.properties" );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0081/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0081/pom.xml?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0081/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0081/pom.xml
Tue Dec 9 11:11:00 2008
@@ -44,6 +44,18 @@
</snapshots>
</repository>
</repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
<build>
<plugins>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/pom.xml?rev=724837&r1=724836&r2=724837&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/pom.xml
Tue Dec 9 11:11:00 2008
@@ -44,7 +44,19 @@
</snapshots>
</repository>
</repositories>
-
+ <pluginRepositories>
+ <pluginRepository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
<build>
<plugins>
<plugin>
