Update Camunda to 7.20.0, Tomcat to 9.0.75

.github/workflows/camunda.yml

@@ -78,7 +78,7 @@ jobs:
 
       - name: Show CWS Log
         run: |
-          cd dist/console-only/cws/server/apache-tomcat-9.0.72/logs
+          cd dist/console-only/cws/server/apache-tomcat-9.0.75/logs
           ls -al
 
       - name: Set up Google Chrome
@@ -201,7 +201,7 @@ jobs:
 
       - name: Show CWS Log
         run: |
-          cd dist/console-only/cws/server/apache-tomcat-9.0.72/logs
+          cd dist/console-only/cws/server/apache-tomcat-9.0.75/logs
           ls -al
 
       - name: Set up Google Chrome

.github/workflows/ldap.yml

@@ -83,7 +83,7 @@ jobs:
 
       - name: Show CWS Log
         run: |
-          cd dist/console-only/cws/server/apache-tomcat-9.0.72/logs
+          cd dist/console-only/cws/server/apache-tomcat-9.0.75/logs
           ls -al
 
       - name: Set up Google Chrome

create_server_dist.sh

@@ -22,8 +22,10 @@ print 'Creating new CWS distribution directory...'
 mkdir -p ${CWS}/{bpmn,config/templates,installer,logs,upgrade,sql/cws}
 
 print 'Unzipping Camunda into distribution...'
-unzip ${INSTALL_DIR}/cws_camunda-bpm-tomcat-${CAMUNDA_VER}.zip -x start-camunda.bat start-camunda.sh -d ${CWS} > ${CWS}/logs/camunda_extract.log 2>&1
-unzip ${INSTALL_DIR}/cws_camunda-bpm-tomcat-${CAMUNDA_VER}-lib.zip -d ${CWS}/lib > ${CWS}/logs/camunda_extract.log 2>&1
+print "unzip ${INSTALL_DIR}/cws_camunda-bpm-tomcat-${CAMUNDA_VER}.zip -d ${CWS} > ${CWS}/logs/camunda_extract_main.log 2>&1"
+unzip ${INSTALL_DIR}/cws_camunda-bpm-tomcat-${CAMUNDA_VER}.zip -x start-camunda.bat start-camunda.sh -d ${CWS} > ${CWS}/logs/camunda_extract_main.log 2>&1
+print "unzip ${INSTALL_DIR}/cws_camunda-bpm-tomcat-${CAMUNDA_VER}-lib.zip -d ${CWS}/lib > ${CWS}/logs/camunda_extract_lib.log 2>&1"
+unzip ${INSTALL_DIR}/cws_camunda-bpm-tomcat-${CAMUNDA_VER}-lib.zip -d ${CWS}/lib > ${CWS}/logs/camunda_extract_lib.log 2>&1
 
 if [[ $? -gt 0 ]]; then
     print "ERROR: failed to unzip Camunda distribution, check ${CWS}/logs/camunda_extract.log for details."

cws-test/src/test/resources/bpmn/test_groovy_script.bpmn

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_0o3i0xe" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.9.0" modeler:executionPlatform="Camunda Platform" modeler:executionPlatformVersion="7.19.0">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_0o3i0xe" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.9.0" modeler:executionPlatform="Camunda Platform" modeler:executionPlatformVersion="7.20.0">
   <bpmn:process id="test_groovy_script" name="Test Groovy Script" isExecutable="true">
     <bpmn:startEvent id="StartEvent_1" camunda:asyncBefore="true">
       <bpmn:outgoing>Flow_0bwb8b7</bpmn:outgoing>

install/camunda_mods/admin/index.html

@@ -32,11 +32,11 @@
 
 
     <!-- styles -->
-    <link href="$APP_ROOT/app/admin/styles/styles.css?bust=7.19.0"
+    <link href="$APP_ROOT/app/admin/styles/styles.css?bust=7.20.0"
           rel="stylesheet" />
     <link rel="stylesheet"
           type="text/css"
-          href="$APP_ROOT/app/admin/styles/user-styles.css?bust=7.19.0">
+          href="$APP_ROOT/app/admin/styles/user-styles.css?bust=7.20.0">
 
     <!-- favicon -->
     <link rel="shortcut icon"
@@ -102,7 +102,7 @@
 
     <!-- footer -->
     <footer cam-widget-footer
-            version="v7.19.0"></footer>
+            version="v7.20.0"></footer>
 
     <script type="application/javascript" $CSP_NONCE>
       var adminConf = window.camAdminConf = {};
@@ -123,11 +123,11 @@
 window.__require = window.require;
 window.define = undefined;
 window.require = undefined;
-window.bust = '7.19.0';
+window.bust = '7.20.0';
 
 requirejs.config({
   baseUrl: '$APP_ROOT/app/admin',
-  urlArgs: 'bust=7.19.0'
+  urlArgs: 'bust=7.20.0'
 });
 requirejs(['$APP_ROOT/lib/deps.js'], function () {
   requirejs(['$APP_ROOT/app/admin/camunda-admin-bootstrap.js'], function () {});

install/camunda_mods/cockpit/index.html

@@ -33,13 +33,13 @@
 
 
     <!-- styles -->
-    <link href="$APP_ROOT/app/cockpit/styles/styles.css?bust=7.19.0"
+    <link href="$APP_ROOT/app/cockpit/styles/styles.css?bust=7.20.0"
           rel="stylesheet" />
-    <link href="$APP_ROOT/app/cockpit/styles/styles-components.css?bust=7.19.0"
+    <link href="$APP_ROOT/app/cockpit/styles/styles-components.css?bust=7.20.0"
           rel="stylesheet" />
     <link rel="stylesheet"
           type="text/css"
-          href="$APP_ROOT/app/cockpit/styles/user-styles.css?bust=7.19.0">
+          href="$APP_ROOT/app/cockpit/styles/user-styles.css?bust=7.20.0">
 
     <!-- favicon -->
     <link rel="shortcut icon"
@@ -105,7 +105,7 @@
 
     <!-- footer -->
     <footer cam-widget-footer
-            version="v7.19.0"></footer>
+            version="v7.20.0"></footer>
 
     <script type="application/javascript" $CSP_NONCE>
       var cockpitConf = window.camCockpitConf = {};
@@ -126,11 +126,11 @@
 window.__require = window.require;
 window.define = undefined;
 window.require = undefined;
-window.bust = '7.19.0';
+window.bust = '7.20.0';
 
 requirejs.config({
   baseUrl: '$APP_ROOT/app/cockpit',
-  urlArgs: 'bust=7.19.0'
+  urlArgs: 'bust=7.20.0'
 });
 requirejs(['$APP_ROOT/lib/deps.js'], function () {
   requirejs(['$APP_ROOT/app/cockpit/camunda-cockpit-bootstrap.js'], function(){});

install/cws-ui/documentation.ftl

@@ -74,7 +74,7 @@
 						<td><a href="https://github.com/NASA-AMMOS/common-workflow-service/wiki" target="_blank">CWS Wiki</a></td>
 					</tr>
 					<tr>
-						<td><a href="https://docs.camunda.org/manual/7.19/reference/bpmn20/" target="_blank">Camunda BPMN 2.0 Implementation Reference</a></td>
+						<td><a href="https://docs.camunda.org/manual/7.20/reference/bpmn20/" target="_blank">Camunda BPMN 2.0 Implementation Reference</a></td>
 					</tr>
 					<tr>
 						<td><a href="http://www.bpmnquickguide.com/quickguide/index.html" target="_blank">BP Incubator BPMN Quick Guide</a></td>

install/cws-ui/snippets.ftl

@@ -64,7 +64,7 @@
 					<br/>
 					<b>NOTE:</b> <b>For each external code library (JAR)</b> (referenced by Java import statements) <b>put the JAR in the following place</b>:
 					<ul>
-						<li>CWS Console Server: <pre>cws/server/apache-tomcat-9.0.72/lib</pre></li>
+						<li>CWS Console Server: <pre>cws/server/apache-tomcat-9.0.75/lib</pre></li>
 					</ul>
 					<br/>
 				</form>

install/docker/console-db-es-ls-kibana/docker-compose.yml

@@ -122,7 +122,7 @@ services:
       retries: 12
     volumes:
       - ./config.properties:/home/cws_user/config.properties:ro
-      - console-logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.72/logs
+      - console-logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.75/logs
   cws-worker:
     container_name: cws-worker1
     labels:
@@ -146,7 +146,7 @@ services:
       - ES_PORT=9200
     volumes:
       - ./worker-config.properties:/home/cws_user/config.properties:ro
-      - worker1-logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.72/logs
+      - worker1-logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.75/logs
 
 volumes:
   console-logs-volume:

install/docker/cws-image/startup.sh

@@ -3,10 +3,10 @@
 javac -cp joda-time-2.1.jar getTime.java
 java -cp .:joda-time-2.1.jar getTime
 
-ls /home/cws_user/cws/server/apache-tomcat-9.0.72/logs
+ls /home/cws_user/cws/server/apache-tomcat-9.0.75/logs
 
 # Clear out any previous logs before starting (Note: Previous logs will cause CWS not to start)
-rm -rf /home/cws_user/cws/server/apache-tomcat-9.0.72/logs/*
+rm -rf /home/cws_user/cws/server/apache-tomcat-9.0.75/logs/*
 
 cd cws
 ./configure.sh ../config.properties Y

pom.xml

@@ -24,7 +24,7 @@
 		<activeio-core.version>3.1.4</activeio-core.version>
 		<software.amazon.awssdk.version>2.16.93</software.amazon.awssdk.version>
 		<!-- <boon.version>0.12</boon.version> -->
-		<camunda.version>7.19.0</camunda.version>
+		<camunda.version>7.20.0</camunda.version>
 		<camunda-spin.version>1.9.0</camunda-spin.version>
 		<commons-compress.version>1.21</commons-compress.version>
 		<commons-configuration.version>1.10</commons-configuration.version>
@@ -79,7 +79,7 @@
 		<skip.integration.tests>false</skip.integration.tests>
 		<spring.framework.version>5.2.20.RELEASE</spring.framework.version>
 		<surefire.version>2.22.2</surefire.version>
-		<tomcat-catalina.version>9.0.72</tomcat-catalina.version>
+		<tomcat-catalina.version>9.0.75</tomcat-catalina.version>
 		<urlrewritefilter.version>4.0.3</urlrewritefilter.version>
 		<xbean-spring.version>3.17</xbean-spring.version>
 		<xmlunit.version>2.6.2</xmlunit.version>

utils.sh

@@ -6,8 +6,8 @@
 
 # Update versions as necessary
 export CWS_VER='2.5.0'    # update this each CWS release
-export CAMUNDA_VER='7.19.0'
-export TOMCAT_VER='9.0.72'
+export CAMUNDA_VER='7.20.0'
+export TOMCAT_VER='9.0.75'
 export LOGSTASH_VER='8.8.0'
 
 # Prints the provided string, tagging with the script that called it