[ambari] branch trunk updated: AMBARI-24189. Remove reference to JDK 1.7 in ambari-server setup (aonishuk)

[ao...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aonishuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new df5bc5c  AMBARI-24189. Remove reference to JDK 1.7 in ambari-server setup (aonishuk)
df5bc5c is described below

commit df5bc5cd12302afdbaf3f6a3fd5db3fb71851be3
Author: Andrew Onishuk <ao...@hortonworks.com>
AuthorDate: Tue Jun 26 10:33:18 2018 +0300

    AMBARI-24189. Remove reference to JDK 1.7 in ambari-server setup (aonishuk)
---
 ambari-server/conf/unix/ambari.properties | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/ambari-server/conf/unix/ambari.properties b/ambari-server/conf/unix/ambari.properties
index e7ad381..ea137fc 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -23,16 +23,9 @@ resources.dir = $ROOT/var/lib/ambari-server/resources
 shared.resources.dir = $ROOT/usr/lib/ambari-server/lib/ambari_commons/resources
 custom.action.definitions = $ROOT/var/lib/ambari-server/resources/custom_action_definitions
 
-java.releases=jdk1.8,jdk1.7
+java.releases=jdk1.8
 java.releases.ppc64le=
 
-jdk1.7.desc=Oracle JDK 1.7 + Java Cryptography Extension (JCE) Policy Files 7
-jdk1.7.url=http://public-repo-1.hortonworks.com/ARTIFACTS/jdk-7u67-linux-x64.tar.gz
-jdk1.7.dest-file=jdk-7u67-linux-x64.tar.gz
-jdk1.7.jcpol-url=http://public-repo-1.hortonworks.com/ARTIFACTS/UnlimitedJCEPolicyJDK7.zip
-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-8u112-linux-x64.tar.gz
 jdk1.8.dest-file=jdk-8u112-linux-x64.tar.gz