Author: ltheussl Date: Sun Jul 29 21:09:17 2007 New Revision: 560858 URL: http://svn.apache.org/viewvc?view=rev&rev=560858 Log: Move javadoc configuration into top level pom. Use aggregate and separate test javadocs.
Modified: maven/doxia/doxia/trunk/doxia-core/pom.xml maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/pom.xml maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml maven/doxia/doxia/trunk/pom.xml Modified: maven/doxia/doxia/trunk/doxia-core/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/pom.xml?view=diff&rev=560858&r1=560857&r2=560858 ============================================================================== --- maven/doxia/doxia/trunk/doxia-core/pom.xml (original) +++ maven/doxia/doxia/trunk/doxia-core/pom.xml Sun Jul 29 21:09:17 2007 @@ -48,13 +48,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <sourcepath>${basedir}/src/main/java;${basedir}/src/test/java</sourcepath> - </configuration> - </plugin> </plugins> </build> <dependencies> Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/pom.xml?view=diff&rev=560858&r1=560857&r2=560858 ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/pom.xml (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/pom.xml Sun Jul 29 21:09:17 2007 @@ -41,19 +41,8 @@ <role>Developer</role> </roles> <timezone>-5</timezone> - </developer> + </developer> </developers> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <source>1.4</source> - </configuration> - </plugin> - </plugins> - </reporting> <build> <plugins> <plugin> Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml?view=diff&rev=560858&r1=560857&r2=560858 ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml Sun Jul 29 21:09:17 2007 @@ -38,17 +38,6 @@ <timezone>-3</timezone> </developer> </developers> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <source>1.4</source> - </configuration> - </plugin> - </plugins> - </reporting> <build> <plugins> <plugin> Modified: maven/doxia/doxia/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?view=diff&rev=560858&r1=560857&r2=560858 ============================================================================== --- maven/doxia/doxia/trunk/pom.xml (original) +++ maven/doxia/doxia/trunk/pom.xml Sun Jul 29 21:09:17 2007 @@ -68,6 +68,39 @@ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia/trunk</developerConnection> <url>http://svn.apache.org/viewcvs.cgi/maven/doxia/doxia/trunk</url> </scm> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <source>1.4</source> + <aggregate>true</aggregate> + <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> + <reportSets> + <reportSet> + <id>html</id> + <reports> + <report>javadoc</report> + </reports> + </reportSet> + <reportSet> + <id>test-html</id> + <reports> + <report>test-javadoc</report> + </reports> + </reportSet> + </reportSets> + </configuration> + </plugin> + </plugins> + </reporting> + <build> <plugins> <plugin>