Update to PraxisCORE v6.3.0

Author: neilcsmith-net

codelerity-core-bin/pom.xml

@@ -33,7 +33,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.7.1</version>
         <executions>
           <execution>
             <id>make-bin</id>

codelerity-core-bin/src/main/java/com/codelerity/core/bin/Main.java

@@ -19,9 +19,17 @@
 package com.codelerity.core.bin;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Stream;
+import org.praxislive.core.types.PArray;
+import org.praxislive.core.types.PString;
 import org.praxislive.launcher.Launcher;
 
 public class Main {
@@ -32,35 +40,41 @@ public static void main(String[] args) {
 
     private static class LauncherCtxt implements Launcher.Context {
 
-        private final String command;
-        private final String modulePath;
-        private final String classPath;
-
         private LauncherCtxt() {
-            command = ProcessHandle.current().info().command().orElse("java");
-            modulePath = System.getProperty("jdk.module.path");
-            classPath = System.getProperty("java.class.path");
         }
 
         @Override
         public ProcessBuilder createChildProcessBuilder(List<String> javaOptions,
                 List<String> arguments) {
-            List<String> cmd = new ArrayList<>();
-            cmd.add(command);
-            cmd.addAll(javaOptions);
-            if (modulePath == null || modulePath.isEmpty()) {
-                cmd.add("-classpath");
-                cmd.add(classPath);
-                cmd.add("com.codelerity.core.bin.Main");
-            } else {
-                cmd.add("--add-modules=ALL-DEFAULT");
-                cmd.add("-p");
-                cmd.add(modulePath);
-                cmd.add("-m");
-                cmd.add("com.codelerity.core.bin/com.codelerity.core.bin.Main");
+            boolean isWindows = System.getProperty("os.name", "")
+                    .toLowerCase(Locale.ROOT).contains("windows");
+            String basedir = System.getProperty("app.home");
+            if (basedir == null || basedir.isBlank()) {
+                throw new IllegalStateException("Cannot find app.home");
             }
+            Path bin = Path.of(basedir, "bin");
+            Path launcher;
+            try (Stream<Path> files = Files.list(bin)) {
+                launcher = files.filter(f -> {
+                    boolean isCmd = f.toString().endsWith(".cmd");
+                    return isWindows ? isCmd : !isCmd && Files.isExecutable(f);
+                }).findFirst()
+                        .orElseThrow(() -> new IllegalStateException("Cannot find launcher"));
+
+            } catch (IOException ex) {
+                throw new IllegalStateException("Cannot find launcher", ex);
+            }
+            List<String> cmd = new ArrayList<>();
+            cmd.add(launcher.toString());
             cmd.addAll(arguments);
-            return new ProcessBuilder(cmd);
+            ProcessBuilder pb = new ProcessBuilder(cmd);
+            Map<String, String> env = pb.environment();
+            env.put("JAVA_HOME", System.getProperty("java.home"));
+            env.put("JAVA_OPTS", javaOptions.stream()
+                    .map(PString::of)
+                    .collect(PArray.collector())
+                    .toString());
+            return pb;
         }
 
         @Override

pom.xml

@@ -51,7 +51,7 @@
   </distributionManagement>
 
   <properties>
-    <praxiscore.version>6.2.0</praxiscore.version>
+    <praxiscore.version>6.3.0</praxiscore.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
@@ -60,7 +60,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.12.1</version>
+        <version>5.13.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -114,8 +114,8 @@
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>3.4.2</version>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>3.7.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -125,10 +125,15 @@
             <release>21</release>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.4.2</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.5.2</version>
+          <version>3.5.3</version>
           <configuration>
             <systemPropertyVariables>
               <junit.jupiter.execution.timeout.mode>disabled_on_debug</junit.jupiter.execution.timeout.mode>