You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by ra...@apache.org on 2022/05/09 22:49:23 UTC
[trafficcontrol] branch master updated: Change TR to depend on java-11-openjdk-headless instead of java-11 (#6815)
This is an automated email from the ASF dual-hosted git repository.
rawlin 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 5a4f94ab93 Change TR to depend on java-11-openjdk-headless instead of java-11 (#6815)
5a4f94ab93 is described below
commit 5a4f94ab93c9d64364a45d6cccc4c15b3c4ff5f7
Author: Miguel <82...@users.noreply.github.com>
AuthorDate: Mon May 9 17:49:16 2022 -0500
Change TR to depend on java-11-openjdk-headless instead of java-11 (#6815)
* TR on java-11-openjdk-headless not of java-11
* TR on java-11-openjdk-headless not of java-11
---
traffic_router/build/pom.xml | 2 +-
traffic_router/tomcat-rpm/tomcat.spec | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/traffic_router/build/pom.xml b/traffic_router/build/pom.xml
index cd7e2057b8..596e837da4 100644
--- a/traffic_router/build/pom.xml
+++ b/traffic_router/build/pom.xml
@@ -236,7 +236,7 @@
</mapping>
</mappings>
<requires>
- <require>java-11</require>
+ <require>java-11-openjdk-headless</require>
<require>tomcat >= ${env.TOMCAT_VERSION}.${env.TOMCAT_RELEASE}</require>
<require>apr >= 1.4.8</require>
<require>tomcat-native >= 1.2.23</require>
diff --git a/traffic_router/tomcat-rpm/tomcat.spec b/traffic_router/tomcat-rpm/tomcat.spec
index 35eaf5d35c..6ab96d215b 100644
--- a/traffic_router/tomcat-rpm/tomcat.spec
+++ b/traffic_router/tomcat-rpm/tomcat.spec
@@ -20,7 +20,7 @@ Summary: Apache Tomcat Servlet/JSP Engine 9.0+, RI for Servlet 3.1/JSP 2.3 AP
License: Apache Software License
URL: https://github.com/apache/trafficcontrol/
Source: %{_sourcedir}/apache-tomcat-%{version}.tar.gz
-Requires: java-11
+Requires: java-11-openjdk-headless
%define tomcat_home /opt/tomcat