From 1b4cf03ceafe208fb2fd7b5fb57fd0a1a53ae4ae Mon Sep 17 00:00:00 2001
From: Benson Margulies <bimargulies@apache.org>
Date: Fri, 2 Sep 2011 16:11:05 +0000
Subject: [PATCH] pre-release cleanup, site plugin 3.0, etc.

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

diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index 23e8deb..2afcf62 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -296,7 +296,7 @@
               <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
               <settingsFile>src/it/settings.xml</settingsFile>
               <filterProperties>
-                <sitePluginVersion>2.0.1</sitePluginVersion>
+                <sitePluginVersion>3.0</sitePluginVersion>
               </filterProperties>
               <goals>
                 <goal>verify</goal>
@@ -315,26 +315,5 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>maven-3</id>
-      <activation>
-        <file>
-          <!-- This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
-          <exists>${basedir}</exists>
-        </file>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-invoker-plugin</artifactId>
-            <configuration>
-              <filterProperties>
-                <sitePluginVersion>3.0-beta-3</sitePluginVersion>
-              </filterProperties>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 </project>
diff --git a/maven-plugin-plugin/src/it/plugin-report/pom.xml b/maven-plugin-plugin/src/it/plugin-report/pom.xml
index ec1d1b8..f8f2f29 100644
--- a/maven-plugin-plugin/src/it/plugin-report/pom.xml
+++ b/maven-plugin-plugin/src/it/plugin-report/pom.xml
@@ -22,6 +22,12 @@ under the License.
 <project>
   <modelVersion>4.0.0</modelVersion>
 
+  <parent>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven-parent</artifactId>
+    <version>21</version>
+  </parent>
+
   <groupId>org.apache.maven.its</groupId>
   <artifactId>plugin-report</artifactId>
   <version>1.0</version>
@@ -74,7 +80,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.0.1</version>
+        <version>2.4</version>
         <reportSets>
           <reportSet>
             <reports>