You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2015/11/05 20:02:16 UTC
ambari git commit: AMBARI-13727. Update Ambari 1.8 JDK build number
to 1.8u60 (srimanth)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 9c85b2439 -> c950aaf07
AMBARI-13727. Update Ambari 1.8 JDK build number to 1.8u60 (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c950aaf0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c950aaf0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c950aaf0
Branch: refs/heads/branch-2.1
Commit: c950aaf07fbf1038e5a3d1e052250eadf2b64536
Parents: 9c85b24
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Wed Nov 4 16:15:52 2015 -0800
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Thu Nov 5 11:02:01 2015 -0800
----------------------------------------------------------------------
ambari-server/conf/unix/ambari.properties | 6 +++---
ambari-server/src/main/python/ambari_server/serverSetup.py | 2 +-
.../src/test/python/stacks/2.2/configs/knox_upgrade.json | 4 ++--
.../src/test/python/stacks/2.3/configs/hbase_default.json | 2 +-
.../src/test/python/stacks/2.3/configs/hbase_secure.json | 2 +-
.../src/test/python/stacks/2.3/configs/storm_default.json | 4 ++--
.../test/python/stacks/2.3/configs/storm_default_secure.json | 4 ++--
7 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c950aaf0/ambari-server/conf/unix/ambari.properties
----------------------------------------------------------------------
diff --git a/ambari-server/conf/unix/ambari.properties b/ambari-server/conf/unix/ambari.properties
index 58f09d1..7f0a464 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=/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-8u40-linux-x64.tar.gz
-jdk1.8.dest-file=jdk-8u40-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=/usr/jdk64/
@@ -106,4 +106,4 @@ http.x-frame-options=DENY
# HTTP Header settings for Ambari Views
views.http.strict-transport-security=max-age=31536000
views.http.x-xss-protection=1; mode=block
-views.http.x-frame-options=SAMEORIGIN
\ No newline at end of file
+views.http.x-frame-options=SAMEORIGIN
http://git-wip-us.apache.org/repos/asf/ambari/blob/c950aaf0/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 558a3ee..511da27 100644
--- a/ambari-server/src/main/python/ambari_server/serverSetup.py
+++ b/ambari-server/src/main/python/ambari_server/serverSetup.py
@@ -746,7 +746,7 @@ 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-8u40-linux-x64.tar.gz", "jdk-8u40-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",
"/usr/jdk64/jdk1.8.0_40",
"(jdk.*)/jre")
http://git-wip-us.apache.org/repos/asf/ambari/blob/c950aaf0/ambari-server/src/test/python/stacks/2.2/configs/knox_upgrade.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/knox_upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/knox_upgrade.json
index 41bfec4..77b2662 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/knox_upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/knox_upgrade.json
@@ -38,7 +38,7 @@
"host_sys_prepped": "false",
"ambari_db_rca_username": "mapred",
"current_version": "2.3.0.0-2075",
- "jdk_name": "jdk-8u40-linux-x64.tar.gz",
+ "jdk_name": "jdk-8u60-linux-x64.tar.gz",
"mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar",
"repo_info": "[]",
"custom_command": "RESTART",
@@ -199,4 +199,4 @@
"c6401.ambari.apache.org"
]
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/c950aaf0/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json b/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json
index d8f05fd..07c7112 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json
@@ -52,7 +52,7 @@
"stack_version": "2.3",
"stack_name": "HDP",
"db_name": "ambari",
- "jdk_name": "jdk-8u40-linux-x64.tar.gz",
+ "jdk_name": "jdk-8u60-linux-x64.tar.gz",
"ambari_db_rca_driver": "org.postgresql.Driver",
"java_version": "8",
"ambari_db_rca_username": "mapred",
http://git-wip-us.apache.org/repos/asf/ambari/blob/c950aaf0/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json b/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json
index 24ab446..7d29056 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json
@@ -57,7 +57,7 @@
"stack_version": "2.3",
"stack_name": "HDP",
"db_name": "ambari",
- "jdk_name": "jdk-8u40-linux-x64.tar.gz",
+ "jdk_name": "jdk-8u60-linux-x64.tar.gz",
"ambari_db_rca_driver": "org.postgresql.Driver",
"java_version": "8",
"ambari_db_rca_username": "mapred",
http://git-wip-us.apache.org/repos/asf/ambari/blob/c950aaf0/ambari-server/src/test/python/stacks/2.3/configs/storm_default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/storm_default.json b/ambari-server/src/test/python/stacks/2.3/configs/storm_default.json
index c41c533..2de83a8 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/storm_default.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/storm_default.json
@@ -32,7 +32,7 @@
"stack_version": "2.3",
"host_sys_prepped": "false",
"db_name": "ambari",
- "jdk_name": "jdk-8u40-linux-x64.tar.gz",
+ "jdk_name": "jdk-8u60-linux-x64.tar.gz",
"ambari_db_rca_driver": "org.postgresql.Driver",
"current_version": "2.3.0.0-1889",
"ambari_db_rca_username": "mapred",
@@ -245,4 +245,4 @@
"c6401.ambari.apache.org"
]
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/c950aaf0/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json b/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json
index 85eb484..3b92500 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json
@@ -32,7 +32,7 @@
"stack_version": "2.3",
"host_sys_prepped": "false",
"db_name": "ambari",
- "jdk_name": "jdk-8u40-linux-x64.tar.gz",
+ "jdk_name": "jdk-8u60-linux-x64.tar.gz",
"ambari_db_rca_driver": "org.postgresql.Driver",
"current_version": "2.3.0.0-1889",
"ambari_db_rca_username": "mapred",
@@ -256,4 +256,4 @@
"c6401.ambari.apache.org"
]
}
-}
\ No newline at end of file
+}