You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2020/04/16 13:04:39 UTC
[jclouds] branch 2.2.x updated: Fix javadoc generation on JDK >= 8
(#67)
This is an automated email from the ASF dual-hosted git repository.
gaul pushed a commit to branch 2.2.x
in repository https://gitbox.apache.org/repos/asf/jclouds.git
The following commit(s) were added to refs/heads/2.2.x by this push:
new 8762694 Fix javadoc generation on JDK >= 8 (#67)
8762694 is described below
commit 876269427b80d1d4a68403e0e729342d340fbd82
Author: Fritz Elfert <fr...@fritz-elfert.de>
AuthorDate: Thu Apr 16 13:23:31 2020 +0200
Fix javadoc generation on JDK >= 8 (#67)
---
pom.xml | 3 +++
project/pom.xml | 14 ++++++++++++++
2 files changed, 17 insertions(+)
diff --git a/pom.xml b/pom.xml
index c59a0a8..894c4ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,9 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalparam>${javadoc.opts}</additionalparam>
+ </configuration>
<executions>
<execution>
<id>javadoc</id>
diff --git a/project/pom.xml b/project/pom.xml
index e170d54..bdefe7d 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -886,6 +886,7 @@
<encoding>${project.build.sourceEncoding}</encoding>
<quiet>true</quiet>
<maxmemory>512m</maxmemory>
+ <additionalparam>${javadoc.opts}</additionalparam>
</configuration>
<reportSets>
<reportSet>
@@ -987,6 +988,7 @@
<maxmemory>512m</maxmemory>
<encoding>${project.build.sourceEncoding}</encoding>
<quiet>true</quiet>
+ <additionalparam>${javadoc.opts}</additionalparam>
<links>
<link>https://download.oracle.com/javase/6/docs/api/</link>
</links>
@@ -1209,6 +1211,15 @@
</reporting>
<profiles>
<profile>
+ <id>disable-doclint</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
+ <properties>
+ <javadoc.opts>-Xdoclint:none</javadoc.opts>
+ </properties>
+ </profile>
+ <profile>
<id>live</id>
<build>
<plugins>
@@ -1421,6 +1432,9 @@
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
+ <configuration>
+ <additionalparam>${javadoc.opts}</additionalparam>
+ </configuration>
<executions>
<execution>
<id>javadoc</id>