From e2e376d3f5ced7417517fb88cb2dc219dd2b07b8 Mon Sep 17 00:00:00 2001 From: wcgunter Date: Fri, 27 Oct 2023 15:48:25 -0400 Subject: [PATCH] Update references to Tomcat version (9.0.72 --> 9.0.75) --- .github/workflows/camunda.yml | 2 +- .github/workflows/ldap.yml | 2 +- install/cws-ui/snippets.ftl | 2 +- install/docker/console-db-es-ls-kibana/docker-compose.yml | 4 ++-- install/docker/cws-image/startup.sh | 4 ++-- install/docker/worker-ls/docker-compose.yml | 2 +- pom.xml | 2 +- utils.sh | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/camunda.yml b/.github/workflows/camunda.yml index b86a8dd7..475834c3 100644 --- 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.72/logs + cd dist/console-only/cws/server/apache-tomcat-9.0.75/logs ls -al - name: Set up Google Chrome diff --git a/.github/workflows/ldap.yml b/.github/workflows/ldap.yml index 75e7e5ae..7fe9aae5 100644 --- 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.72/logs + cd dist/console-only/cws/server/apache-tomcat-9.0.75/logs ls -al - name: Set up Google Chrome diff --git a/install/cws-ui/snippets.ftl b/install/cws-ui/snippets.ftl index 3d91fbdf..47292a42 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/docker/console-db-es-ls-kibana/docker-compose.yml b/install/docker/console-db-es-ls-kibana/docker-compose.yml index 702d0afd..217178e1 100644 --- a/install/docker/console-db-es-ls-kibana/docker-compose.yml +++ b/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: diff --git a/install/docker/cws-image/startup.sh b/install/docker/cws-image/startup.sh index bc192848..c610d239 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.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 diff --git a/install/docker/worker-ls/docker-compose.yml b/install/docker/worker-ls/docker-compose.yml index 24f4f261..907c9db9 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 - - worker2-logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.72/logs + - worker2-logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.75/logs volumes: worker2-logs-volume: diff --git a/pom.xml b/pom.xml index b0a7a95f..28f0ffcf 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ false 5.2.20.RELEASE 2.22.2 - 9.0.72 + 9.0.75 4.0.3 3.17 2.6.2 diff --git a/utils.sh b/utils.sh index 2ca66d13..30bd725a 100644 --- a/utils.sh +++ b/utils.sh @@ -7,7 +7,7 @@ # Update versions as necessary export CWS_VER='2.5.0' # update this each CWS release export CAMUNDA_VER='7.20.0' -export TOMCAT_VER='9.0.72' +export TOMCAT_VER='9.0.75' export LOGSTASH_VER='8.8.0' # Prints the provided string, tagging with the script that called it