From 69269adced56238dc80297b9ae881442cd56259c Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jaikiran@apache.org>
Date: Wed, 5 Dec 2018 19:36:53 +0530
Subject: [PATCH] bz-62952 Fix the jar-test.xml#testMultiReleaseJar antunit
 test case

---
 src/tests/antunit/taskdefs/jar-test.xml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/tests/antunit/taskdefs/jar-test.xml b/src/tests/antunit/taskdefs/jar-test.xml
index 63646e215..1ab12ca8a 100644
--- a/src/tests/antunit/taskdefs/jar-test.xml
+++ b/src/tests/antunit/taskdefs/jar-test.xml
@@ -314,9 +314,22 @@ Main-Class: MyClass
     </loadresource>
     <au:assertTrue>
       <or>
-    	<equals arg1="Java8" arg2="${valueFrom8}"/>
-        <!-- maybe we are running on an early version of Java9 -->
-    	<equals arg1="Java9" arg2="${valueFrom8}"/>
+        <and>
+          <not>
+            <javaversion atleast="9"/>
+          </not>
+          <equals arg1="Java8" arg2="${valueFrom8}"/>
+        </and>
+
+        <and>
+          <javaversion exactly="9"/>
+          <equals arg1="Java9" arg2="${valueFrom8}"/>
+        </and>
+
+        <and>
+          <javaversion atleast="10"/>
+          <equals arg1="Java10" arg2="${valueFrom8}"/>
+        </and>
       </or>
     </au:assertTrue>
   </target>