[lucene-solr] branch jira/LUCENE-8738 updated: LUCENE-8738: Disable jTIDY, as it can't handle HTML5. Enable Javadocs Linting in Java 11 only

[us...@apache.org]

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 65fc3c6  LUCENE-8738: Disable jTIDY, as it can't handle HTML5. Enable Javadocs Linting in Java 11 only
65fc3c6 is described below

commit 65fc3c62582442af939a12fefd774227af2375c9
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Wed Apr 3 11:08:28 2019 +0200

    LUCENE-8738: Disable jTIDY, as it can't handle HTML5. Enable Javadocs Linting in Java 11 only
---
 lucene/common-build.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index b2a60a4..e63d077 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -309,9 +309,9 @@
         <contains string="${java.vm.name}" substring="openjdk" casesensitive="false"/>
         <contains string="${java.vm.name}" substring="jrockit" casesensitive="false"/>
       </or>
-      <equals arg1="${java.specification.version}" arg2="1.8"/>
+      <equals arg1="${java.specification.version}" arg2="11"/>
       <!-- TODO: Fix this! For now only run this on 64bit, because jTIDY OOMs with default heap size: -->
-      <contains string="${os.arch}" substring="64"/>
+      <!--<contains string="${os.arch}" substring="64"/>-->
     </and>
   </condition>
 
@@ -2112,6 +2112,8 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
   <macrodef name="jtidy-macro">
     <element name="nested" implicit="yes" optional="yes"/>
     <sequential>
+      <!--
+      TODO: find a better replacement for jTIDY that can handle HTML5
       <ivy:cachepath organisation="net.sf.jtidy" module="jtidy" revision="r938"
           log="download-only" inline="true" conf="master" type="jar" pathid="jtidy.classpath" />
       <taskdef name="tidy" classname="org.w3c.tidy.ant.JTidyTask" classpathref="jtidy.classpath"/>
@@ -2124,6 +2126,8 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
          <parameter name="show-warnings" value="false" />
       </tidy>
       <delete dir="${common.dir}/build/jtidy_tmp" quiet="true"/>
+      -->
+      <echo message="FIXME: Broken HTML checks were disabled, as jtidy can't handle HTML5." taskname="jtidy"/>
     </sequential>
   </macrodef>
 
@@ -2171,7 +2175,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
         <sources />
                 
         <classpath refid="javadoc.classpath"/>
-        <arg line="-html5 --release ${javac.release}"/>
+        <arg line="--release ${javac.release}"/>
         <arg line="${javadoc.doclint.args}"/>
       </javadoc>
       <record name="@{destdir}/log_javadoc.txt" action="stop"/>