From 7a86077fff10846717bbd8db02d8696549d8ceea Mon Sep 17 00:00:00 2001
From: Vincent Siveton <vsiveton@apache.org>
Date: Thu, 28 Feb 2008 13:16:59 +0000
Subject: [PATCH] o fixed r589478 like discussed in [1] o back to version
 2.2-SNAPSHOT for maven-plugin-tools-* and parent o back to version
 1.2-SNAPSHOT for maven-plugin-testing-harness o back to groupId
 org.apache.maven.shared for maven-plugin-testing-harness o specify version as
 property in parent

[1] http://www.nabble.com/-Discuss--Review-plugin-tools-groupId-and-version-td15601645s177.html

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@631957 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-plugin-plugin/pom.xml          | 10 +++++-----
 maven-plugin-testing-harness/pom.xml |  4 +++-
 maven-plugin-tools-ant/pom.xml       |  7 +++++--
 maven-plugin-tools-api/pom.xml       |  9 +++++++--
 maven-plugin-tools-beanshell/pom.xml |  7 +++++--
 maven-plugin-tools-java/pom.xml      |  7 +++++--
 maven-plugin-tools-model/pom.xml     |  8 ++++++--
 pom.xml                              | 14 +++++++++-----
 8 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index 515a658..66afd0f 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -148,22 +148,22 @@
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-tools-api</artifactId>
-        <version>${project.version}</version>
+        <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-tools-model</artifactId>
-        <version>${project.version}</version>
+        <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-tools-java</artifactId>
-        <version>${project.version}</version>
+        <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-tools-beanshell</artifactId>
-        <version>${project.version}</version>
+        <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
@@ -227,13 +227,13 @@
           <model>src/main/mdo/pluginRequirements.mdo</model>
         </configuration>
       </plugin>
-
     </plugins>
   </build>
 
   <properties>
     <doxiaVersion>1.0-alpha-10</doxiaVersion>
     <doxia-sitetoolsVersion>1.0-alpha-10</doxia-sitetoolsVersion>
+    <pluginToolsVersion>2.2-SNAPSHOT</pluginToolsVersion>
   </properties>
 
   <distributionManagement>
diff --git a/maven-plugin-testing-harness/pom.xml b/maven-plugin-testing-harness/pom.xml
index c7dc1c4..22f46c6 100644
--- a/maven-plugin-testing-harness/pom.xml
+++ b/maven-plugin-testing-harness/pom.xml
@@ -23,10 +23,12 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-plugin-tools</artifactId>
-    <version>2.4-SNAPSHOT</version>
+    <version>2.2-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.maven.shared</groupId>
   <artifactId>maven-plugin-testing-harness</artifactId>
+  <version>1.2-SNAPSHOT</version>
   <name>Maven Plugin Testing Mechanism</name>
   <description>The Maven Plugin Testing Harness provides mechanisms to manage tests on Mojo.</description>
 
diff --git a/maven-plugin-tools-ant/pom.xml b/maven-plugin-tools-ant/pom.xml
index b49e242..7955854 100755
--- a/maven-plugin-tools-ant/pom.xml
+++ b/maven-plugin-tools-ant/pom.xml
@@ -23,9 +23,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <artifactId>maven-plugin-tools</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>2.4-SNAPSHOT</version>
+    <artifactId>maven-plugin-tools</artifactId>
+    <version>2.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-tools-ant</artifactId>
@@ -33,6 +33,7 @@
   <description>Descriptor extractor for plugins written in Ant.</description>
 
   <dependencies>
+    <!-- maven -->
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-tools-api</artifactId>
@@ -45,6 +46,8 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-tools-model</artifactId>
     </dependency>
+
+    <!-- plexus -->
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
diff --git a/maven-plugin-tools-api/pom.xml b/maven-plugin-tools-api/pom.xml
index 945b995..fe5bf51 100644
--- a/maven-plugin-tools-api/pom.xml
+++ b/maven-plugin-tools-api/pom.xml
@@ -23,9 +23,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <artifactId>maven-plugin-tools</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>2.4-SNAPSHOT</version>
+    <artifactId>maven-plugin-tools</artifactId>
+    <version>2.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-tools-api</artifactId>
@@ -33,6 +33,7 @@
   <description>The Maven Plugin Tools API provides an API to extract information from and generate documentation for Maven 2 Plugins.</description>
 
   <dependencies>
+    <!-- maven -->
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
@@ -47,10 +48,14 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-descriptor</artifactId>
     </dependency>
+
+    <!-- plexus -->
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
+
+    <!-- misc -->
     <dependency>
       <groupId>jtidy</groupId>
       <artifactId>jtidy</artifactId>
diff --git a/maven-plugin-tools-beanshell/pom.xml b/maven-plugin-tools-beanshell/pom.xml
index 04bd844..faf7a2b 100644
--- a/maven-plugin-tools-beanshell/pom.xml
+++ b/maven-plugin-tools-beanshell/pom.xml
@@ -23,9 +23,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <artifactId>maven-plugin-tools</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>2.4-SNAPSHOT</version>
+    <artifactId>maven-plugin-tools</artifactId>
+    <version>2.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-tools-beanshell</artifactId>
@@ -33,6 +33,7 @@
   <description>Descriptor extractor for plugins written in Beanshell.</description>
 
   <dependencies>
+    <!-- maven -->
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-tools-api</artifactId>
@@ -41,6 +42,8 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-descriptor</artifactId>
     </dependency>
+
+    <!-- misc -->
     <dependency>
       <groupId>bsh</groupId>
       <artifactId>bsh</artifactId>
diff --git a/maven-plugin-tools-java/pom.xml b/maven-plugin-tools-java/pom.xml
index 70638a7..73ab1f0 100644
--- a/maven-plugin-tools-java/pom.xml
+++ b/maven-plugin-tools-java/pom.xml
@@ -23,9 +23,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <artifactId>maven-plugin-tools</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>2.4-SNAPSHOT</version>
+    <artifactId>maven-plugin-tools</artifactId>
+    <version>2.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-tools-java</artifactId>
@@ -33,6 +33,7 @@
   <description>Descriptor extractor for plugins written in Java.</description>
 
   <dependencies>
+    <!-- maven -->
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-tools-api</artifactId>
@@ -41,6 +42,8 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-descriptor</artifactId>
     </dependency>
+
+    <!-- misc -->
     <dependency>
       <groupId>qdox</groupId>
       <artifactId>qdox</artifactId>
diff --git a/maven-plugin-tools-model/pom.xml b/maven-plugin-tools-model/pom.xml
index 08281ac..86e7cbc 100755
--- a/maven-plugin-tools-model/pom.xml
+++ b/maven-plugin-tools-model/pom.xml
@@ -23,13 +23,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <artifactId>maven-plugin-tools</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>2.4-SNAPSHOT</version>
+    <artifactId>maven-plugin-tools</artifactId>
+    <version>2.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-tools-model</artifactId>
   <name>Maven Plugin Metadata Model</name>
+  <description>The Maven Plugin Metadata Model provides an API to play with the Metadat model.</description>
 
   <build>
     <plugins>
@@ -55,10 +56,13 @@
   </build>
 
   <dependencies>
+    <!-- maven -->
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-descriptor</artifactId>
     </dependency>
+
+    <!-- plexus -->
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index 2fe36cd..492000d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>org.apache.maven</groupId>
   <artifactId>maven-plugin-tools</artifactId>
-  <version>2.4-SNAPSHOT</version>
+  <version>2.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Maven Plugin Tools</name>
@@ -176,22 +176,22 @@
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-tools-api</artifactId>
-        <version>${project.version}</version>
+        <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-tools-model</artifactId>
-        <version>${project.version}</version>
+        <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-tools-java</artifactId>
-        <version>${project.version}</version>
+        <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-tools-beanshell</artifactId>
-        <version>${project.version}</version>
+        <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
@@ -212,4 +212,8 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
+
+  <properties>
+    <pluginToolsVersion>2.2-SNAPSHOT</pluginToolsVersion>
+  </properties>
 </project>