From 5be239a4d84cc5162ec3ceafabe448a0f1a5291a Mon Sep 17 00:00:00 2001
From: Sarah Chen <sarah.chen@datadoghq.com>
Date: Tue, 9 Sep 2025 14:34:28 -0400
Subject: [PATCH] Revert Java 25-EA kotlin workaround

---
 .../debugger/agent/CapturingTestBase.java     | 28 ++++---------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturingTestBase.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturingTestBase.java
index 34de2f03d4b..b0397dfc3cc 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturingTestBase.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturingTestBase.java
@@ -436,29 +436,11 @@ public static Class<?> compileAndLoad(
       String compilerOutputDir = "/tmp/" + CapturedSnapshotTest.class.getSimpleName() + "-kotlin";
       args.setDestination(compilerOutputDir);
       args.setClasspath(System.getProperty("java.class.path"));
-      // We are currently testing JDK 25-ea, which is not yet generally available. This is causing
-      // Kotlin compilation issues for "25-ea" and "25". Temporarily override java.version "25-ea"
-      // to be the latest generally available JDK version "24".
-      // TODO: Revert this change once JDK 25 is generally available and tested.
-      String originalJavaVersion = System.getProperty("java.version");
-      boolean overrideEAJavaVersion =
-          originalJavaVersion != null && originalJavaVersion.contains("-ea");
-      ExitCode exitCode;
-      try {
-        if (overrideEAJavaVersion) {
-          System.setProperty("java.version", "24");
-        }
-        exitCode =
-            compiler.execImpl(
-                new PrintingMessageCollector(System.out, MessageRenderer.WITHOUT_PATHS, true),
-                Services.EMPTY,
-                args);
-      } finally {
-        // Restore the original java.version if it was overridden (25-ea)
-        if (overrideEAJavaVersion) {
-          System.setProperty("java.version", originalJavaVersion);
-        }
-      }
+      ExitCode exitCode =
+          compiler.execImpl(
+              new PrintingMessageCollector(System.out, MessageRenderer.WITHOUT_PATHS, true),
+              Services.EMPTY,
+              args);
 
       if (exitCode.getCode() != 0) {
         throw new RuntimeException("Kotlin compilation failed");