diff --git a/Dockerfile b/Dockerfile index 4f2105e..185acc1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV TOMCAT_MAJOR=9 \ ##shib-idp \ VERSION=4.1.4 \ ##TIER \ - TIERVERSION=20211214 \ + TIERVERSION=20211220 \ #################### \ #### OTHER VARS #### \ #################### \ @@ -160,12 +160,12 @@ ADD container_files/idp/idp.xml /usr/local/tomcat/conf/Catalina/idp.xml ADD container_files/tomcat/server.xml /usr/local/tomcat/conf/server.xml #use log4j for tomcat logging -#ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.15.0/log4j-core-2.15.0.jar /usr/local/tomcat/bin/ -COPY container_files/tomcat/log4j-core-2.16.0.jar /usr/local/tomcat/bin/ -#ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.15.0/log4j-api-2.15.0.jar /usr/local/tomcat/bin/ -COPY container_files/tomcat/log4j-api-2.16.0.jar /usr/local/tomcat/bin/ -#ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul/2.15.0/log4j-jul-2.15.0.jar /usr/local/tomcat/bin/ -COPY container_files/tomcat/log4j-jul-2.16.0.jar /usr/local/tomcat/bin/ +#ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.17.0/log4j-core-2.17.0.jar /usr/local/tomcat/bin/ +COPY container_files/tomcat/log4j-core-2.17.0.jar /usr/local/tomcat/bin/ +#ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar /usr/local/tomcat/bin/ +COPY container_files/tomcat/log4j-api-2.17.0.jar /usr/local/tomcat/bin/ +#ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul/2.17.0/log4j-jul-2.17.0.jar /usr/local/tomcat/bin/ +COPY container_files/tomcat/log4j-jul-2.17.0.jar /usr/local/tomcat/bin/ RUN cd /usr/local/tomcat/; \ chmod +r bin/log4j-*.jar; diff --git a/container_files/tomcat/log4j-api-2.16.0.jar b/container_files/tomcat/log4j-api-2.16.0.jar deleted file mode 100644 index 2fea718..0000000 Binary files a/container_files/tomcat/log4j-api-2.16.0.jar and /dev/null differ diff --git a/container_files/tomcat/log4j-api-2.15.0.jar b/container_files/tomcat/log4j-api-2.17.0.jar similarity index 80% rename from container_files/tomcat/log4j-api-2.15.0.jar rename to container_files/tomcat/log4j-api-2.17.0.jar index a662571..e39dab0 100644 Binary files a/container_files/tomcat/log4j-api-2.15.0.jar and b/container_files/tomcat/log4j-api-2.17.0.jar differ diff --git a/container_files/tomcat/log4j-core-2.16.0.jar b/container_files/tomcat/log4j-core-2.16.0.jar deleted file mode 100644 index 6a2365b..0000000 Binary files a/container_files/tomcat/log4j-core-2.16.0.jar and /dev/null differ diff --git a/container_files/tomcat/log4j-core-2.15.0.jar b/container_files/tomcat/log4j-core-2.17.0.jar similarity index 82% rename from container_files/tomcat/log4j-core-2.15.0.jar rename to container_files/tomcat/log4j-core-2.17.0.jar index f7e14b8..b853057 100644 Binary files a/container_files/tomcat/log4j-core-2.15.0.jar and b/container_files/tomcat/log4j-core-2.17.0.jar differ diff --git a/container_files/tomcat/log4j-jul-2.16.0.jar b/container_files/tomcat/log4j-jul-2.16.0.jar deleted file mode 100644 index 7ff6bac..0000000 Binary files a/container_files/tomcat/log4j-jul-2.16.0.jar and /dev/null differ diff --git a/container_files/tomcat/log4j-jul-2.15.0.jar b/container_files/tomcat/log4j-jul-2.17.0.jar similarity index 76% rename from container_files/tomcat/log4j-jul-2.15.0.jar rename to container_files/tomcat/log4j-jul-2.17.0.jar index 99ef096..44c8ea2 100644 Binary files a/container_files/tomcat/log4j-jul-2.15.0.jar and b/container_files/tomcat/log4j-jul-2.17.0.jar differ