From d9932f657b33256a95845fdec5d83f91e02c76a7 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fridrich.strba@bluewin.ch>
Date: Tue, 24 Sep 2024 19:46:15 +0200
Subject: [PATCH] Build the tests with release=8 whenever it is possible

Fixes https://github.com/eclipse-openj9/openj9/issues/19888
---
 openjdk.test.mauve/build.xml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/openjdk.test.mauve/build.xml b/openjdk.test.mauve/build.xml
index d4e49c75..679875f1 100644
--- a/openjdk.test.mauve/build.xml
+++ b/openjdk.test.mauve/build.xml
@@ -106,10 +106,11 @@ limitations under the License.
 			<exclude name="/junit/textui/*.java" />
 		</depend>
 		-->
-		<!-- The test cases are built with source="1.8" and target="1.8" because they need packages
-		    which have been moved into madules which are not visible by default in Java 9. -->
+		<!-- The test cases are built with release="8" if supported by the compiler,
+		    otherwise with source="1.8" and target="1.8". -->
 		<javac srcdir="${openjdk_test_mauve_src_dir}"
 			   destdir="${openjdk_test_mauve_src_dir}"
+			   release="8"
 			   source="1.8"
 			   target="1.8"
 			   fork="true"
@@ -124,6 +125,23 @@ limitations under the License.
 			<exclude name="**/junit/framework/*.java" />
 			<exclude name="/junit/runner/*.java" />
 			<exclude name="/junit/textui/*.java" />
+			<exclude name="**/gnu/testlet/java/lang/Class/classInfo/getDeclaredMethod.java" />
+		</javac>
+		<!-- The file gnu/testlet/java/lang/Class/classInfo/getDeclaredMethod.java is built with
+		    source="1.8" and target="1.8" because it requires sun.reflect.annotation.AnnotationType
+		    that is in module not visible by default in Java 9 and later when using release=8. -->
+		<javac srcdir="${openjdk_test_mauve_src_dir}"
+			   destdir="${openjdk_test_mauve_src_dir}"
+			   source="1.8"
+			   target="1.8"
+			   fork="true"
+			   executable="${java_compiler}"
+			   classpathref="project.class.path"
+			   debug="true"
+			   encoding="${src-encoding}"
+			   includeantruntime="false"
+			   failonerror="true">
+			<include name="**/gnu/testlet/java/lang/Class/classInfo/getDeclaredMethod.java" />
 		</javac>
 	</target>