From c5b592c42cc246c7dfff5e572173cd79c68a572a Mon Sep 17 00:00:00 2001
From: Alexander Suter <alexander.suter@axonivy.com>
Date: Fri, 14 Jun 2024 15:28:24 +0200
Subject: [PATCH] XIVY-9730 Load jvm-module.options from bin/jvm-module.options
 with backward compatiblity support

---
 .../ivy/maven/engine/EngineModuleHints.java   | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/ch/ivyteam/ivy/maven/engine/EngineModuleHints.java b/src/main/java/ch/ivyteam/ivy/maven/engine/EngineModuleHints.java
index 94ddae21..8b0aec22 100644
--- a/src/main/java/ch/ivyteam/ivy/maven/engine/EngineModuleHints.java
+++ b/src/main/java/ch/ivyteam/ivy/maven/engine/EngineModuleHints.java
@@ -2,13 +2,11 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
+import java.nio.file.Files;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import org.apache.commons.exec.CommandLine;
-import org.apache.commons.io.FileUtils;
 import org.apache.maven.plugin.logging.Log;
 
 public class EngineModuleHints {
@@ -22,20 +20,25 @@ public static String loadFromJvmOptionsFile(File identifyAndGetEngineDirectory,
   }
 
   private static List<String> loadJvmOptions(File engineDir, Log log) {
-    File jvmOptionsFile = new File(engineDir, "configuration/jvm-module.options");
-    if (!jvmOptionsFile.exists()) {
-      log.warn("Couldn't load jvm module options from '" + jvmOptionsFile + "' file.");
-      return Collections.emptyList();
+    var jvmOptionsFile = engineDir.toPath().resolve("bin").resolve("jvm-module.options");
+    if (!Files.exists(jvmOptionsFile)) {
+      // Fallback: It was placed in another place in Axon Ivy Engine before 11.4.0
+      log.info("File does not exist '" + jvmOptionsFile + "'");
+      jvmOptionsFile = engineDir.toPath().resolve("configuration").resolve("jvm-module.options");
+      if (!Files.exists(jvmOptionsFile)) {
+        log.warn("Couldn't load jvm module options from '" + jvmOptionsFile + "' file.");
+        return List.of();
+      }
     }
 
     try {
-      return FileUtils.readLines(jvmOptionsFile, StandardCharsets.UTF_8).stream()
+      return Files.readAllLines(jvmOptionsFile).stream()
               .filter(line -> !line.isBlank())
               .filter(line -> !line.matches("^\\s*#.*$"))
               .collect(Collectors.toList());
     } catch (IOException ex) {
       log.warn("Couldn't read the jvm module options from '" + jvmOptionsFile + "' file.", ex);
-      return Collections.emptyList();
+      return List.of();
     }
   }
-}
\ No newline at end of file
+}