Explicitly require Java timezone data dependency (#7675)

apache · Jul 26, 2023 · 55d8070 · 55d8070
1 parent bcd80b7
commit 55d8070
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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>