Enabling DPS to run on any JRE 21+ (#665)

Author: mageddo

RELEASE-NOTES.md

@@ -1,5 +1,6 @@
-## 5.4.0
+## 5.5.0
 * Releasing JRE Docker Image Version
+* Enabling DPS to run on any JRE 21+
 
 ## 5.3.0
 * Docker Solver: Specify Preferred Networks to use when solving container IP #662

gradle.properties

@@ -1 +1 @@
-version=5.4.0-snapshot
+version=5.5.0-snapshot

src/main/java/com/mageddo/dnsproxyserver/sandbox/DpsBinaryExecutableFinder.java

@@ -3,11 +3,11 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 
+import com.mageddo.graalvm.ImageInfo;
 import com.mageddo.utils.Runtime;
 
 import org.apache.commons.exec.CommandLine;
 import org.apache.commons.lang3.Validate;
-import org.graalvm.nativeimage.ImageInfo;
 
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/mageddo/graalvm/ImageInfo.java

@@ -0,0 +1,9 @@
+package com.mageddo.graalvm;
+
+public class ImageInfo {
+
+  public static boolean inImageRuntimeCode() {
+    return "runtime".equals(System.getProperty("org.graalvm.nativeimage.imagecode"));
+  }
+
+}

src/main/java/com/mageddo/graalvm/ProcessProperties.java

@@ -0,0 +1,13 @@
+package com.mageddo.graalvm;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import static org.graalvm.nativeimage.ProcessProperties.getExecutableName;
+
+public class ProcessProperties {
+  public static Path getRunningPath() {
+    return Paths.get(getExecutableName())
+        .getParent();
+  }
+}

src/main/java/com/mageddo/utils/Runtime.java

@@ -4,9 +4,10 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import com.mageddo.graalvm.ImageInfo;
+import com.mageddo.graalvm.ProcessProperties;
+
 import org.apache.commons.lang3.ObjectUtils;
-import org.graalvm.nativeimage.ImageInfo;
-import org.graalvm.nativeimage.ProcessProperties;
 
 import lombok.SneakyThrows;
 
@@ -33,8 +34,7 @@ public static Path getRunningPath() {
 
   public static Path getRunningDir() {
     if (ImageInfo.inImageRuntimeCode()) {
-      return Paths.get(ProcessProperties.getExecutableName())
-          .getParent();
+      return ProcessProperties.getRunningPath();
     }
     final var path = getRunningPath();
     if (isJar(path)) {

src/test/java/com/mageddo/dnsproxyserver/sandbox/DpsBinaryExecutableFinderIntTest.java

@@ -1,6 +1,7 @@
 package com.mageddo.dnsproxyserver.sandbox;
 
-import org.graalvm.nativeimage.ImageInfo;
+import com.mageddo.graalvm.ImageInfo;
+
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;