From c05dcf38b1e9a9abff475eff9a626d3d6093052d Mon Sep 17 00:00:00 2001
From: Anuraag Agrawal <aanuraag@amazon.co.jp>
Date: Fri, 9 Jul 2021 11:26:00 +0900
Subject: [PATCH] Allow RMI test to run on Java 16 (#3524)

* Allow RMI test to run on Java 16

* testJavaVersion
---
 instrumentation/rmi/javaagent/build.gradle.kts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/instrumentation/rmi/javaagent/build.gradle.kts b/instrumentation/rmi/javaagent/build.gradle.kts
index 3515d0d3d5..deab73b2f3 100644
--- a/instrumentation/rmi/javaagent/build.gradle.kts
+++ b/instrumentation/rmi/javaagent/build.gradle.kts
@@ -46,5 +46,12 @@ tasks {
   }
   withType<Test>().configureEach {
     jvmArgs("-Djava.rmi.server.hostname=127.0.0.1")
+
+    // Can only export on Java 9+
+    val testJavaVersion = gradle.startParameter.projectProperties.get("testJavaVersion")?.let(JavaVersion::toVersion) ?: JavaVersion.current()
+    if (testJavaVersion.isJava9Compatible) {
+      jvmArgs("--add-exports=java.rmi/sun.rmi.server=ALL-UNNAMED")
+      jvmArgs("--add-exports=java.rmi/sun.rmi.transport=ALL-UNNAMED")
+    }
   }
 }