From 9d5fe284c688c75f3a1acad401f180c29086c9f1 Mon Sep 17 00:00:00 2001
From: Herve Boutemy <hboutemy@apache.org>
Date: Fri, 2 Sep 2011 20:16:28 +0000
Subject: [PATCH] o updated maven-reporting-impl version to match Doxia update
 o removed configuration already inherited from parent o simplified poms

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1164686 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-plugin-plugin/pom.xml          |  1 -
 maven-plugin-tools-ant/pom.xml       |  6 ------
 maven-plugin-tools-api/pom.xml       | 30 +++++++---------------------
 maven-plugin-tools-beanshell/pom.xml |  6 ------
 maven-plugin-tools-java/pom.xml      |  8 --------
 maven-plugin-tools-javadoc/pom.xml   |  7 -------
 maven-plugin-tools-model/pom.xml     |  7 -------
 pom.xml                              | 30 ++++++++++++++--------------
 src/site/site.xml                    |  2 --
 9 files changed, 22 insertions(+), 75 deletions(-)

diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index 297226b..e91055b 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -151,7 +151,6 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-descriptor</artifactId>
-      <version>${mavenVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
diff --git a/maven-plugin-tools-ant/pom.xml b/maven-plugin-tools-ant/pom.xml
index dc9c794..ac1ef38 100644
--- a/maven-plugin-tools-ant/pom.xml
+++ b/maven-plugin-tools-ant/pom.xml
@@ -33,12 +33,6 @@
   <name>Maven Plugin Tool for Ant</name>
   <description>Descriptor extractor for plugins written in Ant.</description>
 
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-ant/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-ant/</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-ant/</url>
-  </scm>
-
   <dependencies>
     <!-- maven -->
     <dependency>
diff --git a/maven-plugin-tools-api/pom.xml b/maven-plugin-tools-api/pom.xml
index 81841e9..62e9700 100644
--- a/maven-plugin-tools-api/pom.xml
+++ b/maven-plugin-tools-api/pom.xml
@@ -33,44 +33,35 @@
   <name>Maven Plugin Tools APIs</name>
   <description>The Maven Plugin Tools API provides an API to extract information from and generate documentation for Maven Plugins.</description>
 
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-api/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-api/</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/</url>
-  </scm>
-
   <dependencies>
     <!-- maven -->
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
-      <version>2.0.6</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
-      <version>2.0.6</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.0.6</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.reporting</groupId>
-      <artifactId>maven-reporting-api</artifactId>
-      <version>2.0.6</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>2.0.6</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-descriptor</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.maven.reporting</groupId>
+      <artifactId>maven-reporting-api</artifactId>
+      <version>3.0</version>
+    </dependency>
+
     <!-- plexus -->
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -92,15 +83,8 @@
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-impl</artifactId>
-      <version>2.0.4.1</version>
+      <version>2.1</version>
       <scope>test</scope>
-      <exclusions>
-        <!-- Using org.codehaus.plexus:plexus-utils instead of -->
-        <exclusion>
-          <groupId>plexus</groupId>
-          <artifactId>plexus-utils</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>
diff --git a/maven-plugin-tools-beanshell/pom.xml b/maven-plugin-tools-beanshell/pom.xml
index 824e6bd..27e3e0e 100644
--- a/maven-plugin-tools-beanshell/pom.xml
+++ b/maven-plugin-tools-beanshell/pom.xml
@@ -33,12 +33,6 @@
   <name>Maven Plugin Tool for Beanshell</name>
   <description>Descriptor extractor for plugins written in Beanshell.</description>
 
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/</url>
-  </scm>
-
   <dependencies>
     <!-- maven -->
     <dependency>
diff --git a/maven-plugin-tools-java/pom.xml b/maven-plugin-tools-java/pom.xml
index c5decd5..d9fbbd7 100644
--- a/maven-plugin-tools-java/pom.xml
+++ b/maven-plugin-tools-java/pom.xml
@@ -33,23 +33,15 @@
   <name>Maven Plugin Tool for Java</name>
   <description>Descriptor extractor for plugins written in Java.</description>
 
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-java/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-java/</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/</url>
-  </scm>
-
   <dependencies>
     <!-- maven -->
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
-      <version>2.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
-      <version>2.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
diff --git a/maven-plugin-tools-javadoc/pom.xml b/maven-plugin-tools-javadoc/pom.xml
index e05caa5..5609dca 100644
--- a/maven-plugin-tools-javadoc/pom.xml
+++ b/maven-plugin-tools-javadoc/pom.xml
@@ -34,12 +34,6 @@
   <description>The Maven Plugin Tools Javadoc provides several Javadoc taglets to be used when generating Javadoc.</description>
   <inceptionYear>2008</inceptionYear>
 
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/</url>
-  </scm>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
@@ -72,7 +66,6 @@
         <plugins>
           <plugin>
             <artifactId>maven-invoker-plugin</artifactId>
-            <version>1.5</version>
             <configuration>
               <debug>true</debug>
               <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
diff --git a/maven-plugin-tools-model/pom.xml b/maven-plugin-tools-model/pom.xml
index 92ea27c..e42e38e 100644
--- a/maven-plugin-tools-model/pom.xml
+++ b/maven-plugin-tools-model/pom.xml
@@ -33,12 +33,6 @@
   <name>Maven Plugin Metadata Model</name>
   <description>The Maven Plugin Metadata Model provides an API to play with the Metadata model.</description>
 
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-model/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-model/</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-model/</url>
-  </scm>
-
   <dependencies>
     <!-- maven -->
     <dependency>
@@ -67,7 +61,6 @@
             <model>src/main/mdo/plugin-metadata.mdo</model>
           </models>
           <version>1.0.0</version>
-          <useJava5>true</useJava5>
         </configuration>
         <executions>
           <execution>
diff --git a/pom.xml b/pom.xml
index a0dc378..e8b35e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,6 +182,11 @@
         <artifactId>maven-plugin-tools-beanshell</artifactId>
         <version>${pluginToolsVersion}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-model</artifactId>
+        <version>2.0.6</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-project</artifactId>
@@ -192,6 +197,16 @@
         <artifactId>maven-plugin-descriptor</artifactId>
         <version>2.0.6</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-plugin-api</artifactId>
+        <version>2.0.6</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-artifact</artifactId>
+        <version>2.0.6</version>
+      </dependency>
 
       <!-- plexus -->
       <dependency>
@@ -226,23 +241,8 @@
   <build>
     <pluginManagement>
       <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.3.2</version>
-          <configuration>
-            <source>1.5</source>
-            <target>1.5</target>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.8.1</version>
-        </plugin>
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.0</version>
           <configuration>
             <stagingSiteURL>scp://people.apache.org/www/maven.apache.org/plugin-tools-${project.version}</stagingSiteURL>
           </configuration>
diff --git a/src/site/site.xml b/src/site/site.xml
index 4a49f3f..b60ca0d 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -22,8 +22,6 @@ under the License.
 <project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
   <body>
     <breadcrumbs>
-      <!-- TODO: This breadcrumb should be removed when it has been solved in the parent -->
-      <item name="Maven" href="http://maven.apache.org/index.html" />
       <item name="Plugin Tools" href="http://maven.apache.org/plugin-tools/index.html" />
     </breadcrumbs>