smalenfant closed pull request #3017: Changing `openjdk` to `java`
URL: https://github.com/apache/trafficcontrol/pull/3017
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/traffic_router/build/pom.xml b/traffic_router/build/pom.xml
index b2de3848d..0644c42ac 100644
--- a/traffic_router/build/pom.xml
+++ b/traffic_router/build/pom.xml
@@ -219,8 +219,7 @@
</mapping>
</mappings>
<requires>
-
<require>java-1.8.0-openjdk >= 1.8</require>
-
<require>java-1.8.0-openjdk-devel >= 1.8</require>
+ <require>java
>= 1.8</require>
<require>tomcat
= ${env.TOMCAT_VERSION}.${env.TOMCAT_RELEASE}-${env.BUILD_LOCK}</require>
<require>apr
>= 1.4.8</require>
<require>tomcat-native >= 1.2.16</require>
diff --git a/traffic_router/tomcat-rpm/tomcat.spec
b/traffic_router/tomcat-rpm/tomcat.spec
index f19364a1a..e1b191076 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
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
