diff --git a/endgen-dist/src/assembly/src.xml b/endgen-dist/src/assembly/src.xml index f741b9b..118ca91 100644 --- a/endgen-dist/src/assembly/src.xml +++ b/endgen-dist/src/assembly/src.xml @@ -11,13 +11,28 @@ src/main/resources/run.sh - + true libs + + nu.zoom.dsl:parser:* + + true + ${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension} + true + false + runtime + false + + + + + nu.zoom.dsl:parser:* + true ${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension} true diff --git a/endgen-dist/src/main/resources/run.sh b/endgen-dist/src/main/resources/run.sh index dfd0d8b..75894b3 100755 --- a/endgen-dist/src/main/resources/run.sh +++ b/endgen-dist/src/main/resources/run.sh @@ -1,4 +1,4 @@ -#! /bin/bash -set -euo pipefail +#! /bin/sh 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 "$@" \ No newline at end of file +cd "${SCRIPT_DIR}" +java -jar parser-${artifact.baseVersion}.jar "$@" \ No newline at end of file diff --git a/endgen-jlink/pom.xml b/endgen-jlink/pom.xml deleted file mode 100644 index 5aaa17d..0000000 --- a/endgen-jlink/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - 4.0.0 - - - nu.zoom.dsl - endgen - 1.3-SNAPSHOT - - - endgen-jlink - - - - nu.zoom.dsl - parser - ${project.parent.version} - - - - - - - org.apache.maven.plugins - maven-jlink-plugin - 3.2.0 - true - - - - - - - \ No newline at end of file diff --git a/parser/pom.xml b/parser/pom.xml index 8547faf..67c6925 100644 --- a/parser/pom.xml +++ b/parser/pom.xml @@ -52,7 +52,6 @@ ${maven.compiler.source} ${maven.compiler.target} - ${maven.compiler.target} @@ -62,9 +61,9 @@ + libs/ + true nu.zoom.dsl.cli.EndpointsCLI - true - true diff --git a/parser/src/main/java/module-info.java b/parser/src/main/java/module-info.java deleted file mode 100644 index 978869d..0000000 --- a/parser/src/main/java/module-info.java +++ /dev/null @@ -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; -} \ No newline at end of file diff --git a/pom.xml b/pom.xml index d8f01fa..82a7a48 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,6 @@ parser endgen-dist endgen-maven-plugin - endgen-jlink