NASA-AMMOS · jamesfwood · Mar 7, 2023 · Feb 28, 2023 · Mar 3, 2023 · Mar 4, 2023
diff --git a/.github/workflows/camunda.yml b/.github/workflows/camunda.yml
@@ -78,7 +78,7 @@ jobs:
 
       - name: Show CWS Log
         run: |
-          cd dist/console-only/cws/server/apache-tomcat-9.0.33/logs
+          cd dist/console-only/cws/server/apache-tomcat-9.0.43/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.33/logs
+          cd dist/console-only/cws/server/apache-tomcat-9.0.43/logs
           ls -al
 
       - name: Set up Google Chrome

diff --git a/.github/workflows/ldap.yml b/.github/workflows/ldap.yml
@@ -83,7 +83,7 @@ jobs:
 
       - name: Show CWS Log
         run: |
-          cd dist/console-only/cws/server/apache-tomcat-9.0.33/logs
+          cd dist/console-only/cws/server/apache-tomcat-9.0.43/logs
           ls -al
 
       - name: Set up Google Chrome

diff --git a/cws-test/src/test/resources/camunda.cfg.xml b/cws-test/src/test/resources/camunda.cfg.xml
@@ -7,6 +7,7 @@
         <property name="history" value="activity" />
         <property name="databaseSchemaUpdate" value="true" />
         <property name="jobExecutorActivate" value="false" />
+        <property name="telemetryReporterActivate" value="false" />
         <property name="expressionManager">
             <bean class="org.camunda.bpm.engine.test.mock.MockExpressionManager" />
         </property>

diff --git a/install/camunda_mods/admin/config.js b/install/camunda_mods/admin/config.js
@@ -15,21 +15,26 @@
  * limitations under the License.
  */
 
-window.camAdminConf = {
+export default {
     // // custom libraries and scripts loading and initialization,
     // // see: http://docs.camunda.org/guides/user-guide/#tasklist-customizing-custom-scripts
-     customScripts: {
-       // AngularJS module names
-       ngDeps: [],
-       // RequireJS configuration for a complete configuration documentation see:
-       // http://requirejs.org/docs/api.html#config
-       deps: ['jquery', 'cws'],
-       paths: {
-         // if you have a folder called `custom-ui` (in the `cockpit` folder)
-         // with a file called `scripts.js` in it and defining the `custom-ui` AMD module
-         'cws': 'cws/scripts'
-       }
-     },
+    // customScripts: [
+    //   // If you have a folder called 'my-custom-script' (in the 'cockpit' folder)
+    //   // with a file called 'customScript.js' in it
+    //   // 'my-custom-script/customScript'
+    // ],
+    requireJsConfig: {
+        // AngularJS module names
+        ngDeps: [],
+        // RequireJS configuration for a complete configuration documentation see:
+        // http://requirejs.org/docs/api.html#config
+        deps: ['jquery', 'cws'],
+        paths: {
+            // if you have a folder called `custom-ui` (in the `cockpit` folder)
+            // with a file called `scripts.js` in it and defining the `custom-ui` AMD module
+            'cws': 'cws/scripts'
+        }
+    },
     // 'runtimeActivityInstanceMetrics': {
     //   'display': true
     // },

diff --git a/install/camunda_mods/admin/index.html b/install/camunda_mods/admin/index.html
@@ -32,11 +32,11 @@
 
 
     <!-- styles -->
-    <link href="$APP_ROOT/app/admin/styles/styles.css?bust=7.13.0"
+    <link href="$APP_ROOT/app/admin/styles/styles.css?bust=7.15.0"
           rel="stylesheet" />
     <link rel="stylesheet"
           type="text/css"
-          href="$APP_ROOT/app/admin/styles/user-styles.css?bust=7.13.0">
+          href="$APP_ROOT/app/admin/styles/user-styles.css?bust=7.15.0">
 
     <!-- favicon -->
     <link rel="shortcut icon"
@@ -130,7 +130,7 @@
 
     <!-- footer -->
     <footer cam-widget-footer
-            version="v7.13.0"></footer>
+            version="v7.15.0"></footer>
 
     <script type="application/javascript">
       var adminConf = window.camAdminConf = {};
@@ -139,12 +139,10 @@
       window.PLUGIN_PACKAGES = $PLUGIN_PACKAGES || [];
 
       window.require = {
-          waitSeconds: 0
+        waitSeconds: 0
       };
     </script>
 
-    <script type="text/javascript" src="$APP_ROOT/app/admin/scripts/config.js"></script>
-
     <!--[if lte IE 9]><script type="text/javascript">
       adminConf.polyfills = adminConf.polyfills || [];
       adminConf.polyfills.push('placeholder');
@@ -158,11 +156,11 @@
 window.__require = window.require;
 window.define = undefined;
 window.require = undefined;
-window.bust = '7.13.0';
+window.bust = '7.15.0';
 
 requirejs.config({
   baseUrl: '$APP_ROOT/app/admin',
-  urlArgs: 'bust=7.13.0'
+  urlArgs: 'bust=7.15.0'
 });
 requirejs(['$APP_ROOT/lib/deps.js'], function () {
   requirejs(['$APP_ROOT/app/admin/camunda-admin-bootstrap.js'], function () {});

diff --git a/install/camunda_mods/cockpit/config.js b/install/camunda_mods/cockpit/config.js
@@ -15,21 +15,26 @@
  * limitations under the License.
  */
 
-window.camCockpitConf = {
+export default {
     // // custom libraries and scripts loading and initialization,
     // // see: http://docs.camunda.org/guides/user-guide/#tasklist-customizing-custom-scripts
-     customScripts: {
-       // AngularJS module names
-       ngDeps: [],
-       // RequireJS configuration for a complete configuration documentation see:
-       // http://requirejs.org/docs/api.html#config
-       deps: ['jquery', 'cws'],
-       paths: {
-         // if you have a folder called `custom-ui` (in the `cockpit` folder)
-         // with a file called `scripts.js` in it and defining the `custom-ui` AMD module
-         'cws': 'cws/scripts'
-       }
-     },
+    // customScripts: [
+    //   // If you have a folder called 'my-custom-script' (in the 'cockpit' folder)
+    //   // with a file called 'customScript.js' in it
+    //   // 'my-custom-script/customScript'
+    // ],
+    requireJsConfig: {
+        // AngularJS module names
+        ngDeps: [],
+        // RequireJS configuration for a complete configuration documentation see:
+        // http://requirejs.org/docs/api.html#config
+        deps: ['jquery', 'cws'],
+        paths: {
+            // if you have a folder called `custom-ui` (in the `cockpit` folder)
+            // with a file called `scripts.js` in it and defining the `custom-ui` AMD module
+            'cws': 'cws/scripts'
+        }
+    },
     // historicActivityInstanceMetrics: {
     //   adjustablePeriod: true,
     //   //select from the default time period: day, week, month, complete
@@ -63,11 +68,11 @@ window.camCockpitConf = {
     //     // with a file called 'camunda.json' in it defining the 'camunda' moddle extension
     //     camunda: 'my-custom-moddle/camunda'
     //   },
-    //   additionalModules: {
+    //   additionalModules: [
     //     // if you have a folder called 'my-custom-module' (in the 'cockpit' folder)
-    //     // with a file called 'module.js' in it defining the 'my-custom-module' AMD module
-    //     myCustomModule: 'my-custom-module/module'
-    //   }
+    //     // with a file called 'module.js' in it
+    //     'my-custom-module/module'
+    //   ],
     // },
     // defaultFilter: {
     //   historicProcessDefinitionInstancesSearch: {

diff --git a/install/camunda_mods/cockpit/index.html b/install/camunda_mods/cockpit/index.html
@@ -33,13 +33,13 @@
 
 
     <!-- styles -->
-    <link href="$APP_ROOT/app/cockpit/styles/styles.css?bust=7.13.0"
+    <link href="$APP_ROOT/app/cockpit/styles/styles.css?bust=7.15.0"
           rel="stylesheet" />
-    <link href="$APP_ROOT/app/cockpit/styles/styles-components.css?bust=7.13.0"
+    <link href="$APP_ROOT/app/cockpit/styles/styles-components.css?bust=7.15.0"
           rel="stylesheet" />
     <link rel="stylesheet"
           type="text/css"
-          href="$APP_ROOT/app/cockpit/styles/user-styles.css?bust=7.13.0">
+          href="$APP_ROOT/app/cockpit/styles/user-styles.css?bust=7.15.0">
 
     <!-- favicon -->
     <link rel="shortcut icon"
@@ -133,7 +133,7 @@
 
     <!-- footer -->
     <footer cam-widget-footer
-            version="v7.13.0"></footer>
+            version="v7.15.0"></footer>
 
     <script type="application/javascript">
       var cockpitConf = window.camCockpitConf = {};
@@ -142,12 +142,10 @@
       window.PLUGIN_PACKAGES = $PLUGIN_PACKAGES || [];
 
       window.require = {
-          waitSeconds: 0
+        waitSeconds: 0
       };
     </script>
 
-    <script type="text/javascript" src="$APP_ROOT/app/cockpit/scripts/config.js"></script>
-
     <!--[if lte IE 9]><script type="text/javascript">
       cockpitConf.polyfills = cockpitConf.polyfills || [];
       cockpitConf.polyfills.push('placeholder');
@@ -161,11 +159,11 @@
 window.__require = window.require;
 window.define = undefined;
 window.require = undefined;
-window.bust = '7.13.0';
+window.bust = '7.15.0';
 
 requirejs.config({
   baseUrl: '$APP_ROOT/app/cockpit',
-  urlArgs: 'bust=7.13.0'
+  urlArgs: 'bust=7.15.0'
 });
 requirejs(['$APP_ROOT/lib/deps.js'], function () {
   requirejs(['$APP_ROOT/app/cockpit/camunda-cockpit-bootstrap.js'], function(){});

diff --git a/install/camunda_mods/tasklist/config.js b/install/camunda_mods/tasklist/config.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-window.camTasklistConf = {
+export default {
     // change the app name and vendor
     // app: {
     //   name: 'Todos',
@@ -35,14 +35,19 @@ window.camTasklistConf = {
     //
     // // custom libraries and scripts loading and initialization,
     // // see: http://docs.camunda.org/guides/user-guide/#tasklist-customizing-custom-scripts
-    customScripts: {
+    // customScripts: [
+    //   // If you have a folder called 'my-custom-script' (in the 'cockpit' folder)
+    //   // with a file called 'customScript.js' in it
+    //   // 'my-custom-script/customScript'
+    // ],
+    requireJsConfig: {
         // AngularJS module names
         ngDeps: [],
-        //   // RequireJS configuration for a complete configuration documentation see:
-        //   // http://requirejs.org/docs/api.html#config
+        // RequireJS configuration for a complete configuration documentation see:
+        // http://requirejs.org/docs/api.html#config
         deps: ['jquery', 'cws'],
         paths: {
-            // if you have a folder called `custom-ui` (in the `scripts` folder)
+            // if you have a folder called `custom-ui` (in the `cockpit` folder)
             // with a file called `scripts.js` in it and defining the `custom-ui` AMD module
             'cws': 'cws/scripts'
         }

diff --git a/install/camunda_mods/tasklist/index.html b/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.13.0">
+        href="$APP_ROOT/app/tasklist/styles/styles.css?bust=7.15.0">
   <link rel="stylesheet"
         type="text/css"
-        href="$APP_ROOT/app/tasklist/styles/user-styles.css?bust=7.13.0">
+        href="$APP_ROOT/app/tasklist/styles/user-styles.css?bust=7.15.0">
 
   <!-- favicon -->
   <link rel="shortcut icon"
@@ -108,7 +108,7 @@
 
   <!-- # page-footer -->
   <footer cam-widget-footer
-          version="v7.13.0"></footer>
+          version="v7.15.0"></footer>
 
 
   <script type="text/javascript">
@@ -125,12 +125,10 @@
     window.PLUGIN_PACKAGES = $PLUGIN_PACKAGES || [];
 
     window.require = {
-        waitSeconds: 0
+      waitSeconds: 0
     };
   </script>
 
-  <script type="text/javascript" src="$APP_ROOT/app/tasklist/scripts/config.js"></script>
-
   <!--[if lte IE 9]><script type="text/javascript">
     tasklistConf.polyfills = tasklistConf.polyfills || [];
     tasklistConf.polyfills.push('placeholder');
@@ -144,11 +142,11 @@
 window.__require = window.require;
 window.define = undefined;
 window.require = undefined;
-window.bust = '7.13.0';
+window.bust = '7.15.0';
 
 requirejs.config({
   baseUrl: '$APP_ROOT/app/tasklist',
-  urlArgs: 'bust=7.13.0'
+  urlArgs: 'bust=7.15.0'
 });
 requirejs(['$APP_ROOT/lib/deps.js'], function () {
   requirejs(['$APP_ROOT/app/tasklist/camunda-tasklist-bootstrap.js'], function () {});

diff --git a/install/camunda_mods/web.xml b/install/camunda_mods/web.xml
@@ -5,7 +5,7 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
 
-  <display-name>camunda bpm webapp</display-name>
+  <display-name>Camunda Platform webapp</display-name>
 
   <!-- cockpit bootstrap listener -->
   <listener>
@@ -113,6 +113,18 @@
   <filter>
     <filter-name>HttpHeaderSecurity</filter-name>
     <filter-class>org.camunda.bpm.webapp.impl.security.filter.headersec.HttpHeaderSecurityFilter</filter-class>
+
+    <!--
+    The Strict Transport Security header is disabled by default.
+    You can enable it by uncommenting the configuration below.
+    Read more about it in the documentation
+    https://docs.camunda.org/manual/latest/webapps/shared-options/header-security/#strict-transport-security
+    -->
+
+    <init-param>
+      <param-name>hstsDisabled</param-name>
+      <param-value>false</param-value>
+    </init-param>
   </filter>
 
   <filter-mapping>