From af7b7be33d573773a281b8b62139e3a5db548c87 Mon Sep 17 00:00:00 2001
From: Mike Bland <mbland@acm.org>
Date: Fri, 15 Dec 2023 17:05:59 -0500
Subject: [PATCH] Bump Tomcat to 10.1.17

---
 bin/tomcat.sh                      | 2 +-
 dockerfiles/Dockerfile.tomcat-test | 2 +-
 gradle/libs.versions.toml          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/tomcat.sh b/bin/tomcat.sh
index a813f38..e1759ae 100755
--- a/bin/tomcat.sh
+++ b/bin/tomcat.sh
@@ -6,7 +6,7 @@ get_java_home() {
     grep 'java\.home' | awk '{print $3}'
 }
 
-CATALINA_HOME="${CATALINA_HOME:-/opt/tomcat/apache-tomcat-10.1.16}"
+CATALINA_HOME="${CATALINA_HOME:-/opt/tomcat/apache-tomcat-10.1.17}"
 JAVA_HOME="${JAVA_HOME:-$(get_java_home)}"
 
 for envvar in 'CATALINA_HOME' 'JAVA_HOME'; do
diff --git a/dockerfiles/Dockerfile.tomcat-test b/dockerfiles/Dockerfile.tomcat-test
index b40e18b..50a5759 100644
--- a/dockerfiles/Dockerfile.tomcat-test
+++ b/dockerfiles/Dockerfile.tomcat-test
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.6.0
-ARG TOMCAT_TAG=10.1.16-jre21-temurin-jammy
+ARG TOMCAT_TAG=10.1.17-jre21-temurin-jammy
 
 FROM tomcat:${TOMCAT_TAG}
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6f4d2b7..3c4891b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 servletVer = "6.0.0"
-tomcatVer = "10.1.16"
+tomcatVer = "10.1.17"
 junitVer = "5.10.1"
 hamcrestVer = "2.2"
 antJunitVer = "1.10.14"