From 458fba12de0ff031017f116e9282f5ed626c7c5a Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jaikiran@apache.org>
Date: Sat, 21 Nov 2020 19:15:44 +0530
Subject: [PATCH] Skip scriptdef-test.xml antunit tests for JDK >=15 due to
 unavailability of script engine for "javascript" language in JRE

---
 .../optional/script/scriptdef-test.xml         | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml b/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml
index b604aa22e..e2a771883 100644
--- a/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml
+++ b/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml
@@ -26,13 +26,17 @@
   </description>
 
   <condition property="prereqs-ok">
-    <or>
-      <and>
-        <available classname="org.apache.bsf.BSFManager" />
-        <available classname="org.apache.bsf.engines.javascript.JavaScriptEngine" />
-      </and>
-      <available classname="javax.script.ScriptEngineManager" />
-    </or>
+    <and>
+      <!-- Starting Java 15, there's no "javascript" script engine (not even nashorn) bundled in JRE -->
+      <javaversion atmost="14"/>
+      <or>
+        <and>
+          <available classname="org.apache.bsf.BSFManager" />
+          <available classname="org.apache.bsf.engines.javascript.JavaScriptEngine" />
+        </and>
+        <available classname="javax.script.ScriptEngineManager" />
+      </or>
+    </and>
   </condition>
 
   <!-- auto doesn't verify the language is supported and selects BSF