You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2020/02/06 15:39:41 UTC
[lucene-solr] branch master updated: LUCENE-9199: allow building
javadocs on java 13+
This is an automated email from the ASF dual-hosted git repository.
rmuir pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new 7f4560c LUCENE-9199: allow building javadocs on java 13+
7f4560c is described below
commit 7f4560c59a71f271058f13b3b30901ca8c233022
Author: Robert Muir <rm...@apache.org>
AuthorDate: Thu Feb 6 10:38:58 2020 -0500
LUCENE-9199: allow building javadocs on java 13+
---
lucene/common-build.xml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index d33f5dd..a2e4e2a 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -205,6 +205,13 @@
<property name="javadoc.doclint.args" value="-Xdoclint:all,-missing,-accessibility,-html"/>
<!---proc:none was added because of LOG4J2-1925 / JDK-8186647 -->
<property name="javac.doclint.args" value="-Xdoclint:all/protected -Xdoclint:-missing -Xdoclint:-accessibility -proc:none"/>
+
+ <condition property="javadoc.nomodule.args" value="--no-module-directories" else="">
+ <or>
+ <equals arg1="${java.specification.version}" arg2="11"/>
+ <equals arg1="${java.specification.version}" arg2="12"/>
+ </or>
+ </condition>
<!-- Javadoc classpath -->
<path id="javadoc.classpath">
@@ -2152,7 +2159,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
<sources />
<classpath refid="javadoc.classpath"/>
- <arg line="--no-module-directories --release ${javac.release}"/>
+ <arg line="${javadoc.nomodule.args} --release ${javac.release}"/>
<arg line="${javadoc.doclint.args}"/>
<!-- force locale to be "en_US", as Javadoc tool ignores locale parameter (in some cases) -->
<arg line="-J-Duser.language=en -J-Duser.country=US"/>