Author: hboutemy
Date: Sun Aug 28 16:13:11 2011
New Revision: 1162548
URL: http://svn.apache.org/viewvc?rev=1162548&view=rev
Log:
updated parent pom to maven-parent:21
Modified:
maven/doxia/doxia/trunk/pom.xml
Modified: maven/doxia/doxia/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?rev=1162548&r1=1162547&r2=1162548&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/pom.xml (original)
+++ maven/doxia/doxia/trunk/pom.xml Sun Aug 28 16:13:11 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>
@@ -328,19 +328,6 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</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/tags</tagBase>
@@ -353,13 +340,6 @@ under the License.
<version>1.3.5</version>
</plugin>
<plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <configuration>
- <useJava5>true</useJava5>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
<configuration>
@@ -367,25 +347,6 @@ under the License.
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <links>
- <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
- <link>http://plexus.codehaus.org/plexus-utils/apidocs/</link>
- <link>http://junit.sourceforge.net/javadoc/</link>
- </links>
- <tagletArtifacts>
- <tagletArtifact>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-javadoc</artifactId>
- <version>1.5.5</version>
- </tagletArtifact>
- </tagletArtifacts>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<stagingSiteURL>scp://people.apache.org/www/maven.apache.org/doxia/doxia-${project.version}</stagingSiteURL>
@@ -459,80 +420,38 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <links>
- <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
- <link>http://plexus.codehaus.org/plexus-utils/apidocs/</link>
- <link>http://junit.sourceforge.net/javadoc/</link>
- </links>
- <tagletArtifacts>
- <tagletArtifact>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-javadoc</artifactId>
- <version>1.5.5</version>
- </tagletArtifact>
- </tagletArtifacts>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- </profile>
- <profile>
- <id>reporting-aggregate</id>
- <!-- To generate aggregate reports -->
- <!-- To deploy both aggregate reports for top-level project and
standalone reports for modules, call
- mvn site -Preporting
- mvn site:deploy
- mvn site -Preporting-aggregate
- mvn -N site:deploy
- -->
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
+ <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>
- <configuration>
- <aggregate>true</aggregate>
- <source>1.5</source>
- <links>
- <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
- <link>http://plexus.codehaus.org/plexus-utils/apidocs/</link>
- <link>http://junit.sourceforge.net/javadoc/</link>
- </links>
- <tagletArtifacts>
- <tagletArtifact>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-javadoc</artifactId>
- <version>1.5.5</version>
- </tagletArtifact>
- </tagletArtifacts>
- </configuration>
+ <version>2.8</version>
<reportSets>
<reportSet>
+ <id>non-aggregate</id>
+ <reports>
+ <report>javadoc</report>
+ </reports>
+ </reportSet>
+ <reportSet>
+ <id>aggregate</id>
<reports>
<report>aggregate</report>
- <report>test-aggregate</report>
</reports>
</reportSet>
</reportSets>
@@ -540,37 +459,5 @@ under the License.
</plugins>
</reporting>
</profile>
- <profile>
- <id>m2e</id>
- <properties>
- <m2BuildDirectory>target</m2BuildDirectory>
- </properties>
- <activation>
- <property>
- <name>m2e.version</name>
- </property>
- </activation>
- <build>
- <directory>${m2BuildDirectory}</directory>
- <plugins>
- <plugin>
- <groupId>org.maven.ide.eclipse</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>0.10.0</version>
- <configuration>
- <mappingId>customizable</mappingId>
- <configurators>
- <configurator id="org.maven.ide.eclipse.jdt.javaConfigurator"
/>
- <configurator
id="org.maven.ide.eclipse.modello.modelloConfigurator" />
- <configurator
id="org.maven.ide.eclipse.plexus.annotations.plexusConfigurator" />
- </configurators>
- <mojoExecutions>
-
<mojoExecution>org.apache.maven.plugins:maven-resources-plugin::</mojoExecution>
- </mojoExecutions>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
