From dbcd35cfafb7f900a7955772cbbd14f6d231e2fe Mon Sep 17 00:00:00 2001
From: mchyzer <mchyzer@isc.upenn.edu>
Date: Wed, 4 Oct 2023 04:11:33 -0400
Subject: [PATCH] 4.7.0

---
 Dockerfile                                    |  4 +-
 .../grouperWebapp/WEB-INF/classes/log4j2.xml  | 49 ++++++++++++++++---
 container_files/tomcat/bin/setenv.sh          |  2 +-
 3 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 410abb4..cff101e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,8 +8,8 @@ LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
 
 ARG GROUPER_CONTAINER_VERSION
 
-ENV GROUPER_VERSION=4.6.0 \
-    GROUPER_CONTAINER_VERSION=4.6.0 \
+ENV GROUPER_VERSION=4.7.0 \
+    GROUPER_CONTAINER_VERSION=4.7.0 \
     JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto \
     PATH=$PATH:$JAVA_HOME/bin \
     GROUPER_HOME=/opt/grouper/grouperWebapp/WEB-INF
diff --git a/container_files/grouperWebapp/WEB-INF/classes/log4j2.xml b/container_files/grouperWebapp/WEB-INF/classes/log4j2.xml
index 967ee50..58a9f28 100644
--- a/container_files/grouperWebapp/WEB-INF/classes/log4j2.xml
+++ b/container_files/grouperWebapp/WEB-INF/classes/log4j2.xml
@@ -16,49 +16,84 @@
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1"/>
             </Policies>
-            <DefaultRolloverStrategy max="30" />
+            <DefaultRolloverStrategy>
+              <Delete basePath="/opt/grouper/logs/" maxDepth="1">
+                <IfFileName glob="catalina.out.*" />
+                <IfLastModified age="P30D" />
+              </Delete>
+            </DefaultRolloverStrategy>
         </RollingFile>
         <RollingFile name="file_grouper_error" fileName="/opt/grouper/logs/grouper.log" filePattern="/opt/grouper/logs/grouper.log.%d{yyyy-MM-dd}" >
             <PatternLayout pattern="${grouplogprefix}grouper_error.log;${env}${usertoken}${layout}"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1"/>
             </Policies>
-            <DefaultRolloverStrategy max="30" />
+            <DefaultRolloverStrategy>
+              <Delete basePath="/opt/grouper/logs/" maxDepth="1">
+                <IfFileName glob="grouper.log.*" />
+                <IfLastModified age="P30D" />
+              </Delete>
+            </DefaultRolloverStrategy>
         </RollingFile>
         <RollingFile name="file_grouper_daemon" fileName="/opt/grouper/logs/grouperDaemon.log" filePattern="/opt/grouper/logs/grouperDaemon.log.%d{yyyy-MM-dd}" >
             <PatternLayout pattern="${grouplogprefix}grouperDaemon.log;${env}${usertoken}${layout}"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1"/>
             </Policies>
-            <DefaultRolloverStrategy max="30" />
+            <DefaultRolloverStrategy>
+              <Delete basePath="/opt/grouper/logs/" maxDepth="1">
+                <IfFileName glob="grouperDaemon.log.*" />
+                <IfLastModified age="P30D" />
+              </Delete>
+            </DefaultRolloverStrategy>
         </RollingFile>
         <RollingFile name="file_grouper_pspng" fileName="/opt/grouper/logs/pspng.log" filePattern="/opt/grouper/logs/pspng.log.%d{yyyy-MM-dd}" >
             <PatternLayout pattern="${grouplogprefix}pspng.log;${env}${usertoken}${layout}"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1"/>
             </Policies>
-            <DefaultRolloverStrategy max="30" />
+            <DefaultRolloverStrategy>
+              <Delete basePath="/opt/grouper/logs/" maxDepth="1">
+                <IfFileName glob="pspng.log.*" />
+                <IfLastModified age="P30D" />
+              </Delete>
+            </DefaultRolloverStrategy>
         </RollingFile>
         <RollingFile name="file_grouper_provisioning" fileName="/opt/grouper/logs/provisioning.log" filePattern="/opt/grouper/logs/provisioning.log.%d{yyyy-MM-dd}" >
             <PatternLayout pattern="${grouplogprefix}provisioning.log;${env}${usertoken}${layout}"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1"/>
             </Policies>
-            <DefaultRolloverStrategy max="30" />
+            <DefaultRolloverStrategy>
+              <Delete basePath="/opt/grouper/logs/" maxDepth="1">
+                <IfFileName glob="provisioning.log.*" />
+                <IfLastModified age="P30D" />
+              </Delete>
+            </DefaultRolloverStrategy>
         </RollingFile>
         <RollingFile name="file_grouper_ws" fileName="/opt/grouper/logs/grouper_ws.log" filePattern="/opt/grouper/logs/grouper_ws.log.%d{yyyy-MM-dd}" >
             <PatternLayout pattern="${grouplogprefix}grouper_ws.log;${env}${usertoken}${layout}"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1"/>
             </Policies>
-            <DefaultRolloverStrategy max="30" />
+            <DefaultRolloverStrategy>
+              <Delete basePath="/opt/grouper/logs/" maxDepth="1">
+                <IfFileName glob="grouper_ws.log.*" />
+                <IfLastModified age="P30D" />
+              </Delete>
+            </DefaultRolloverStrategy>
         </RollingFile>
         <RollingFile name="file_grouper_ws_longRunning" fileName="/opt/grouper/logs/grouper_ws_longRunning.log" filePattern="/opt/grouper/logs/grouper_ws_longRunning.log.%d{yyyy-MM-dd}" >
             <PatternLayout pattern="${grouplogprefix}grouper_ws_longRunning.log;${env}${usertoken}${layout}"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1"/>
             </Policies>
-            <DefaultRolloverStrategy max="30" />
+            <DefaultRolloverStrategy>
+              <Delete basePath="/opt/grouper/logs/" maxDepth="1">
+                <IfFileName glob="grouper_ws_longRunning.log.*" />
+                <IfLastModified age="P30D" />
+              </Delete>
+            </DefaultRolloverStrategy>
         </RollingFile>
         __FILEEND__
         __LOGPIPESTART__
diff --git a/container_files/tomcat/bin/setenv.sh b/container_files/tomcat/bin/setenv.sh
index 87d4539..2411f27 100755
--- a/container_files/tomcat/bin/setenv.sh
+++ b/container_files/tomcat/bin/setenv.sh
@@ -1,5 +1,5 @@
 CLASSPATH=/opt/tomcat/bin/*
-GROUPER_ADD_OPENS="--add-opens java.base/java.lang=ALL-UNNAMED \
+GROUPER_ADD_OPENS="--add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED \
   --add-opens java.base/java.util=ALL-UNNAMED \
   --add-opens java.sql/java.sql=ALL-UNNAMED"
 #JAVA_OPTS="-Dlog4j.configurationFile=/opt/tomcat/conf/log4j2.xml -DENV=$ENV -DUSERTOKEN=$USERTOKEN"