[trafficcontrol] branch master updated: Explicitly require Java timezone data dependency (#7675)

[zrhoffman]

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

zrhoffman 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 55d8070d7c Explicitly require Java timezone data dependency (#7675)
55d8070d7c is described below

commit 55d8070d7c886c50ca8a39c1281317a433ed0fba
Author: Zach Hoffman <zrhoff...@apache.org>
AuthorDate: Wed Jul 26 12:52:33 2023 -0600

    Explicitly require Java timezone data dependency (#7675)
---
 infrastructure/cdn-in-a-box/traffic_router/Dockerfile | 2 +-
 infrastructure/docker/build/Dockerfile-traffic_router | 2 ++
 traffic_router/build/pom.xml                          | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/infrastructure/cdn-in-a-box/traffic_router/Dockerfile 
b/infrastructure/cdn-in-a-box/traffic_router/Dockerfile
index 3a4df6ed67..a4e57694ef 100644
--- a/infrastructure/cdn-in-a-box/traffic_router/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_router/Dockerfile
@@ -52,7 +52,7 @@ RUN dnf -y install epel-release && \
 
         perl-JSON perl-WWW-Curl which make autoconf automake gcc gcc-c++ apr 
apr-devel \
         openssl openssl-devel bind-utils net-tools perl-JSON-PP gettext \
-        java-11-openjdk-headless java-11-openjdk-devel tomcat-native && \
+        java-11-openjdk-headless tzdata-java java-11-openjdk-devel 
tomcat-native && \
     dnf -y clean all && \
     ln -sfv $(realpath /usr/lib/jvm/java-11) /opt/java
 
diff --git a/infrastructure/docker/build/Dockerfile-traffic_router 
b/infrastructure/docker/build/Dockerfile-traffic_router
index 03cd35e6b6..637b4a30e2 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_router
+++ b/infrastructure/docker/build/Dockerfile-traffic_router
@@ -46,6 +46,8 @@ RUN   yum -y install \
                which  \
                curl \
                java-11-openjdk \
+               # necessary in case tzdata-java is not already installed as a 
dependency of java-11-openjdk-headless
+               tzdata-java \
                java-11-openjdk-devel && \
        yum -y clean all
 
diff --git a/traffic_router/build/pom.xml b/traffic_router/build/pom.xml
index fef6d23d99..c124e83364 100644
--- a/traffic_router/build/pom.xml
+++ b/traffic_router/build/pom.xml
@@ -250,6 +250,7 @@
                                                        </mappings>
                                                        <requires>
                                                                
<require>java-11-openjdk-headless</require>
+                                                               
<require>tzdata-java</require>
                                                                <require>tomcat 
>= ${env.TOMCAT_VERSION}.${env.TOMCAT_RELEASE}</require>
                                                                <require>apr >= 
1.4.8</require>
                                                                
<require>tomcat-native >= 1.2.23</require>