From 8cf1e8eb5869f49905b7296e684bfa9dc1a4be10 Mon Sep 17 00:00:00 2001
From: David Hook <dgh@cryptoworkshop.com>
Date: Sat, 2 Mar 2024 15:57:45 +1100
Subject: [PATCH] added use of JAVA_VERSION_PREFIX environment variable

---
 ant/bc+-build.xml | 1 +
 build1-8+         | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/ant/bc+-build.xml b/ant/bc+-build.xml
index 567c2a5e7a..c071660291 100644
--- a/ant/bc+-build.xml
+++ b/ant/bc+-build.xml
@@ -991,6 +991,7 @@
                 </fileset>
             </classpath>
             <sysproperty key="bc.test.data.home" value="../../core/src/test/data" />
+            <sysproperty key="test.java.version.prefix" value="${env.JAVA_VERSION_PREFIX}" />
 
             <formatter type="xml" />
             <batchtest todir="${artifacts.reports.xml.dir}" unless="testcase">
diff --git a/build1-8+ b/build1-8+
index 94c8a3f32d..f99d5b0ac8 100644
--- a/build1-8+
+++ b/build1-8+
@@ -17,6 +17,12 @@ export JAVA_HOME
 PATH=$JDKPATH/bin:$PATH
 export PATH
 
+if [ "${JAVA_VERSION_PREFIX}" = "" ] 
+then
+    JAVA_VERSION_PREFIX=1.8
+    export JAVA_VERSION_PREFIX
+fi
+
 if [ "$1" = "test" ]
 then
     ant -f ant/jdk18+.xml test