diff --git a/traffic_router/build/pom.xml b/traffic_router/build/pom.xml index b2de3848d9..0644c42acf 100644 --- a/traffic_router/build/pom.xml +++ b/traffic_router/build/pom.xml @@ -219,8 +219,7 @@ - java-1.8.0-openjdk >= 1.8 - java-1.8.0-openjdk-devel >= 1.8 + java >= 1.8 tomcat = ${env.TOMCAT_VERSION}.${env.TOMCAT_RELEASE}-${env.BUILD_LOCK} apr >= 1.4.8 tomcat-native >= 1.2.16 diff --git a/traffic_router/tomcat-rpm/tomcat.spec b/traffic_router/tomcat-rpm/tomcat.spec index f19364a1ab..e1b191076c 100644 --- a/traffic_router/tomcat-rpm/tomcat.spec +++ b/traffic_router/tomcat-rpm/tomcat.spec @@ -19,7 +19,7 @@ Summary: Apache Tomcat Servlet/JSP Engine 8.5+, RI for Servlet 3.1/JSP 2.3 AP License: Apache Software License URL: https://github.com/apache/incubator-trafficcontrol/ Source: %{_sourcedir}/apache-tomcat-%{version}.tar.gz -Requires: java-1.8.0-openjdk >= 1.8, java-1.8.0-openjdk-devel >= 1.8 +Requires: java >= 1.8 %define startup_script %{_sysconfdir}/systemd/system/tomcat.service %define tomcat_home /opt/tomcat