Revert "AMBARI-10038 Add support for Oracle JDK 1.8 (default) (dsen)"
This reverts commit 4cf5414f5a83459efc983a9c37ac80dee41729e6. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/df67ca27 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/df67ca27 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/df67ca27 Branch: refs/heads/trunk Commit: df67ca27f45240a4b48eae6c9239e98d73bd946c Parents: 0488f74 Author: Dmytro Sen <d...@apache.org> Authored: Thu Mar 12 19:58:06 2015 +0200 Committer: Dmytro Sen <d...@apache.org> Committed: Thu Mar 12 19:58:06 2015 +0200 ---------------------------------------------------------------------- ambari-server/conf/unix/ambari.properties | 9 +-------- .../src/main/python/ambari_server/serverConfiguration.py | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/df67ca27/ambari-server/conf/unix/ambari.properties ---------------------------------------------------------------------- diff --git a/ambari-server/conf/unix/ambari.properties b/ambari-server/conf/unix/ambari.properties index 25a4081..251f068 100644 --- a/ambari-server/conf/unix/ambari.properties +++ b/ambari-server/conf/unix/ambari.properties @@ -23,7 +23,7 @@ resources.dir = /var/lib/ambari-server/resources shared.resources.dir = /usr/lib/ambari-server/lib/ambari_commons/resources custom.action.definitions = /var/lib/ambari-server/resources/custom_action_definitions -java.releases=jdk1.8,jdk1.7,jdk1.6 +java.releases=jdk1.7,jdk1.6 jdk1.6.desc=Oracle JDK 1.6 jdk1.6.url=http://public-repo-1.hortonworks.com/ARTIFACTS/jdk-6u31-linux-x64.bin jdk1.6.dest-file=jdk-6u31-linux-x64.bin @@ -38,13 +38,6 @@ jdk1.7.jcpol-url=http://public-repo-1.hortonworks.com/ARTIFACTS/UnlimitedJCEPoli jdk1.7.jcpol-file=UnlimitedJCEPolicyJDK7.zip jdk1.7.home=/usr/jdk64/ jdk1.7.re=(jdk.*)/jre -jdk1.8.desc=Oracle JDK 1.8 -jdk1.8.url=http://public-repo-1.hortonworks.com/ARTIFACTS/jdk-8u40-linux-x64.tar.gz -jdk1.8.dest-file=jdk-8u40-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=/usr/jdk64/ -jdk1.8.re=(jdk.*)/jre metadata.path=/var/lib/ambari-server/resources/stacks common.services.path=/var/lib/ambari-server/resources/common-services http://git-wip-us.apache.org/repos/asf/ambari/blob/df67ca27/ambari-server/src/main/python/ambari_server/serverConfiguration.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py b/ambari-server/src/main/python/ambari_server/serverConfiguration.py index 849df56..a00be1b 100644 --- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py +++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py @@ -81,10 +81,10 @@ JDK_NAME_PROPERTY = "jdk.name" JCE_NAME_PROPERTY = "jce.name" DEFAULT_JDK16_LOCATION = "/usr/jdk64/jdk1.6.0_31" -JDK_NAMES = ["jdk-8u40-linux-x64.tar.gz", "jdk-7u67-linux-x64.tar.gz", "jdk-6u31-linux-x64.bin"] +JDK_NAMES = ["jdk-7u67-linux-x64.tar.gz", "jdk-6u31-linux-x64.bin"] #JCE Policy files -JCE_POLICY_FILENAMES = ["jce_policy-8.zip", "UnlimitedJCEPolicyJDK7.zip", "jce_policy-6.zip"] +JCE_POLICY_FILENAMES = ["UnlimitedJCEPolicyJDK7.zip", "jce_policy-6.zip"] # JDBC JDBC_PATTERNS = {"oracle": "*ojdbc*.jar", "mysql": "*mysql*.jar"}
