[lucene-solr] branch master updated: LUCENE-8991: disable HashMap assertions (by default) on java9 and java1.8 as well

[ho...@apache.org]

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

hossman 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 bc0652e  LUCENE-8991: disable HashMap assertions (by default) on java9 and java1.8 as well
bc0652e is described below

commit bc0652ecc09ba6b82d86a8050b541a96f2a0f888
Author: Chris Hostetter <ho...@apache.org>
AuthorDate: Mon Oct 7 15:58:22 2019 -0700

    LUCENE-8991: disable HashMap assertions (by default) on java9 and java1.8 as well
---
 lucene/common-build.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index e1317ea..465975c 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -136,7 +136,7 @@
   <property name="tests.policy" location="${common.dir}/tools/junit4/tests.policy"/>
 
   <condition property="tests.asserts.bug.jdk8205399" value="-da:java.util.HashMap" else="">
-    <!-- LUCENE-8991 / JDK-8205399: HashMap assertion bug in Java 10 and 11-->
+    <!-- LUCENE-8991 / JDK-8205399: HashMap assertion bug until java12-->
     <and>
       <or>
         <contains string="${java.vm.name}" substring="hotspot" casesensitive="false"/>
@@ -144,6 +144,8 @@
         <contains string="${java.vm.name}" substring="jrockit" casesensitive="false"/>
       </or>
       <or>
+        <equals arg1="${java.specification.version}" arg2="1.8"/>
+        <equals arg1="${java.specification.version}" arg2="9"/>
         <equals arg1="${java.specification.version}" arg2="10"/>
         <equals arg1="${java.specification.version}" arg2="11"/>
       </or>