You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2019/04/15 19:43:09 UTC

[lucene-solr] branch jira/LUCENE-8738 updated: LUCENE-8738: Fix Javadoc 11.0.2+ bug with split packages by filtering them in module's "element-list" files

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

uschindler pushed a commit to branch jira/LUCENE-8738
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/jira/LUCENE-8738 by this push:
     new d22a67f  LUCENE-8738: Fix Javadoc 11.0.2+ bug with split packages by filtering them in module's "element-list" files
d22a67f is described below

commit d22a67fee534f109418df45e5a167b39ecf8e752
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Mon Apr 15 21:42:33 2019 +0200

    LUCENE-8738: Fix Javadoc 11.0.2+ bug with split packages by filtering them in module's "element-list" files
---
 lucene/module-build.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lucene/module-build.xml b/lucene/module-build.xml
index 2853efb..e73f0fc 100644
--- a/lucene/module-build.xml
+++ b/lucene/module-build.xml
@@ -83,6 +83,20 @@
            <packageset dir="${src.dir}"/>
         </sources>
       </invoke-javadoc>
+      
+      <!-- fix for Java 11 Javadoc tool that cannot handle split packages between modules correctly (by removing all the packages which are part of lucene-core): -->
+      <!-- problem description: [https://issues.apache.org/jira/browse/LUCENE-8738?focusedCommentId=16818106&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-16818106] -->
+      <local name="element-list-regex"/><!-- contains a regex for all package names which are in lucene-core's javadoc! -->
+      <loadfile property="element-list-regex" srcFile="${javadoc.dir}/core/element-list" encoding="utf-8">
+        <filterchain>
+          <tokenfilter delimoutput="|">
+            <replacestring from="." to="\."/>
+          </tokenfilter>
+        </filterchain>
+      </loadfile>
+      <!--<echo>Regex: ^(${element-list-regex})$</echo>-->
+      <replaceregexp encoding="utf-8" file="${javadoc.dir}/${name}/element-list" byline="true" match="^(${element-list-regex})$" replace=""/>
+      
       <jarify basedir="${javadoc.dir}/${name}" destfile="${build.dir}/${final.name}-javadoc.jar"/>
     </sequential>
   </macrodef>