Skip to content

Commit f74a85a

Browse files
committed
Fix JVM args string when no arguments are provided
1 parent 254e3fd commit f74a85a

3 files changed

Lines changed: 5 additions & 7 deletions

File tree

weaverbird-assembly/weaverbird-assembly-maven-plugin/src/main/java/com/techsenger/weaverbird/assembly/maven/plugin/AssembleDistMojo.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,14 @@ private void createOsScript(String modulePath, String ext, String jvmArgSep, Pat
9191
if (jvmArgs != null) {
9292
StringBuilder builder = new StringBuilder();
9393
for (var arg : jvmArgs) {
94-
if (builder.length() > 0) {
95-
builder.append("\n");
96-
}
94+
builder.append("\n");
9795
builder.append(" ");
9896
builder.append(arg);
9997
builder.append(jvmArgSep);
10098
}
10199
properties.put("jvmArgs", builder.toString());
100+
} else {
101+
properties.put("jvmArgs", "");
102102
}
103103
var shContent = String.join(System.lineSeparator(), readFile("framework" + ext));
104104
shContent = interpolate(shContent, properties);

weaverbird-assembly/weaverbird-assembly-maven-plugin/src/main/resources/com/techsenger/weaverbird/assembly/maven/plugin/framework.bat

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ java ^
2323
-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager ^
2424
-Dorg.jboss.logging.provider=log4j ^
2525
-Djava.io.tmpdir=%ROOT_PATH%\temp ^
26-
-Dfile.encoding=UTF-8 ^
27-
${jvmArgs}
26+
-Dfile.encoding=UTF-8 ^${jvmArgs}
2827
--add-modules ALL-DEFAULT ^
2928
--add-modules org.apache.logging.log4j,org.apache.logging.log4j.jul ^
3029
--add-opens java.base/java.time=com.techsenger.weaverbird.core ^

weaverbird-assembly/weaverbird-assembly-maven-plugin/src/main/resources/com/techsenger/weaverbird/assembly/maven/plugin/framework.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ java \
2424
-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager \
2525
-Dorg.jboss.logging.provider=log4j \
2626
-Djava.io.tmpdir="$ROOT_PATH/temp" \
27-
-Dfile.encoding=UTF-8 \
28-
${jvmArgs}
27+
-Dfile.encoding=UTF-8 \${jvmArgs}
2928
--add-modules ALL-DEFAULT \
3029
--add-modules org.apache.logging.log4j,org.apache.logging.log4j.jul \
3130
--add-opens java.base/java.time=com.techsenger.weaverbird.core \

0 commit comments

Comments
 (0)