Commit d9d43927 authored by Andrew Twyman's avatar Andrew Twyman

Merge branch 'public-master' into github-master

parents ef80f529 3b81ae2a
...@@ -28,6 +28,10 @@ if [[ "$java_version" == 1.[6-7] ]]; then ...@@ -28,6 +28,10 @@ if [[ "$java_version" == 1.[6-7] ]]; then
jvm_args+=(-XX:MaxPermSize=256M) # Not relevant to JDK 1.8+ jvm_args+=(-XX:MaxPermSize=256M) # Not relevant to JDK 1.8+
fi fi
if [[ "$DJINNI_SBT_BOOT_PROPERTIES" != "" ]]; then
jvm_args+=(-Dsbt.boot.properties="$DJINNI_SBT_BOOT_PROPERTIES")
fi
java \ java \
-Xms512M -Xmx1024M -Xss1M -XX:+CMSClassUnloadingEnabled "${jvm_args[@]}" \ -Xms512M -Xmx1024M -Xss1M -XX:+CMSClassUnloadingEnabled "${jvm_args[@]}" \
-Djava.security.manager -Djava.security.policy="$base_dir/sbt.security.policy" \ -Djava.security.manager -Djava.security.policy="$base_dir/sbt.security.policy" \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment