Bläddra i källkod

AMBARI-13727. Update Ambari 1.8 JDK build number to 1.8u60 (srimanth)

Srimanth Gunturi 9 år sedan
förälder
incheckning
b4397f32d7

+ 3 - 3
ambari-server/conf/unix/ambari.properties

@@ -32,8 +32,8 @@ jdk1.7.jcpol-file=UnlimitedJCEPolicyJDK7.zip
 jdk1.7.home=/usr/jdk64/
 jdk1.7.home=/usr/jdk64/
 jdk1.7.re=(jdk.*)/jre
 jdk1.7.re=(jdk.*)/jre
 jdk1.8.desc=Oracle JDK 1.8 + Java Cryptography Extension (JCE) Policy Files 8
 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-url=http://public-repo-1.hortonworks.com/ARTIFACTS/jce_policy-8.zip
 jdk1.8.jcpol-file=jce_policy-8.zip
 jdk1.8.jcpol-file=jce_policy-8.zip
 jdk1.8.home=/usr/jdk64/
 jdk1.8.home=/usr/jdk64/
@@ -106,4 +106,4 @@ http.x-frame-options=DENY
 # HTTP Header settings for Ambari Views
 # HTTP Header settings for Ambari Views
 views.http.strict-transport-security=max-age=31536000
 views.http.strict-transport-security=max-age=31536000
 views.http.x-xss-protection=1; mode=block
 views.http.x-xss-protection=1; mode=block
-views.http.x-frame-options=SAMEORIGIN
+views.http.x-frame-options=SAMEORIGIN

+ 1 - 1
ambari-server/src/main/python/ambari_server/serverSetup.py

@@ -746,7 +746,7 @@ class JDKSetupLinux(JDKSetup):
     super(JDKSetupLinux, self).__init__()
     super(JDKSetupLinux, self).__init__()
     self.JDK_DEFAULT_CONFIGS = [
     self.JDK_DEFAULT_CONFIGS = [
       JDKRelease("jdk1.8", "Oracle JDK 1.8 + Java Cryptography Extension (JCE) Policy Files 8",
       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",
                  "http://public-repo-1.hortonworks.com/ARTIFACTS/jce_policy-8.zip", "jce_policy-8.zip",
                  "/usr/jdk64/jdk1.8.0_40",
                  "/usr/jdk64/jdk1.8.0_40",
                  "(jdk.*)/jre")
                  "(jdk.*)/jre")

+ 2 - 2
ambari-server/src/test/python/stacks/2.2/configs/knox_upgrade.json

@@ -38,7 +38,7 @@
         "host_sys_prepped": "false", 
         "host_sys_prepped": "false", 
         "ambari_db_rca_username": "mapred", 
         "ambari_db_rca_username": "mapred", 
         "current_version": "2.3.0.0-2075", 
         "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", 
         "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar", 
         "repo_info": "[]", 
         "repo_info": "[]", 
         "custom_command": "RESTART", 
         "custom_command": "RESTART", 
@@ -199,4 +199,4 @@
             "c6401.ambari.apache.org"
             "c6401.ambari.apache.org"
         ]
         ]
     }
     }
-}
+}

+ 1 - 1
ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json

@@ -52,7 +52,7 @@
         "stack_version": "2.3", 
         "stack_version": "2.3", 
         "stack_name": "HDP", 
         "stack_name": "HDP", 
         "db_name": "ambari", 
         "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", 
         "ambari_db_rca_driver": "org.postgresql.Driver", 
         "java_version": "8", 
         "java_version": "8", 
         "ambari_db_rca_username": "mapred", 
         "ambari_db_rca_username": "mapred", 

+ 1 - 1
ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json

@@ -57,7 +57,7 @@
         "stack_version": "2.3", 
         "stack_version": "2.3", 
         "stack_name": "HDP", 
         "stack_name": "HDP", 
         "db_name": "ambari", 
         "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", 
         "ambari_db_rca_driver": "org.postgresql.Driver", 
         "java_version": "8", 
         "java_version": "8", 
         "ambari_db_rca_username": "mapred", 
         "ambari_db_rca_username": "mapred", 

+ 2 - 2
ambari-server/src/test/python/stacks/2.3/configs/storm_default.json

@@ -32,7 +32,7 @@
         "stack_version": "2.3", 
         "stack_version": "2.3", 
         "host_sys_prepped": "false", 
         "host_sys_prepped": "false", 
         "db_name": "ambari", 
         "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", 
         "ambari_db_rca_driver": "org.postgresql.Driver", 
         "current_version": "2.3.0.0-1889", 
         "current_version": "2.3.0.0-1889", 
         "ambari_db_rca_username": "mapred", 
         "ambari_db_rca_username": "mapred", 
@@ -245,4 +245,4 @@
             "c6401.ambari.apache.org"
             "c6401.ambari.apache.org"
         ]
         ]
     }
     }
-}
+}

+ 2 - 2
ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json

@@ -32,7 +32,7 @@
         "stack_version": "2.3", 
         "stack_version": "2.3", 
         "host_sys_prepped": "false", 
         "host_sys_prepped": "false", 
         "db_name": "ambari", 
         "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", 
         "ambari_db_rca_driver": "org.postgresql.Driver", 
         "current_version": "2.3.0.0-1889", 
         "current_version": "2.3.0.0-1889", 
         "ambari_db_rca_username": "mapred", 
         "ambari_db_rca_username": "mapred", 
@@ -256,4 +256,4 @@
             "c6401.ambari.apache.org"
             "c6401.ambari.apache.org"
         ]
         ]
     }
     }
-}
+}