From 9adfa004ec4d207394597ab12815b404359de708 Mon Sep 17 00:00:00 2001
From: Benson Margulies <bimargulies@apache.org>
Date: Fri, 2 Sep 2011 16:53:58 +0000
Subject: [PATCH] First I made some pointless POM changes, and then the release
 plugin didn't quite put things back the way it found them at the end of
 prepare. Put everything back into line for the next round.

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1164629 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-plugin-plugin/pom.xml | 9 +++++----
 pom.xml                     | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index 84a83c7..7d5c1f6 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -61,6 +61,7 @@
 
   <properties>
     <mavenVersion>2.0.6</mavenVersion>
+    <pluginToolsVersion>2.10-SNAPSHOT</pluginToolsVersion>
     <doxiaVersion>1.2</doxiaVersion>
     <doxia-sitetoolsVersion>1.2</doxia-sitetoolsVersion>
   </properties>
@@ -72,22 +73,22 @@
       <dependency>
         <groupId>org.apache.maven.plugin-tools</groupId>
         <artifactId>maven-plugin-tools-api</artifactId>
-        <version>${project.version}</version>
+        <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.plugin-tools</groupId>
         <artifactId>maven-plugin-tools-model</artifactId>
-        <version>${project.version}</version>
+        <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.plugin-tools</groupId>
         <artifactId>maven-plugin-tools-java</artifactId>
-        <version>${project.version}</version>
+        <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.plugin-tools</groupId>
         <artifactId>maven-plugin-tools-beanshell</artifactId>
-        <version>${project.version}</version>
+        <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
diff --git a/pom.xml b/pom.xml
index 727961c..a0dc378 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>maven-parent</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>19</version>
+    <version>21</version>
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
 
@@ -155,7 +155,7 @@
   </distributionManagement>
 
   <properties>
-    <pluginToolsVersion>2.9</pluginToolsVersion>
+    <pluginToolsVersion>2.10-SNAPSHOT</pluginToolsVersion>
     <pluginTestingHarnessVersion>1.2</pluginTestingHarnessVersion>
   </properties>
 
@@ -242,7 +242,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
-          <version>2.2</version>
+          <version>3.0</version>
           <configuration>
             <stagingSiteURL>scp://people.apache.org/www/maven.apache.org/plugin-tools-${project.version}</stagingSiteURL>
           </configuration>