diff --git a/server/jetty/build.gradle b/server/jetty/build.gradle index 442fc4e92c2..37653c73b9a 100644 --- a/server/jetty/build.gradle +++ b/server/jetty/build.gradle @@ -41,14 +41,7 @@ distributions { } } -def extraJvmArgs = [] -if (hasProperty('groovy')) { - extraJvmArgs = ['-Ddeephaven.console.type=groovy'] -} - -applicationName = 'start' -mainClassName = 'io.deephaven.server.jetty.JettyMain' -applicationDefaultJvmArgs = [ +def extraJvmArgs = [ '-server', '-XX:+UseG1GC', '-XX:MaxGCPauseMillis=100', @@ -66,10 +59,19 @@ applicationDefaultJvmArgs = [ '-XX:MinRAMPercentage=70.0', // the percentage of system memory that the JVM will use as maximum '-XX:MaxRAMPercentage=80.0', -] + extraJvmArgs - -apply plugin: 'io.deephaven.java-open-nio' - +] +if (hasProperty('groovy')) { + extraJvmArgs += ['-Ddeephaven.console.type=groovy'] +} tasks.withType(JavaExec) { - jvmArgs applicationDefaultJvmArgs + // This appends to the existing jvm args, so that java-open-nio still takes effect + jvmArgs extraJvmArgs } +tasks.withType(CreateStartScripts) { + defaultJvmOpts += extraJvmArgs +} + +applicationName = 'start' +mainClassName = 'io.deephaven.server.jetty.JettyMain' + +apply plugin: 'io.deephaven.java-open-nio' diff --git a/server/netty/build.gradle b/server/netty/build.gradle index f8dd7fee7bf..a06b0b5e132 100644 --- a/server/netty/build.gradle +++ b/server/netty/build.gradle @@ -33,14 +33,7 @@ distributions { } } -def extraJvmArgs = [] -if (hasProperty('groovy')) { - extraJvmArgs = ['-Ddeephaven.console.type=groovy'] -} - -applicationName = 'start' -mainClassName = 'io.deephaven.server.netty.NettyMain' -applicationDefaultJvmArgs = [ +def extraJvmArgs = [ '-server', '-XX:+UseG1GC', '-XX:MaxGCPauseMillis=100', @@ -58,14 +51,23 @@ applicationDefaultJvmArgs = [ '-XX:MinRAMPercentage=70.0', // the percentage of system memory that the JVM will use as maximum '-XX:MaxRAMPercentage=80.0', -] + extraJvmArgs +] +if (hasProperty('groovy')) { + extraJvmArgs += ['-Ddeephaven.console.type=groovy'] +} +tasks.withType(JavaExec) { + // This appends to the existing jvm args, so that java-open-nio still takes effect + jvmArgs extraJvmArgs +} +tasks.withType(CreateStartScripts) { + defaultJvmOpts += extraJvmArgs +} + +applicationName = 'start' +mainClassName = 'io.deephaven.server.netty.NettyMain' artifacts { applicationDist project.tasks.findByName('distTar') } apply plugin: 'io.deephaven.java-open-nio' - -tasks.withType(JavaExec) { - jvmArgs applicationDefaultJvmArgs -}