You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by pa...@apache.org on 2019/05/21 19:55:16 UTC

[commons-text] branch master updated: Fix Javadoc on Java 11+.

This is an automated email from the ASF dual-hosted git repository.

pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-text.git


The following commit(s) were added to refs/heads/master by this push:
     new 547f651  Fix Javadoc on Java 11+.
547f651 is described below

commit 547f6519c41164455f093a8eaba1db9c671cc661
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Tue May 21 21:55:06 2019 +0200

    Fix Javadoc on Java 11+.
---
 pom.xml | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9d177ec..506fe50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,8 @@
     
     <commons.jacoco.version>0.8.2</commons.jacoco.version>
 
+    <commons.javadoc.version>3.1.0</commons.javadoc.version>
+
     <!-- generate report even if there are binary incompatible changes -->
     <commons.japicmp.breakBuildOnBinaryIncompatibleModifications>false</commons.japicmp.breakBuildOnBinaryIncompatibleModifications>
     <!-- 0.12.0 dies with a NullPointerException -->
@@ -181,6 +183,13 @@
           </ignorePathsToDelete>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <source>${maven.compiler.source}</source>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
@@ -431,18 +440,6 @@
       </properties>
     </profile>
     <profile>
-      <id>java11+</id>
-      <activation>
-        <jdk>[11,)</jdk>
-      </activation>
-      <properties>
-        <!-- Workaround for https://bugs.openjdk.java.net/browse/JDK-8212233
-             which causes javadoc to fail with "javadoc: error - The code being documented uses modules
-             but the packages defined in https://docs.oracle.com/javase/8/docs/api/ are in the unnamed module."  -->
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-      </properties>
-    </profile>
-    <profile>
       <id>java13+</id>
       <activation>
         <jdk>[13,)</jdk>