Author: jvanzyl
Date: Sun Apr 26 17:57:04 2009
New Revision: 768733
URL: http://svn.apache.org/viewvc?rev=768733&view=rev
Log:
o resetting plexus version, will turn them into integration tests now
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml
maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml
maven/components/branches/MNG-2766/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java?rev=768733&r1=768732&r2=768733&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
Sun Apr 26 17:57:04 2009
@@ -13,6 +13,8 @@
@Requirement
private PluginManager pluginManager;
+ private String plexusVersion = "1.0-beta-3.0.7-SNAPSHOT";
+
protected void setUp()
throws Exception
{
@@ -32,7 +34,7 @@
Plugin plugin = new Plugin();
plugin.setGroupId( "org.codehaus.plexus" );
plugin.setArtifactId( "plexus-component-metadata" );
- plugin.setVersion( "1.0-beta-3.0.6" );
+ plugin.setVersion( plexusVersion );
PluginDescriptor pluginDescriptor = pluginManager.loadPlugin( plugin,
session.getCurrentProject(), session );
assertNotNull( pluginDescriptor );
assertNotNull( pluginDescriptor.getClassRealm() );
@@ -46,7 +48,7 @@
Plugin plugin = new Plugin();
plugin.setGroupId( "org.codehaus.plexus" );
plugin.setArtifactId( "plexus-component-metadata" );
- plugin.setVersion( "1.0-beta-3.0.6" );
+ plugin.setVersion( plexusVersion );
MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor(
plugin, goal, session );
assertNotNull( mojoDescriptor );
@@ -58,7 +60,7 @@
assertNotNull( pluginDescriptor );
assertEquals( "org.codehaus.plexus", pluginDescriptor.getGroupId() );
assertEquals( "plexus-component-metadata",
pluginDescriptor.getArtifactId() );
- assertEquals( "1.0-beta-3.0.6", pluginDescriptor.getVersion() );
+ assertEquals( plexusVersion, pluginDescriptor.getVersion() );
assertNotNull( pluginDescriptor.getClassRealm() );
}
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml?rev=768733&r1=768732&r2=768733&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml
Sun Apr 26 17:57:04 2009
@@ -20,7 +20,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
- <version>1.0-beta-3.0.6</version>
+ <version>1.0-beta-3.0.7-SNAPSHOT</version>
<executions>
<execution>
<goals>
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml?rev=768733&r1=768732&r2=768733&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml
Sun Apr 26 17:57:04 2009
@@ -54,7 +54,7 @@
<doxiaVersion>1.0-alpha-9</doxiaVersion>
<easyMockVersion>1.2_Java1.3</easyMockVersion>
<junitVersion>3.8.1</junitVersion>
- <plexusVersion>1.0-beta-3.0.6</plexusVersion>
+ <plexusVersion>1.0-beta-3.0.7-SNAPSHOT</plexusVersion>
<plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
<plexusInterpolationVersion>1.1</plexusInterpolationVersion>
<plexusPluginManagerVersion>1.0-alpha-1</plexusPluginManagerVersion>
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml?rev=768733&r1=768732&r2=768733&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
Sun Apr 26 17:57:04 2009
@@ -54,7 +54,7 @@
<doxiaVersion>1.0-alpha-9</doxiaVersion>
<easyMockVersion>1.2_Java1.3</easyMockVersion>
<junitVersion>3.8.1</junitVersion>
- <plexusVersion>1.0-beta-3.0.6</plexusVersion>
+ <plexusVersion>1.0-beta-3.0.7-SNAPSHOT</plexusVersion>
<plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
<plexusInterpolationVersion>1.1</plexusInterpolationVersion>
<plexusPluginManagerVersion>1.0-alpha-1</plexusPluginManagerVersion>
