# HG changeset patch
# User belknapSSDT <zach.belknap@mcoecn.org>
# Date 1716578839 14400
# Node ID d1050dda4be239f095cfaf6c1a3f19ce0c0f1bc6
# Parent  09607475c22d847c0e5f458c0004ae179e8ff996
back to catalina_opts

diff -r 09607475c22d -r d1050dda4be2 tomcat-17/Dockerfile
--- a/tomcat-17/Dockerfile	Fri May 24 15:14:30 2024 -0400
+++ b/tomcat-17/Dockerfile	Fri May 24 15:27:19 2024 -0400
@@ -2,7 +2,6 @@
 
 MAINTAINER Marc Davis <davis@ssdt-ohio.org>
 
-
 RUN apt-get update && apt-get install -y gnupg && apt-get install -y apt-transport-https \
     && gpg --no-default-keyring --keyring /etc/apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg  --export > /etc/apt/trusted.gpg.d/ubuntu-keyring.fixed.gpg \
     && gpg --no-default-keyring --keyring /etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg  --export > /etc/apt/trusted.gpg.d/ubuntu-keyring.fixed.gpg \
diff -r 09607475c22d -r d1050dda4be2 tomcat-17/setenv17.sh
--- a/tomcat-17/setenv17.sh	Fri May 24 15:14:30 2024 -0400
+++ b/tomcat-17/setenv17.sh	Fri May 24 15:27:19 2024 -0400
@@ -7,7 +7,7 @@
 export CATALINA_OPTS="$CATALINA_OPTS -Djava.security.egd=file:/dev/./urandom"
 export CATALINA_OPTS="$CATALINA_OPTS -Duser.language=en"
 export CATALINA_OPTS="$CATALINA_OPTS -Duser.region=US"
-export JAVA_OPTS="$JAVA_OPTS --add-exports=java.xml/com.sun.org.apache.xml.internal.serialize=ALL-UNNAMED"
+export CATALINA_OPTS="$CATALINA_OPTS --add-exports=java.xml/com.sun.org.apache.xml.internal.serialize=ALL-UNNAMED"
 
 echo "Using CATALINA_OPTS $CATALINA_OPTS"
 echo "Using     JAVA_OPTS $JAVA_OPTS"