[trafficcontrol] branch master updated: Update Tomcat to 9.0.67 (#7093)

[ocket8888]

This is an automated email from the ASF dual-hosted git repository.

ocket8888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git


The following commit(s) were added to refs/heads/master by this push:
     new 96a8543a3f Update Tomcat to 9.0.67 (#7093)
96a8543a3f is described below

commit 96a8543a3fcf9e026f69370b3bfb040a4334031f
Author: Zach Hoffman <zrhoff...@apache.org>
AuthorDate: Tue Oct 4 15:05:35 2022 +0000

    Update Tomcat to 9.0.67 (#7093)
---
 CHANGELOG.md                      | 1 +
 dev/traffic_router/Dockerfile     | 2 +-
 traffic_router/build/build_rpm.sh | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba2506ebe1..07cda4b07f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ The format is based on [Keep a 
Changelog](http://keepachangelog.com/en/1.0.0/).
 - [#7021](https://github.com/apache/trafficcontrol/issues/7021) *Cache Config* 
Fixed cache config for Delivery Services with IP Origins.
 - [#7043](https://github.com/apache/trafficcontrol/issues/7043) Fixed cache 
config missing retry parameters for non-topology MSO Delivery Services going 
direct from edge to origin.
 - [#7047](https://github.com/apache/trafficcontrol/issues/7047) *Traffic Ops* 
allow `apply_time` query parameters on the `servers/{id-name}/update` when the 
CDN is locked.
+- Updated Apache Tomcat from 9.0.43 to 9.0.67
 
 ## [7.0.0] - 2022-07-19
 ### Added
diff --git a/dev/traffic_router/Dockerfile b/dev/traffic_router/Dockerfile
index c30c9bf2cc..51c88bd1d9 100644
--- a/dev/traffic_router/Dockerfile
+++ b/dev/traffic_router/Dockerfile
@@ -30,7 +30,7 @@ EXPOSE 3053:53/tcp \
 
 RUN apk add --no-cache openjdk11 inotify-tools maven tomcat-native openssl && 
ln -s /usr/lib/jvm/java-11-openjdk/bin/jdb /bin/jdb
 
-ADD 
https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.43/bin/apache-tomcat-9.0.43.tar.gz
 /opt/tomcat.tgz
+ADD 
https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.67/bin/apache-tomcat-9.0.67.tar.gz
 /opt/tomcat.tgz
 
 RUN cd /opt && \
        tar -xf tomcat.tgz && \
diff --git a/traffic_router/build/build_rpm.sh 
b/traffic_router/build/build_rpm.sh
index 5f2ab9675f..f7025265d9 100755
--- a/traffic_router/build/build_rpm.sh
+++ b/traffic_router/build/build_rpm.sh
@@ -81,7 +81,7 @@ adaptEnvironment() {
        RPM="${PACKAGE}-${TC_VERSION}-${BUILD_NUMBER}.x86_64.rpm"
        RPM_TARGET_OS="${RPM_TARGET_OS:-linux}"
        TOMCAT_VERSION=9.0
-       TOMCAT_RELEASE=43
+       TOMCAT_RELEASE=67
        export PACKAGE TC_VERSION BUILD_NUMBER WORKSPACE RPMBUILD DIST RPM 
RPM_TARGET_OS TOMCAT_VERSION TOMCAT_RELEASE
 
        echo "=================================================="