From 006b3cf25b536f909a454246c792a6cc0e55bb55 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Sun, 26 Apr 2009 17:57:04 +0000 Subject: [PATCH] o resetting plexus version, will turn them into integration tests now git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@768733 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/maven/plugin/PluginManagerTest.java | 8 +++++--- .../project-with-additional-lifecycle-elements/pom.xml | 2 +- .../lifecycle-executor/project-with-inheritance/pom.xml | 2 +- .../src/test/resources/org/apache/maven/lifecycle/pom.xml | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java index 4a2cc56710..d86535a814 100644 --- a/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java +++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java @@ -13,6 +13,8 @@ public class PluginManagerTest @Requirement private PluginManager pluginManager; + private String plexusVersion = "1.0-beta-3.0.7-SNAPSHOT"; + protected void setUp() throws Exception { @@ -32,7 +34,7 @@ public class PluginManagerTest 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 @@ public class PluginManagerTest 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 @@ public class PluginManagerTest 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() ); } diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml index a4e08a9ad9..5c59ed5f91 100644 --- a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml +++ b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml @@ -20,7 +20,7 @@ org.codehaus.plexus plexus-component-metadata - 1.0-beta-3.0.6 + 1.0-beta-3.0.7-SNAPSHOT diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml b/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml index 7c06c9e55d..a01b7cedbd 100644 --- a/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml +++ b/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml @@ -54,7 +54,7 @@ under the License. 1.0-alpha-9 1.2_Java1.3 3.8.1 - 1.0-beta-3.0.6 + 1.0-beta-3.0.7-SNAPSHOT 1.0-alpha-6 1.1 1.0-alpha-1 diff --git a/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml b/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml index 7c06c9e55d..a01b7cedbd 100644 --- a/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml +++ b/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml @@ -54,7 +54,7 @@ under the License. 1.0-alpha-9 1.2_Java1.3 3.8.1 - 1.0-beta-3.0.6 + 1.0-beta-3.0.7-SNAPSHOT 1.0-alpha-6 1.1 1.0-alpha-1