You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/09/08 22:37:07 UTC
svn commit: r1807837 - in /axis/axis2/java/core/trunk: apidocs/pom.xml
pom.xml
Author: veithen
Date: Fri Sep 8 22:37:06 2017
New Revision: 1807837
URL: http://svn.apache.org/viewvc?rev=1807837&view=rev
Log:
AXIS2-5885: Fix site generation failure in apidocs. The problem was that the additionalparam (with -Xdoclint:none) set by the Maven profile was overridden in the site-javadoc execution.
Modified:
axis/axis2/java/core/trunk/apidocs/pom.xml
axis/axis2/java/core/trunk/pom.xml
Modified: axis/axis2/java/core/trunk/apidocs/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/apidocs/pom.xml?rev=1807837&r1=1807836&r2=1807837&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/apidocs/pom.xml (original)
+++ axis/axis2/java/core/trunk/apidocs/pom.xml Fri Sep 8 22:37:06 2017
@@ -314,6 +314,7 @@
<doclet>org.apache.axis2.transport.testkit.doclet.TestkitJavadocDoclet</doclet>
<useStandardDocletOptions>true</useStandardDocletOptions>
<additionalparam>
+ ${javadoc.nolint.param}
-resource-info ${project.build.directory}/resource-info.dat
</additionalparam>
<reportOutputDirectory>${project.reporting.outputDirectory}</reportOutputDirectory>
Modified: axis/axis2/java/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1807837&r1=1807836&r2=1807837&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Fri Sep 8 22:37:06 2017
@@ -143,20 +143,22 @@
</build>
</profile>
<profile>
- <id>doclint-java8-disable</id>
+ <id>doclint-java7</id>
+ <activation>
+ <jdk>(,1.8)</jdk>
+ </activation>
+ <properties>
+ <javadoc.nolint.param />
+ </properties>
+ </profile>
+ <profile>
+ <id>doclint-java8</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <javadoc.nolint.param>-Xdoclint:none</javadoc.nolint.param>
+ </properties>
</profile>
</profiles>
<mailingLists>
@@ -1126,6 +1128,7 @@
<version>2.10.3</version>
<configuration>
<detectOfflineLinks>false</detectOfflineLinks>
+ <additionalparam>${javadoc.nolint.param}</additionalparam>
</configuration>
</plugin>
<plugin>