From b42f4a58e4d62a72e60e9d3c2d67d08c21967ec9 Mon Sep 17 00:00:00 2001
From: Zach Hoffman <zrhoffman@apache.org>
Date: Mon, 15 Apr 2024 11:52:45 -0600
Subject: [PATCH] Update Tomcat to 9.0.87 (#7990)

* Update Tomcat to 9.0.87

* changelog entry
---
 CHANGELOG.md                      | 1 +
 traffic_router/build/build_rpm.sh | 2 +-
 traffic_router/connector/pom.xml  | 4 ++--
 traffic_router/core/pom.xml       | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de8774b96a..d817920ced 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Updated the CacheGroups Traffic Portal page to use a more performant AG-Grid-based table.
 - Updated Go version to 1.22.0
 - [#7979](https://github.com/apache/trafficcontrol/pull/7979) *Traffic Router*, *Traffic Monitor*, *Traffic Stats*: Store logs in /var/log
+- [#7872](https://github.com/apache/trafficcontrol/issues/7872) *Traffic Router*: Updated Apache Tomcat from 9.0.43, 9.0.67, 9.0.83, and 9.0.86 to 9.0.87.
 
 ### Fixed
 - [#7984](https://github.com/apache/trafficcontrol/pull/7984) *Traffic Ops* Fixed TO Client cert authentication with respect to returning response cookie.
diff --git a/traffic_router/build/build_rpm.sh b/traffic_router/build/build_rpm.sh
index f624f44906..1c86bce6c9 100755
--- a/traffic_router/build/build_rpm.sh
+++ b/traffic_router/build/build_rpm.sh
@@ -83,7 +83,7 @@ adaptEnvironment() {
 	RPM="${PACKAGE}-${TC_VERSION}-${BUILD_NUMBER}.noarch.rpm"
 	RPM_TARGET_OS="${RPM_TARGET_OS:-linux}"
 	TOMCAT_VERSION=9.0
-	TOMCAT_RELEASE=67
+	TOMCAT_RELEASE=87
 	export PACKAGE TC_VERSION BUILD_NUMBER WORKSPACE RPMBUILD DIST RPM RPM_TARGET_OS TOMCAT_VERSION TOMCAT_RELEASE
 
 	echo "=================================================="
diff --git a/traffic_router/connector/pom.xml b/traffic_router/connector/pom.xml
index f2f812002f..fc2de034fd 100644
--- a/traffic_router/connector/pom.xml
+++ b/traffic_router/connector/pom.xml
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.apache.tomcat</groupId>
 			<artifactId>tomcat-coyote</artifactId>
-			<version>9.0.86</version>
+			<version>9.0.87</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tomcat</groupId>
 			<artifactId>tomcat-catalina</artifactId>
-			<version>9.0.83</version>
+			<version>9.0.87</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/traffic_router/core/pom.xml b/traffic_router/core/pom.xml
index ecaef049f4..0dc18f0c5d 100644
--- a/traffic_router/core/pom.xml
+++ b/traffic_router/core/pom.xml
@@ -359,19 +359,19 @@
 		<dependency>
 			<groupId>org.apache.tomcat</groupId>
 			<artifactId>tomcat-catalina</artifactId>
-			<version>9.0.43</version>
+			<version>9.0.87</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tomcat</groupId>
 			<artifactId>tomcat-coyote</artifactId>
-			<version>9.0.43</version>
+			<version>9.0.87</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tomcat</groupId>
 			<artifactId>tomcat-jni</artifactId>
-			<version>9.0.43</version>
+			<version>9.0.87</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>