Update Camunda to v7.17 (#133)

* Update Camunda to v7.17
Remove cws_camunda-bpm-tomcat-7.16.0.zip
Add cws_camunda-bpm-tomcat-7.17.0.zip
Add cws_camunda-bpm-tomcat-7.17.0-lib.zip
Update create_server_dist.sh
Refactor for Apache Tomcat 9.0.58
Refactor for Camunda 7.17
Update Camunda testing dependencies
Disable download of Git-LFS files for all workflows
Remove .gitattributes

* Update GSON and Mockito dependencies

* Display task worker metrics by default
Update camunda_mods

* Add Session Cookie filter

.github/workflows/README.md

@@ -24,9 +24,7 @@ The `publish-cws-image` job is the CD component of the workflow, triggered upon
   - MariaDB
     - Image: mariadb:10.3
     - Ports: 3306:3306
-- [**checkout**](https://github.com/marketplace/actions/checkout):
-  - This action checks out the repository under `$GITHUB_WORKSPACE`, so the workflow can access it.
-  - `lfs` is set to `true`, enabling the download of Git-LFS files. Starting with Camunda 7.16, this is required because the Camunda Platform with Tomcat distribution bundled with CWS exceeds GitHub's file size limit of 100 MB.
+- [**checkout**](https://github.com/marketplace/actions/checkout): This action checks out the repository under `$GITHUB_WORKSPACE`, so the workflow can access it.
 - Set up JDK 8:
   - [**setup-java**](https://github.com/marketplace/actions/setup-java-jdk): This action downloads and sets up a requested version of Java
   - Current configuration:

.github/workflows/camunda.yml

@@ -32,8 +32,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
 
       - name: Set up JDK 8
         uses: actions/setup-java@v3
@@ -80,7 +78,7 @@ jobs:
 
       - name: Show CWS Log
         run: |
-          cd dist/console-only/cws/server/apache-tomcat-9.0.52/logs
+          cd dist/console-only/cws/server/apache-tomcat-9.0.58/logs
           ls -al
 
       - name: Set up Google Chrome
@@ -157,8 +155,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
 
       - name: Set up JDK 8
         uses: actions/setup-java@v3
@@ -205,7 +201,7 @@ jobs:
 
       - name: Show CWS Log
         run: |
-          cd dist/console-only/cws/server/apache-tomcat-9.0.52/logs
+          cd dist/console-only/cws/server/apache-tomcat-9.0.58/logs
           ls -al
 
       - name: Set up Google Chrome

.github/workflows/ldap.yml

@@ -32,8 +32,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
 
       - name: Set up JDK 8
         uses: actions/setup-java@v3
@@ -85,7 +83,7 @@ jobs:
 
       - name: Show CWS Log
         run: |
-          cd dist/console-only/cws/server/apache-tomcat-9.0.52/logs
+          cd dist/console-only/cws/server/apache-tomcat-9.0.58/logs
           ls -al
 
       - name: Set up Google Chrome

create_server_dist.sh

@@ -23,6 +23,7 @@ mkdir -p ${CWS}/{bpmn,config/templates,installer,logs,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
 
 if [[ $? -gt 0 ]]; then
     print "ERROR: failed to unzip Camunda distribution, check ${CWS}/logs/camunda_extract.log for details."

cws-adaptation-engine/pom.xml

@@ -26,7 +26,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.camunda.bpm.assert</groupId>
+			<groupId>org.camunda.bpm</groupId>
 			<artifactId>camunda-bpm-assert</artifactId>
 			<exclusions>
 				<exclusion>

cws-core/pom.xml

@@ -100,7 +100,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.camunda.bpm.assert</groupId>
+			<groupId>org.camunda.bpm</groupId>
 			<artifactId>camunda-bpm-assert</artifactId>
 			<exclusions>
 				<exclusion>

cws-engine-service/pom.xml

@@ -77,7 +77,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.camunda.bpm.assert</groupId>
+			<groupId>org.camunda.bpm</groupId>
 			<artifactId>camunda-bpm-assert</artifactId>
 			<exclusions>
 				<exclusion>

cws-service/pom.xml

@@ -71,7 +71,7 @@
 				</dependency>
 
 				<dependency> <!-- FOR TESTING -->
-					<groupId>org.camunda.bpm.assert</groupId>
+					<groupId>org.camunda.bpm</groupId>
 					<artifactId>camunda-bpm-assert</artifactId>
 					<exclusions>
 						<exclusion>

cws-test/pom.xml

@@ -91,7 +91,7 @@
 		</dependency>
 
 		<dependency>
-            <groupId>org.camunda.bpm.assert</groupId>
+            <groupId>org.camunda.bpm</groupId>
             <artifactId>camunda-bpm-assert</artifactId>
 			<exclusions>
 				<exclusion>

install/camunda_mods/admin/config.js

@@ -35,7 +35,7 @@ export default {
         // http://requirejs.org/docs/api.html#config
         deps: ['jquery', 'cws'],
         paths: {
-            // if you have a folder called `custom-ui` (in the `cockpit` folder)
+            // if you have a folder called `custom-ui` (in the `admin` folder)
             // with a file called `scripts.js` in it and defining the `custom-ui` AMD module
             'cws': 'cws/scripts'
         }
@@ -49,6 +49,7 @@ export default {
     //     'unit': 'day'
     //   }
     // },
+    'alwaysShowUniqueTaskWorkerMetrics': true,
     // 'locales': {
     //   'availableLocales': ['en', 'de'],
     //   'fallbackLocale': 'en'

install/camunda_mods/admin/index.html

@@ -32,11 +32,11 @@
 
 
     <!-- styles -->
-    <link href="$APP_ROOT/app/admin/styles/styles.css?bust=7.16.0"
+    <link href="$APP_ROOT/app/admin/styles/styles.css?bust=7.17.0"
           rel="stylesheet" />
     <link rel="stylesheet"
           type="text/css"
-          href="$APP_ROOT/app/admin/styles/user-styles.css?bust=7.16.0">
+          href="$APP_ROOT/app/admin/styles/user-styles.css?bust=7.17.0">
 
     <!-- favicon -->
     <link rel="shortcut icon"
@@ -130,7 +130,7 @@
 
     <!-- footer -->
     <footer cam-widget-footer
-            version="v7.16.0"></footer>
+            version="v7.17.0"></footer>
 
     <script type="application/javascript">
       var adminConf = window.camAdminConf = {};
@@ -156,11 +156,11 @@
 window.__require = window.require;
 window.define = undefined;
 window.require = undefined;
-window.bust = '7.16.0';
+window.bust = '7.17.0';
 
 requirejs.config({
   baseUrl: '$APP_ROOT/app/admin',
-  urlArgs: 'bust=7.16.0'
+  urlArgs: 'bust=7.17.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.16.0"
+    <link href="$APP_ROOT/app/cockpit/styles/styles.css?bust=7.17.0"
           rel="stylesheet" />
-    <link href="$APP_ROOT/app/cockpit/styles/styles-components.css?bust=7.16.0"
+    <link href="$APP_ROOT/app/cockpit/styles/styles-components.css?bust=7.17.0"
           rel="stylesheet" />
     <link rel="stylesheet"
           type="text/css"
-          href="$APP_ROOT/app/cockpit/styles/user-styles.css?bust=7.16.0">
+          href="$APP_ROOT/app/cockpit/styles/user-styles.css?bust=7.17.0">
 
     <!-- favicon -->
     <link rel="shortcut icon"
@@ -133,7 +133,7 @@
 
     <!-- footer -->
     <footer cam-widget-footer
-            version="v7.16.0"></footer>
+            version="v7.17.0"></footer>
 
     <script type="application/javascript">
       var cockpitConf = window.camCockpitConf = {};
@@ -159,11 +159,11 @@
 window.__require = window.require;
 window.define = undefined;
 window.require = undefined;
-window.bust = '7.16.0';
+window.bust = '7.17.0';
 
 requirejs.config({
   baseUrl: '$APP_ROOT/app/cockpit',
-  urlArgs: 'bust=7.16.0'
+  urlArgs: 'bust=7.17.0'
 });
 requirejs(['$APP_ROOT/lib/deps.js'], function () {
   requirejs(['$APP_ROOT/app/cockpit/camunda-cockpit-bootstrap.js'], function(){});

install/camunda_mods/tasklist/config.js

@@ -44,7 +44,7 @@ export default {
         // http://requirejs.org/docs/api.html#config
         deps: ['jquery', 'cws'],
         paths: {
-            // if you have a folder called `custom-ui` (in the `cockpit` folder)
+            // if you have a folder called `custom-ui` (in the `scripts` folder)
             // with a file called `scripts.js` in it and defining the `custom-ui` AMD module
             'cws': 'cws/scripts'
         }

install/camunda_mods/tasklist/index.html

@@ -25,10 +25,10 @@
 
   <link rel="stylesheet"
         type="text/css"
-        href="$APP_ROOT/app/tasklist/styles/styles.css?bust=7.16.0">
+        href="$APP_ROOT/app/tasklist/styles/styles.css?bust=7.17.0">
   <link rel="stylesheet"
         type="text/css"
-        href="$APP_ROOT/app/tasklist/styles/user-styles.css?bust=7.16.0">
+        href="$APP_ROOT/app/tasklist/styles/user-styles.css?bust=7.17.0">
 
   <!-- favicon -->
   <link rel="shortcut icon"
@@ -108,7 +108,7 @@
 
   <!-- # page-footer -->
   <footer cam-widget-footer
-          version="v7.16.0"></footer>
+          version="v7.17.0"></footer>
 
 
   <script type="text/javascript">
@@ -142,11 +142,11 @@
 window.__require = window.require;
 window.define = undefined;
 window.require = undefined;
-window.bust = '7.16.0';
+window.bust = '7.17.0';
 
 requirejs.config({
   baseUrl: '$APP_ROOT/app/tasklist',
-  urlArgs: 'bust=7.16.0'
+  urlArgs: 'bust=7.17.0'
 });
 requirejs(['$APP_ROOT/lib/deps.js'], function () {
   requirejs(['$APP_ROOT/app/tasklist/camunda-tasklist-bootstrap.js'], function () {});

install/camunda_mods/web.xml

@@ -109,6 +109,20 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>
 
+  <!-- Session Cookie filter -->
+  <filter>
+    <filter-name>SessionCookieFilter</filter-name>
+    <filter-class>org.camunda.bpm.webapp.impl.security.filter.SessionCookieFilter</filter-class>
+    <!--<init-param>-->
+    <!--<param-name>enableSecureCookie</param-name>-->
+    <!--<param-value>true</param-value>-->
+    <!--</init-param>-->
+  </filter>
+  <filter-mapping>
+    <filter-name>SessionCookieFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
   <!-- HTTP Header Security Filter -->
   <filter>
     <filter-name>HttpHeaderSecurity</filter-name>

install/camunda_mods/welcome/config.js

@@ -32,7 +32,7 @@ export default {
         // http://requirejs.org/docs/api.html#config
         deps: ['jquery', 'cws'],
         paths: {
-            // if you have a folder called `custom-ui` (in the `cockpit` folder)
+            // if you have a folder called `custom-ui` (in the `scripts` folder)
             // with a file called `scripts.js` in it and defining the `custom-ui` AMD module
             'cws': 'cws/scripts'
         }

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.16/reference/bpmn20/" target="_blank">Camunda BPMN 2.0 Implementation Reference</a></td>
+						<td><a href="https://docs.camunda.org/manual/7.17/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

@@ -62,7 +62,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.52/lib</pre></li>
+						<li>CWS Console Server: <pre>cws/server/apache-tomcat-9.0.58/lib</pre></li>
 					</ul>
 					<br/>
 				</form>

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

@@ -121,7 +121,7 @@ services:
       retries: 12
     volumes:
       - ./config.properties:/home/cws_user/config.properties:ro
-      - logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.52/logs
+      - logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.58/logs
   cws-worker:
     container_name: cws-worker1
     labels:
@@ -145,7 +145,7 @@ services:
       - ES_PORT=9200
     volumes:
       - ./worker-config.properties:/home/cws_user/config.properties:ro
-      - logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.52/logs
+      - logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.58/logs
 
 volumes:
   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.52/logs
+ls /home/cws_user/cws/server/apache-tomcat-9.0.58/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.52/logs/*
+rm -rf /home/cws_user/cws/server/apache-tomcat-9.0.58/logs/*
 
 cd cws
 ./configure.sh ../config.properties Y

install/docker/worker-ls/docker-compose.yml

@@ -41,7 +41,7 @@ services:
       - ES_PORT=9200
     volumes:
       - ./config.properties:/home/cws_user/config.properties:ro
-      - logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.52/logs
+      - logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.58/logs
 
 volumes:
   logs-volume: