You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/02/19 20:52:07 UTC

[2/3] activemq-6 git commit: Only set xlintdoc option on JDK8

Only set xlintdoc option on JDK8


Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/3f8ae371
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/3f8ae371
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/3f8ae371

Branch: refs/heads/master
Commit: 3f8ae3715017a81b585ba629fefe6d19799d6bb4
Parents: e385ab0
Author: Martyn Taylor <mt...@redhat.com>
Authored: Thu Feb 19 13:59:37 2015 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Thu Feb 19 14:09:00 2015 +0000

----------------------------------------------------------------------
 pom.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/3f8ae371/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f1fd6c8..3846012 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,6 @@
       <skipRestTests>true</skipRestTests>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-      <additionalparam>-Xdoclint:none</additionalparam>
 
      <!--
 
@@ -618,6 +617,15 @@
             <skipTests>true</skipTests>
          </properties>
       </profile>
+      <profile>
+         <id>jdk8</id>
+         <activation>
+            <jdk>1.7</jdk>
+         </activation>
+         <properties>
+            <javadoc.opts>-Xdoclint:none</javadoc.opts>
+         </properties>
+      </profile>
    </profiles>
 
    <build>
@@ -787,6 +795,9 @@
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
+            <configuration>
+               <additionalparam>${javadoc.opts}</additionalparam>
+            </configuration>
          </plugin>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
@@ -973,6 +984,7 @@
                <aggregate>true</aggregate>
                <excludePackageNames>com.restfully.*:org.jboss.resteasy.examples.*:org.jboss.resteasy.tests.*
                </excludePackageNames>
+               <additionalparam>${javadoc.opts}</additionalparam>
             </configuration>
          </plugin>
          <plugin>