You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/08/28 18:23:36 UTC
svn commit: r1162550 - /maven/doxia/doxia-tools/trunk/pom.xml
Author: hboutemy
Date: Sun Aug 28 16:23:35 2011
New Revision: 1162550
URL: http://svn.apache.org/viewvc?rev=1162550&view=rev
Log:
updated parent pom to maven-parent:21
Modified:
maven/doxia/doxia-tools/trunk/pom.xml
Modified: maven/doxia/doxia-tools/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/pom.xml?rev=1162550&r1=1162549&r2=1162550&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/pom.xml (original)
+++ maven/doxia/doxia-tools/trunk/pom.xml Sun Aug 28 16:23:35 2011
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>19</version>
+ <version>21</version>
<relativePath>../../pom/maven/pom.xml</relativePath>
</parent>
@@ -211,11 +211,6 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<tagBase>https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/tags</tagBase>
@@ -228,32 +223,7 @@ under the License.
<version>1.3.5</version>
</plugin>
<plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <version>1.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <links>
- <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
- <link>http://junit.sourceforge.net/javadoc/</link>
- <link>http://hc.apache.org/httpclient-3.x/apidocs/</link>
- </links>
- <tagletArtifacts>
- <tagletArtifact>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-javadoc</artifactId>
- <version>1.0</version>
- </tagletArtifact>
- </tagletArtifacts>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>2.2</version>
<configuration>
<stagingSiteURL>scp://people.apache.org/www/maven.apache.org/doxia/doxia-tools-${project.version}</stagingSiteURL>
</configuration>
@@ -275,44 +245,50 @@ under the License.
</plugins>
</build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <links>
- <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
- <link>http://junit.sourceforge.net/javadoc/</link>
- <link>http://hc.apache.org/httpclient-3.x/apidocs/</link>
- </links>
- <tagletArtifacts>
- <tagletArtifact>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-javadoc</artifactId>
- <version>1.0</version>
- </tagletArtifact>
- </tagletArtifacts>
- </configuration>
- <reportSets>
- <reportSet>
- <id>html</id>
- <reports>
- <report>aggregate</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
-
<profiles>
<profile>
<id>reporting</id>
<reporting>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.3</version>
+ <reportSets>
+ <reportSet>
+ <id>non-aggregate</id>
+ <reports>
+ <report>jxr</report>
+ </reports>
+ </reportSet>
+ <reportSet>
+ <id>aggregate</id>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ <reportSets>
+ <reportSet>
+ <id>non-aggregate</id>
+ <reports>
+ <report>javadoc</report>
+ </reports>
+ </reportSet>
+ <reportSet>
+ <id>aggregate</id>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.4</version>