Author: hboutemy
Date: Fri Sep 2 20:16:28 2011
New Revision: 1164686
URL: http://svn.apache.org/viewvc?rev=1164686&view=rev
Log:
o updated maven-reporting-impl version to match Doxia update
o removed configuration already inherited from parent
o simplified poms
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-model/pom.xml
maven/plugin-tools/trunk/pom.xml
maven/plugin-tools/trunk/src/site/site.xml
Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml?rev=1164686&r1=1164685&r2=1164686&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml Fri Sep 2 20:16:28
2011
@@ -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>
Modified: maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml?rev=1164686&r1=1164685&r2=1164686&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml Fri Sep 2 20:16:28
2011
@@ -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>
Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml?rev=1164686&r1=1164685&r2=1164686&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml Fri Sep 2 20:16:28
2011
@@ -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>
Modified: maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml?rev=1164686&r1=1164685&r2=1164686&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml Fri Sep 2
20:16:28 2011
@@ -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>
Modified: maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml?rev=1164686&r1=1164685&r2=1164686&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml Fri Sep 2
20:16:28 2011
@@ -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>
Modified: maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml?rev=1164686&r1=1164685&r2=1164686&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml Fri Sep 2
20:16:28 2011
@@ -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>
Modified: maven/plugin-tools/trunk/maven-plugin-tools-model/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-model/pom.xml?rev=1164686&r1=1164685&r2=1164686&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-model/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-model/pom.xml Fri Sep 2
20:16:28 2011
@@ -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>
Modified: maven/plugin-tools/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/pom.xml?rev=1164686&r1=1164685&r2=1164686&view=diff
==============================================================================
--- maven/plugin-tools/trunk/pom.xml (original)
+++ maven/plugin-tools/trunk/pom.xml Fri Sep 2 20:16:28 2011
@@ -184,6 +184,11 @@
</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>
<version>2.0.6</version>
</dependency>
@@ -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>
@@ -227,22 +242,7 @@
<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>
Modified: maven/plugin-tools/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/src/site/site.xml?rev=1164686&r1=1164685&r2=1164686&view=diff
==============================================================================
--- maven/plugin-tools/trunk/src/site/site.xml (original)
+++ maven/plugin-tools/trunk/src/site/site.xml Fri Sep 2 20:16:28 2011
@@ -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>
