Repository: ambari Updated Branches: refs/heads/branch-2.4 a39285ddd -> 8b6da622a
Revert "AMBARI-18249. Set the default 1.8 JDK to 18.0_77 for Ambari. (stoader)" This reverts commit a39285dddb05ab51915e0bb04bcff06f1b40de63. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8b6da622 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8b6da622 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8b6da622 Branch: refs/heads/branch-2.4 Commit: 8b6da622a021f690c85c01ee3fc5c74953eef71c Parents: a39285d Author: Toader, Sebastian <[email protected]> Authored: Wed Aug 24 15:43:09 2016 +0200 Committer: Toader, Sebastian <[email protected]> Committed: Wed Aug 24 15:43:09 2016 +0200 ---------------------------------------------------------------------- ambari-server/conf/unix/ambari.properties | 4 ++-- ambari-server/src/main/python/ambari_server/serverSetup.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8b6da622/ambari-server/conf/unix/ambari.properties ---------------------------------------------------------------------- diff --git a/ambari-server/conf/unix/ambari.properties b/ambari-server/conf/unix/ambari.properties index 52f4959..b8e41b7 100644 --- a/ambari-server/conf/unix/ambari.properties +++ b/ambari-server/conf/unix/ambari.properties @@ -32,8 +32,8 @@ jdk1.7.jcpol-file=UnlimitedJCEPolicyJDK7.zip jdk1.7.home=$ROOT/usr/jdk64/ jdk1.7.re=(jdk.*)/jre jdk1.8.desc=Oracle JDK 1.8 + Java Cryptography Extension (JCE) Policy Files 8 -jdk1.8.url=http://public-repo-1.hortonworks.com/ARTIFACTS/jdk-8u77-linux-x64.tar.gz -jdk1.8.dest-file=jdk-8u77-linux-x64.tar.gz +jdk1.8.url=http://public-repo-1.hortonworks.com/ARTIFACTS/jdk-8u60-linux-x64.tar.gz +jdk1.8.dest-file=jdk-8u60-linux-x64.tar.gz jdk1.8.jcpol-url=http://public-repo-1.hortonworks.com/ARTIFACTS/jce_policy-8.zip jdk1.8.jcpol-file=jce_policy-8.zip jdk1.8.home=$ROOT/usr/jdk64/ http://git-wip-us.apache.org/repos/asf/ambari/blob/8b6da622/ambari-server/src/main/python/ambari_server/serverSetup.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari_server/serverSetup.py b/ambari-server/src/main/python/ambari_server/serverSetup.py index 60e9497..d80c25a 100644 --- a/ambari-server/src/main/python/ambari_server/serverSetup.py +++ b/ambari-server/src/main/python/ambari_server/serverSetup.py @@ -733,9 +733,9 @@ class JDKSetupLinux(JDKSetup): super(JDKSetupLinux, self).__init__() self.JDK_DEFAULT_CONFIGS = [ JDKRelease("jdk1.8", "Oracle JDK 1.8 + Java Cryptography Extension (JCE) Policy Files 8", - "http://public-repo-1.hortonworks.com/ARTIFACTS/jdk-8u77-linux-x64.tar.gz";, "jdk-8u77-linux-x64.tar.gz", + "http://public-repo-1.hortonworks.com/ARTIFACTS/jdk-8u60-linux-x64.tar.gz";, "jdk-8u60-linux-x64.tar.gz", "http://public-repo-1.hortonworks.com/ARTIFACTS/jce_policy-8.zip";, "jce_policy-8.zip", - AmbariPath.get("/usr/jdk64/jdk1.8.0_77"), + AmbariPath.get("/usr/jdk64/jdk1.8.0_40"), "(jdk.*)/jre") ]
