diff --git a/install/camunda_mods/welcome/config.js b/install/camunda_mods/welcome/config.js
index a29221ea..23e84b7e 100644
--- a/install/camunda_mods/welcome/config.js
+++ b/install/camunda_mods/welcome/config.js
@@ -15,51 +15,55 @@
* limitations under the License.
*/
-window.camWelcomeConf = {
- // app: {
- // name: 'Todos',
- // vendor: 'Company'
- // },
- //
- // configure the date format
- // "dateFormat": {
- // "normal": "LLL",
- // "long": "LLLL"
- // },
- //
- // "locales": {
- // "availableLocales": ["en", "de"],
- // "fallbackLocale": "en"
- // },
- // links: [
- // {
- // label: 'Angular.js Docs',
- // href: 'https://code.angularjs.org/1.2.16/docs',
- // description: 'Almost interesting'
- // },
- // {
- // label: 'XKCD',
- // href: 'http://xkcd.org',
- // description: 'Nerdy comic'
- // },
- // {
- // label: 'Slashdot',
- // href: 'https://slashdot.org',
- // description: 'News for nerds, stuff that matter'
- // }
- // ],
- customScripts: {
+export default {
+ // app: {
+ // name: 'Todos',
+ // vendor: 'Company'
+ // },
+ // 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'
}
},
- // csrfCookieName: 'XSRF-TOKEN',
- // disableWelcomeMessage: false
+ // configure the date format
+ // "dateFormat": {
+ // "normal": "LLL",
+ // "long": "LLLL"
+ // },
+ //
+ // "locales": {
+ // "availableLocales": ["en", "de"],
+ // "fallbackLocale": "en"
+ // },
+ // links: [
+ // {
+ // label: 'Angular.js Docs',
+ // href: 'https://code.angularjs.org/1.2.16/docs',
+ // description: 'Almost interesting'
+ // },
+ // {
+ // label: 'XKCD',
+ // href: 'http://xkcd.org',
+ // description: 'Nerdy comic'
+ // },
+ // {
+ // label: 'Slashdot',
+ // href: 'https://slashdot.org',
+ // description: 'News for nerds, stuff that matter'
+ // }
+ // ],
+ // csrfCookieName: 'XSRF-TOKEN',
+ // disableWelcomeMessage: false
};
diff --git a/install/cws-ui/documentation.ftl b/install/cws-ui/documentation.ftl
index fba32695..0c7350f7 100644
--- a/install/cws-ui/documentation.ftl
+++ b/install/cws-ui/documentation.ftl
@@ -74,7 +74,7 @@
CWS Wiki |
- Camunda BPMN 2.0 Implementation Reference |
+ Camunda BPMN 2.0 Implementation Reference |
BP Incubator BPMN Quick Guide |
diff --git a/install/cws-ui/snippets.ftl b/install/cws-ui/snippets.ftl
index 81d1e90c..f4e93ed5 100644
--- a/install/cws-ui/snippets.ftl
+++ b/install/cws-ui/snippets.ftl
@@ -62,7 +62,7 @@
NOTE: For each external code library (JAR) (referenced by Java import statements) put the JAR in the following place:
diff --git a/install/cws_camunda-bpm-tomcat-7.13.0.zip b/install/cws_camunda-bpm-tomcat-7.15.0.zip
similarity index 81%
rename from install/cws_camunda-bpm-tomcat-7.13.0.zip
rename to install/cws_camunda-bpm-tomcat-7.15.0.zip
index 53837341..b2190d28 100644
Binary files a/install/cws_camunda-bpm-tomcat-7.13.0.zip and b/install/cws_camunda-bpm-tomcat-7.15.0.zip differ
diff --git a/install/docker/console-db-es-ls-kibana/docker-compose.yml b/install/docker/console-db-es-ls-kibana/docker-compose.yml
index 5c985978..3406972a 100644
--- a/install/docker/console-db-es-ls-kibana/docker-compose.yml
+++ b/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.33/logs
+ - logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.43/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.33/logs
+ - logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.43/logs
volumes:
logs-volume:
diff --git a/install/docker/cws-image/startup.sh b/install/docker/cws-image/startup.sh
index 2651db5e..5c93d197 100755
--- a/install/docker/cws-image/startup.sh
+++ b/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.33/logs
+ls /home/cws_user/cws/server/apache-tomcat-9.0.43/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.33/logs/*
+rm -rf /home/cws_user/cws/server/apache-tomcat-9.0.43/logs/*
cd cws
./configure.sh ../config.properties Y
diff --git a/install/docker/worker-ls/docker-compose.yml b/install/docker/worker-ls/docker-compose.yml
index 382ed93d..71d089ae 100644
--- a/install/docker/worker-ls/docker-compose.yml
+++ b/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.33/logs
+ - logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.43/logs
volumes:
logs-volume:
diff --git a/install/engine-rest/web.xml b/install/engine-rest/web.xml
index 7784552e..2c9887db 100644
--- a/install/engine-rest/web.xml
+++ b/install/engine-rest/web.xml
@@ -10,6 +10,11 @@
-->
+
+
+ org.camunda.bpm.engine.rest.impl.web.bootstrap.RestContainerBootstrap
+
+
org.camunda.bpm.engine.rest.impl.FetchAndLockContextListener
diff --git a/install/tomcat_conf/server.xml b/install/tomcat_conf/server.xml
index 8b89885a..2b20691f 100644
--- a/install/tomcat_conf/server.xml
+++ b/install/tomcat_conf/server.xml
@@ -83,12 +83,12 @@
diff --git a/install/tomcat_conf/web.xml b/install/tomcat_conf/web.xml
index 3142ab84..7f6584ab 100644
--- a/install/tomcat_conf/web.xml
+++ b/install/tomcat_conf/web.xml
@@ -594,7 +594,7 @@
-
+
@@ -4303,6 +4303,10 @@
wad
application/x-doom
+
+ wasm
+ application/wasm
+
wav
audio/x-wav
diff --git a/pom.xml b/pom.xml
index f69418e4..f33c911b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
3.1.4
2.16.93
- 7.13.0
+ 7.15.0
1.9.0
1.20
1.10
@@ -80,7 +80,7 @@
false
4.3.23.RELEASE
2.22.0
- 9.0.33
+ 9.0.43
4.0.3
3.17
2.6.2
@@ -512,7 +512,7 @@
org.camunda.bpm.assert
camunda-bpm-assert
- 7.0.0
+ 11.0.0
test
@@ -524,7 +524,7 @@
org.assertj
assertj-core
- 3.16.1
+ 3.19.0
test
diff --git a/utils.sh b/utils.sh
index 68112e0e..b7175559 100644
--- a/utils.sh
+++ b/utils.sh
@@ -6,8 +6,8 @@
# Update versions as necessary
export CWS_VER='2.4.0pre.1' # update this each CWS release
-export CAMUNDA_VER='7.13.0'
-export TOMCAT_VER='9.0.33'
+export CAMUNDA_VER='7.15.0'
+export TOMCAT_VER='9.0.43'
export LOGSTASH_VER='7.16.2'
# Prints the provided string, tagging with the script that called it