From 991e97ad9436300b3266e6e0672bf9df65a3adc9 Mon Sep 17 00:00:00 2001
From: "Christopher L. Shannon (cshannon)" <christopher.l.shannon@gmail.com>
Date: Mon, 3 Oct 2016 07:32:40 -0400
Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-6449

Disabling doclint now only activates for JDK 8

(cherry picked from commit 72650a0b8b00f281ce6b2e300da2cb4015d25e81)
---
 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(-)

diff --git a/activemq-broker/pom.xml b/activemq-broker/pom.xml
index cf65737a43..8549f9cc71 100755
--- a/activemq-broker/pom.xml
+++ b/activemq-broker/pom.xml
@@ -93,7 +93,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>
diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
index e18dd79a68..ab0fd27f95 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>
diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml
index 8898ae0239..6a157e1d64 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>
diff --git a/pom.xml b/pom.xml
index 276f603519..9a1e00d5bb 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1477,7 +1477,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>
@@ -1497,7 +1496,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>
@@ -1662,5 +1661,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>