feat(7.20): upgrade to camunda 7.20.0

README.md

@@ -10,6 +10,6 @@ Patterns for enabling JSON Logging on the Tomcat distribution of Camunda BPM Pla
 
 ## Docker
 
-| Version | Description |
-| ------- | ----------- |
-| [7.9.0](./tomcat/7.9.0/docker) | Docker base image for pulling into other projects or use as a `docker run` command.  Modifies Tomcat logging for usage with Logback, SLFJ4, and JSON logging using logstash-logback-encoder.
+| Version                          | Description |
+|----------------------------------| ----------- |
+| [7.20.0](./tomcat/7.20.0/docker) | Docker base image for pulling into other projects or use as a `docker run` command.  Modifies Tomcat logging for usage with Logback, SLFJ4, and JSON logging using logstash-logback-encoder.

tomcat/7.9.0/docker/Dockerfile → tomcat/7.20.0/docker/Dockerfile

@@ -1,10 +1,11 @@
 # Pull upstream CamundaBPM Tomcat image
-FROM camunda/camunda-bpm-platform:tomcat-7.9.0
+FROM camunda/camunda-bpm-platform:tomcat-7.20.0
 
 ENV PRETTY_JSON_LOG=false
 
-# Remove the slf4j-jdj14 bridge library that is packaged with CamundaBPM tomcat distribution
-RUN rm -rf /camunda/lib/slf4j-jdk14-1.7.7.jar
+# Remove the slf4j-jdj14 bridge and slf4j-api libraries that are packaged with CamundaBPM tomcat distribution
+RUN rm -rf /camunda/lib/slf4j-jdk14-1.7.26.jar
+RUN rm -rf /camunda/lib/slf4j-api-1.7.26.jar
 
 # Add logback configuration
 RUN mkdir /camunda/conf/logback

tomcat/7.9.0/docker/docker-compose.yml → tomcat/7.20.0/docker/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.2'
+version: '3.4'
 
 services:
   camunda:

tomcat/7.9.0/docker/docker/camunda/bin/setenv.sh → tomcat/7.20.0/docker/docker/camunda/bin/setenv.sh

@@ -1,4 +1,4 @@
-export CATALINA_OPTS="-Xmx512m -XX:MaxPermSize=256m -XX:PermSize=256m"
+export CATALINA_OPTS="-Xmx512m"
 
 # Sets the initial classpath to have the needed JUL->SLF4J jars + the logstash/Logback libraries
 CLASSPATH=$CATALINA_HOME/lib/camunda-json-logging-tomcat-${CAMUNDA_VERSION}.jar:$CATALINA_HOME/conf/logback/

tomcat/7.20.0/json-logging-dependency-package/.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar