endgen-dist/src/assembly/src.xml

@@ -11,13 +11,28 @@
     <files>
         <file>
             <source>src/main/resources/run.sh</source>
-            <outputDirectory/>
+            <outputDirectory></outputDirectory>
             <filtered>true</filtered>
         </file>
     </files>
     <dependencySets>
         <dependencySet>
             <outputDirectory>libs</outputDirectory>
+            <excludes>
+                <exclude>nu.zoom.dsl:parser:*</exclude>
+            </excludes>
+            <useStrictFiltering>true</useStrictFiltering>
+            <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}</outputFileNameMapping>
+            <useTransitiveDependencies>true</useTransitiveDependencies>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <useProjectArtifact>false</useProjectArtifact>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>nu.zoom.dsl:parser:*</include>
+            </includes>
             <useStrictFiltering>true</useStrictFiltering>
             <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}</outputFileNameMapping>
             <useTransitiveDependencies>true</useTransitiveDependencies>

endgen-dist/src/main/resources/run.sh

@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
-set -euo pipefail
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-java --module-path "${SCRIPT_DIR}"/libs -m nu.zoom.endgen/nu.zoom.dsl.cli.EndpointsCLI "$@"
+cd "${SCRIPT_DIR}"
+java -jar parser-${artifact.baseVersion}.jar "$@"

endgen-jlink/pom.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-// Copyright 2025 "Johan Maasing" <johan@zoom.nu>
-//
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>nu.zoom.dsl</groupId>
-        <artifactId>endgen</artifactId>
-        <version>1.3-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>endgen-jlink</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>nu.zoom.dsl</groupId>
-            <artifactId>parser</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jlink-plugin</artifactId>
-                <version>3.2.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <!-- configuration elements goes here -->
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

parser/pom.xml

@@ -52,7 +52,6 @@
                 <configuration>
                     <source>${maven.compiler.source}</source>
                     <target>${maven.compiler.target}</target>
-                    <release>${maven.compiler.target}</release>
                 </configuration>
             </plugin>
             <plugin>
@@ -62,9 +61,9 @@
                 <configuration>
                     <archive>
                         <manifest>
+                            <classpathPrefix>libs/</classpathPrefix>
+                            <addClasspath>true</addClasspath>
                             <mainClass>nu.zoom.dsl.cli.EndpointsCLI</mainClass>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
                         </manifest>
                     </archive>
                 </configuration>

parser/src/main/java/module-info.java

@@ -1,6 +0,0 @@
-module nu.zoom.endgen {
-    requires freemarker;
-    requires info.picocli;
-    requires org.antlr.antlr4.runtime;
-    opens nu.zoom.dsl.cli to info.picocli;
-}

pom.xml

@@ -66,7 +66,6 @@
         <module>parser</module>
         <module>endgen-dist</module>
         <module>endgen-maven-plugin</module>
-        <module>endgen-jlink</module>
     </modules>
 
 </project>