Author: veithen
Date: Tue May 24 20:14:24 2011
New Revision: 1127257
URL: http://svn.apache.org/viewvc?rev=1127257&view=rev
Log:
Moved all invocations of the maven-javadoc-plugin from the <reporting/> tag to
the <build/> tag (phase "site") and make sure that every configuration is bound
to a single execution.
Rationale: When a configuration for maven-javadoc-plugin is specified in the
<reporting/> tag (as was the case in the testkit module), Maven 2.2 (but not
3.0) applies that configuration also to the maven-javadoc-plugin execution
defined by the org.apache:apache super-POM (and which is triggered by the
apache-release profile). The change described above will avoid this confusion
and seems to work with all Maven versions (2.2.x and 3.0.x), goals (clean
install or clean site) and profiles (apache-release or no profile), although I
didn't test all combinations.
Side effect: mvn site:site will no longer produce the Javadoc. Instead, mvn
site must be used (which should be used anyway, at least to generate the site
for publication).
Modified:
axis/axis2/java/transports/trunk/modules/testkit/pom.xml
axis/axis2/java/transports/trunk/pom.xml
Modified: axis/axis2/java/transports/trunk/modules/testkit/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/pom.xml?rev=1127257&r1=1127256&r2=1127257&view=diff
==============================================================================
--- axis/axis2/java/transports/trunk/modules/testkit/pom.xml (original)
+++ axis/axis2/java/transports/trunk/modules/testkit/pom.xml Tue May 24
20:14:24 2011
@@ -184,36 +184,35 @@
<additionalparam>-out
${project.build.directory}/resource-info.dat</additionalparam>
</configuration>
</execution>
+ <execution>
+ <id>generate-javadoc</id>
+ <phase>site</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <configuration>
+ <docletArtifacts>
+ <docletArtifact>
+ <groupId>${project.groupId}</groupId>
+
<artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ </docletArtifact>
+ </docletArtifacts>
+
<doclet>org.apache.axis2.transport.testkit.doclet.TestkitJavadocDoclet</doclet>
+
<useStandardDocletOptions>true</useStandardDocletOptions>
+ <additionalparam>
+ -resource-info
${project.build.directory}/resource-info.dat
+ -link http://java.sun.com/j2se/1.5.0/docs/api/
+ -link http://java.sun.com/j2ee/1.4/docs/api/
+ -link http://ws.apache.org/axis2/1_4_1/api/
+ -link
http://ws.apache.org/commons/axiom/apidocs/
+ -link http://junit.org/junit/javadoc/3.8.1/
+ -link
http://www.eclipse.org/aspectj/doc/released/runtime-api/
+ </additionalparam>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
</build>
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <docletArtifacts>
- <docletArtifact>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- </docletArtifact>
- </docletArtifacts>
-
<doclet>org.apache.axis2.transport.testkit.doclet.TestkitJavadocDoclet</doclet>
- <useStandardDocletOptions>true</useStandardDocletOptions>
- <additionalparam>
- -resource-info
${project.build.directory}/resource-info.dat
- -link http://java.sun.com/j2se/1.5.0/docs/api/
- -link http://java.sun.com/j2ee/1.4/docs/api/
- -link http://ws.apache.org/axis2/1_4_1/api/
- -link http://ws.apache.org/commons/axiom/apidocs/
- -link http://junit.org/junit/javadoc/3.8.1/
- -link
http://www.eclipse.org/aspectj/doc/released/runtime-api/
- </additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
</project>
Modified: axis/axis2/java/transports/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/pom.xml?rev=1127257&r1=1127256&r2=1127257&view=diff
==============================================================================
--- axis/axis2/java/transports/trunk/pom.xml (original)
+++ axis/axis2/java/transports/trunk/pom.xml Tue May 24 20:14:24 2011
@@ -413,6 +413,19 @@
<attach>true</attach>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-aggregated-javadoc</id>
+ <phase>site</phase>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ <inherited>false</inherited>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -433,20 +446,6 @@
<version>2.0-beta-1</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>javadoc</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
<artifactId>maven-site-plugin</artifactId>
<version>2.0-beta-5</version>
<inherited>false</inherited>
