Browse Source

Revert "AMBARI-10038 Add support for Oracle JDK 1.8 (default) (dsen)"

This reverts commit 4cf5414f5a83459efc983a9c37ac80dee41729e6.
Dmytro Sen 10 years ago
parent
commit
df67ca27f4

+ 1 - 8
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

+ 2 - 2
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"}