This is the suggested patch in full: diff --git a/debian/changelog b/debian/changelog index 9e1dab71..8014c9e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +tomcat9 (9.0.16-4) UNRELEASED; urgency=medium + + * Team upload. + * Remove -XX:+UseG1GC from standard JAVA_OPTS; the JRE chooses + a suitable GC automatically anyway (Closes: #925928) + + -- Thorsten Glaser <t...@mirbsd.de> Thu, 28 Mar 2019 18:47:17 +0100 + tomcat9 (9.0.16-3) unstable; urgency=medium * Removed read/write access to /var/lib/solr (Closes: #923299) diff --git a/debian/default.template b/debian/default.template index 7c36a23b..f75801b0 100644 --- a/debian/default.template +++ b/debian/default.template @@ -3,9 +3,10 @@ # OpenJDK and the Oracle JDK are tried. #JAVA_HOME=/usr/lib/jvm/java-8-openjdk -# You may pass JVM startup parameters to Java here. If unset, the default -# options will be: -Djava.awt.headless=true -XX:+UseG1GC -JAVA_OPTS="-Djava.awt.headless=true -XX:+UseG1GC" +# You may pass JVM startup parameters to Java here. If you run Tomcat with +# Java 8 instead of 9 or newer, add "-XX:+UseG1GC" to select a suitable GC. +# If unset, the default options will be: -Djava.awt.headless=true +JAVA_OPTS="-Djava.awt.headless=true" # To enable remote debugging uncomment the following line. # You will then be able to use a Java debugger on port 8000. diff --git a/debian/setenv.sh b/debian/setenv.sh index 3eb3be4a..ee74c834 100755 --- a/debian/setenv.sh +++ b/debian/setenv.sh @@ -8,5 +8,5 @@ CATALINA_HOME=/usr/share/tomcat9 # Default Java options if [ -z "$JAVA_OPTS" ]; then - JAVA_OPTS="-Djava.awt.headless=true -XX:+UseG1GC" + JAVA_OPTS="-Djava.awt.headless=true" fi
If acceptable, I’ll add it to master. (I’m still working on the init script, but it’s almost done.) bye, //mirabilos -- tarent solutions GmbH Rochusstraße 2-4, D-53123 Bonn • http://www.tarent.de/ Tel: +49 228 54881-393 • Fax: +49 228 54881-235 HRB 5168 (AG Bonn) • USt-ID (VAT): DE122264941 Geschäftsführer: Dr. Stefan Barth, Kai Ebenrett, Boris Esser, Alexander Steeg ********** Mit der tarent Academy bieten wir auch Trainings und Schulungen in den Bereichen Softwareentwicklung, Agiles Arbeiten und Zukunftstechnologien an. Besuchen Sie uns auf www.tarent.de/academy. Wir freuen uns auf Ihren Kontakt. **********
