Skip to content

Commit

Permalink
Merge pull request #46 from mbland/bump-to-tomcat-10.1.17
Browse files Browse the repository at this point in the history
Bump Tomcat to 10.1.17
  • Loading branch information
mbland committed Dec 15, 2023
2 parents b44c22c + af7b7be commit 8418591
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion bin/tomcat.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.tomcat-test
Original file line number Diff line number Diff line change
@@ -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}

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down

0 comments on commit 8418591

Please sign in to comment.