You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2018/11/08 16:19:06 UTC
[trafficcontrol] 01/02: Replace the Oracle JDK with OpenJDK. This
resolves #2960.
This is an automated email from the ASF dual-hosted git repository.
mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit d4a97ba51b024f8600acd2ad81ef5cde27b310d6
Author: Jeff Elsloo <je...@cable.comcast.com>
AuthorDate: Fri Oct 26 10:50:23 2018 -0600
Replace the Oracle JDK with OpenJDK. This resolves #2960.
---
build/README.md | 3 +--
docs/source/admin/traffic_router/migrationto2-3.rst | 4 ++--
docs/source/admin/traffic_vault.rst | 2 +-
traffic_router/build/pom.xml | 3 ++-
.../core/src/main/lib/systemd/system/traffic_router.service | 2 +-
traffic_router/tomcat-rpm/tomcat.service | 2 +-
traffic_router/tomcat-rpm/tomcat.spec | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/build/README.md b/build/README.md
index c9c79c2..a0fe188 100644
--- a/build/README.md
+++ b/build/README.md
@@ -77,8 +77,7 @@ At the conclusion of the build, all rpms are copied into the __$WORKSPACE/dist_
* go 1.7 or higher
#### traffic_monitor and traffic_router:
-* jdk 8.0 or higher
- * CentOS 6 (java-1.8.0-openjdk, java-1.8.0-openjdk-devel)
+* java-1.8.0-openjdk and java-1.8.0-openjdk-devel
* apache-maven 3.3.1 or higher
#### traffic_monitor_golang:
diff --git a/docs/source/admin/traffic_router/migrationto2-3.rst b/docs/source/admin/traffic_router/migrationto2-3.rst
index a4d5f7a..8d10c54 100644
--- a/docs/source/admin/traffic_router/migrationto2-3.rst
+++ b/docs/source/admin/traffic_router/migrationto2-3.rst
@@ -52,8 +52,8 @@ It is preferable that you add it to your Yum repository because then it will be
Update the traffic_router Package
---------------------------------
-If openssl, apr, tomcat-native, jdk and tomcat_tr packages are all in an available repository then you just need to run: ``yum update traffic_router``.
-This will first cause the apr, tomcat-native, jdk and tomcat packages to be installed. When the 'tomcat' package runs, it will cause any older versions of traffic_router or tomcat to be uninstalled. This is because the previous versions of the traffic_router package included an untracked installation of tomcat.
+If openssl, apr, tomcat-native, java-1.8.0-openjdk, java-1.8.0-openjdk-devel and tomcat_tr packages are all in an available repository then you just need to run: ``yum update traffic_router``.
+This will first cause the apr, tomcat-native, java-1.8.0-openjdk, java-1.8.0-openjdk-devel and tomcat packages to be installed. When the 'tomcat' package runs, it will cause any older versions of traffic_router or tomcat to be uninstalled. This is because the previous versions of the traffic_router package included an untracked installation of tomcat.
Restore Property Files
diff --git a/docs/source/admin/traffic_vault.rst b/docs/source/admin/traffic_vault.rst
index 5c0b05d..0bd8785 100644
--- a/docs/source/admin/traffic_vault.rst
+++ b/docs/source/admin/traffic_vault.rst
@@ -137,7 +137,7 @@ On Each Riak Server:
1. If Java (JDKv1.8+) is not already installed on your Riak server, install Java
* To see if Java is already installed: ``java -version``
- * To install Java: ``yum install -y jdk`` (CentOS/RedHat/Fedora), ``apt-get install -y java`` (Ubuntu/Debian/Linux Mint), ``pacman -Sy java`` (Arch/Manjaro)
+ * To install Java: ``yum install -y java-1.8.0-openjdk java-1.8.0-openjdk-devel`` (CentOS/RedHat/Fedora), ``apt-get install -y openjdk-8-jdk`` (Ubuntu/Debian/Linux Mint), ``pacman -Sy jdk8-openjdk`` (Arch/Manjaro)
2. Enable search in riak.conf
* ``$EDITOR /etc/riak/riak.conf``
diff --git a/traffic_router/build/pom.xml b/traffic_router/build/pom.xml
index 7c80857..b2de384 100644
--- a/traffic_router/build/pom.xml
+++ b/traffic_router/build/pom.xml
@@ -219,7 +219,8 @@
</mapping>
</mappings>
<requires>
- <require>jdk >= 1.8</require>
+ <require>java-1.8.0-openjdk >= 1.8</require>
+ <require>java-1.8.0-openjdk-devel >= 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/core/src/main/lib/systemd/system/traffic_router.service b/traffic_router/core/src/main/lib/systemd/system/traffic_router.service
index 97252ed..45e898f 100755
--- a/traffic_router/core/src/main/lib/systemd/system/traffic_router.service
+++ b/traffic_router/core/src/main/lib/systemd/system/traffic_router.service
@@ -19,7 +19,7 @@ After=syslog.target network.target
[Service]
Type=forking
-Environment=JAVA_HOME=/usr/java/default
+Environment=JAVA_HOME=/usr/lib/jvm/java
Environment=CATALINA_PID=/opt/traffic_router/temp/tomcat.pid
Environment=CATALINA_HOME=/opt/tomcat
Environment=CATALINA_BASE=/opt/traffic_router
diff --git a/traffic_router/tomcat-rpm/tomcat.service b/traffic_router/tomcat-rpm/tomcat.service
index 29c6f99..72de257 100644
--- a/traffic_router/tomcat-rpm/tomcat.service
+++ b/traffic_router/tomcat-rpm/tomcat.service
@@ -22,7 +22,7 @@ After=syslog.target network.target
[Service]
Type=forking
-Environment=JAVA_HOME=/usr/java/default
+Environment=JAVA_HOME=/usr/lib/jvm/java
Environment=CATALINA_PID=/opt/tomcat/temp/tomcat.pid
Environment=CATALINA_HOME=/opt/tomcat
Environment=CATALINA_BASE=/opt/tomcat
diff --git a/traffic_router/tomcat-rpm/tomcat.spec b/traffic_router/tomcat-rpm/tomcat.spec
index 63f8e81..f19364a 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: jdk >= 1.8
+Requires: java-1.8.0-openjdk >= 1.8, java-1.8.0-openjdk-devel >= 1.8
%define startup_script %{_sysconfdir}/systemd/system/tomcat.service
%define tomcat_home /opt/tomcat