You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by dg...@apache.org on 2018/11/21 14:48:02 UTC
[trafficcontrol] 02/09: Changing `openjdk` to `java` - This allows
either JDK to be used
This is an automated email from the ASF dual-hosted git repository.
dgelinas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 311e0d4b0f29e573681bb469ec9ba8e256b8cb8c
Author: Steve Malenfant <st...@cox.com>
AuthorDate: Mon Nov 12 09:33:26 2018 -0500
Changing `openjdk` to `java`
- This allows either JDK to be used
---
traffic_router/build/pom.xml | 3 +--
traffic_router/tomcat-rpm/tomcat.spec | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/traffic_router/build/pom.xml b/traffic_router/build/pom.xml
index b2de384..0644c42 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 f19364a..e1b1910 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