From 41f96d6db27db1f1bec6b28725a711cfff53a39f Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 24 Oct 2024 09:56:25 +0300
Subject: [PATCH] fix: Relax check for version and build in JBR version

Should match also -jcef and other variants
---
 src/main/kotlin/com/vaadin/plugin/hotswapagent/JdkUtil.kt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/kotlin/com/vaadin/plugin/hotswapagent/JdkUtil.kt b/src/main/kotlin/com/vaadin/plugin/hotswapagent/JdkUtil.kt
index 2b85a2a..875cf47 100644
--- a/src/main/kotlin/com/vaadin/plugin/hotswapagent/JdkUtil.kt
+++ b/src/main/kotlin/com/vaadin/plugin/hotswapagent/JdkUtil.kt
@@ -49,7 +49,13 @@ class JdkUtil {
             val release = File(sdk.homePath, "release")
             val version = sdk.versionString
             if (version != null && version.contains("21.0.4") && release.exists()) {
-                return release.readText().contains("JAVA_RUNTIME_VERSION=\"21.0.4+13-b509.17\"")
+                // Find the line with JAVA_RUNTIME_VERSION and check if it's the broken version
+                val runtimeVersion = release.readLines().find { it.startsWith("JAVA_RUNTIME_VERSION") }
+                if (runtimeVersion != null &&
+                    runtimeVersion.contains("21.0.4+13") &&
+                    runtimeVersion.contains("b509.17")) {
+                    return true
+                }
             }
 
             return false