You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2016/10/03 11:38:23 UTC
activemq git commit: https://issues.apache.org/jira/browse/AMQ-6449
Repository: activemq
Updated Branches:
refs/heads/master ee9f316c2 -> 72650a0b8
https://issues.apache.org/jira/browse/AMQ-6449
Disabling doclint now only activates for JDK 8
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/72650a0b
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/72650a0b
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/72650a0b
Branch: refs/heads/master
Commit: 72650a0b8b00f281ce6b2e300da2cb4015d25e81
Parents: ee9f316
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Authored: Mon Oct 3 07:32:40 2016 -0400
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Mon Oct 3 07:37:53 2016 -0400
----------------------------------------------------------------------
activemq-broker/pom.xml | 2 +-
activemq-client/pom.xml | 2 +-
activemq-unit-tests/pom.xml | 2 +-
pom.xml | 14 ++++++++++++--
4 files changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/72650a0b/activemq-broker/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-broker/pom.xml b/activemq-broker/pom.xml
index 32b9977..9c23707 100755
--- a/activemq-broker/pom.xml
+++ b/activemq-broker/pom.xml
@@ -103,7 +103,7 @@
<version>${maven-javadoc-plugin-version}</version>
<configuration>
<!-- necessary for now under the javadocs can be fixed because jdk8 is much stricter -->
- <additionalparam>-Xdoclint:none</additionalparam>
+ <additionalparam>${javadoc.options}</additionalparam>
<links>
<link>${javase-javadoc-url}</link>
<link>${javaee-javadoc-url}</link>
http://git-wip-us.apache.org/repos/asf/activemq/blob/72650a0b/activemq-client/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
index f8f2935..2e1c6a4 100755
--- a/activemq-client/pom.xml
+++ b/activemq-client/pom.xml
@@ -95,7 +95,7 @@
<version>${maven-javadoc-plugin-version}</version>
<configuration>
<!-- necessary for now under the javadocs can be fixed because jdk8 is much stricter -->
- <additionalparam>-Xdoclint:none</additionalparam>
+ <additionalparam>${javadoc.options}</additionalparam>
<links>
<link>${javase-javadoc-url}</link>
<link>${javaee-javadoc-url}</link>
http://git-wip-us.apache.org/repos/asf/activemq/blob/72650a0b/activemq-unit-tests/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml
index 40f4b24..e6af738 100755
--- a/activemq-unit-tests/pom.xml
+++ b/activemq-unit-tests/pom.xml
@@ -325,7 +325,7 @@
<version>${maven-javadoc-plugin-version}</version>
<configuration>
<!-- necessary for now under the javadocs can be fixed because jdk8 is much stricter -->
- <additionalparam>-Xdoclint:none</additionalparam>
+ <additionalparam>${javadoc.options}</additionalparam>
<links>
<link>${javase-javadoc-url}</link>
<link>${javaee-javadoc-url}</link>
http://git-wip-us.apache.org/repos/asf/activemq/blob/72650a0b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 91378e3..9d5e012 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1478,7 +1478,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven-javadoc-plugin-version}</version>
<configuration>
<links>
<link>${javase-javadoc-url}</link>
@@ -1498,7 +1497,7 @@
<source>${source-version}</source>
<additionalJOption>-J-Xmx2048m</additionalJOption>
<!-- necessary for now under the javadocs can be fixed because jdk8 is much stricter -->
- <additionalparam>-Xdoclint:none</additionalparam>
+ <additionalparam>${javadoc.options}</additionalparam>
</configuration>
<executions>
<execution>
@@ -1663,5 +1662,16 @@
<jetty-version>${jetty9-version}</jetty-version>
</properties>
</profile>
+
+ <!-- Need to disable doclint for JDK 8 builds so Javadocs work -->
+ <profile>
+ <id>jdk8-disable-doclint</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
+ <properties>
+ <javadoc.options>-Xdoclint:none</javadoc.options>
+ </properties>
+ </profile>
</profiles>
</project>