HBASE-16312 update jquery version Upgrade jquery from 1.8.3 to 3.2.1 in hbase-server and hbase-thrift modules
Change-Id: I92d479e9802d954f607ba409077bc98581e9e5ca Signed-off-by: Michael Stack <st...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f10f8198 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f10f8198 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f10f8198 Branch: refs/heads/HBASE-18147 Commit: f10f8198afed36a40faa459fe4aa4646838832af Parents: 6b7ebc0 Author: Peter Somogyi <psomo...@cloudera.com> Authored: Mon Jul 10 13:27:12 2017 +0200 Committer: Michael Stack <st...@apache.org> Committed: Wed Jul 19 11:44:31 2017 +0100 ---------------------------------------------------------------------- hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp | 2 -- .../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 2 -- .../apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon | 2 -- .../src/main/resources/hbase-webapps/master/procedures.jsp | 2 -- .../src/main/resources/hbase-webapps/master/processMaster.jsp | 2 -- .../src/main/resources/hbase-webapps/master/processRS.jsp | 2 -- .../src/main/resources/hbase-webapps/master/snapshot.jsp | 2 -- .../src/main/resources/hbase-webapps/master/snapshotsStats.jsp | 2 -- hbase-server/src/main/resources/hbase-webapps/master/table.jsp | 2 -- .../src/main/resources/hbase-webapps/master/tablesDetailed.jsp | 2 -- hbase-server/src/main/resources/hbase-webapps/master/zk.jsp | 2 -- .../main/resources/hbase-webapps/regionserver/processRS.jsp | 2 -- .../src/main/resources/hbase-webapps/regionserver/region.jsp | 2 -- .../main/resources/hbase-webapps/regionserver/storeFile.jsp | 2 -- .../src/main/resources/hbase-webapps/static/js/jquery.min.js | 6 ++++-- .../src/main/resources/hbase-webapps/thrift/thrift.jsp | 2 -- .../src/main/resources/hbase-webapps/static/js/jquery.min.js | 6 ++++-- .../src/main/resources/hbase-webapps/thrift/thrift.jsp | 2 -- 18 files changed, 8 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/f10f8198/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp ---------------------------------------------------------------------- diff --git a/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp b/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp index e002749..ba3c027 100644 --- a/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp +++ b/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp @@ -27,9 +27,7 @@ Configuration conf = (Configuration)getServletContext().getAttribute("hbase.conf long startcode = conf.getLong("startcode", System.currentTimeMillis()); String listenPort = conf.get("hbase.rest.port", "8080"); %> -<!--[if IE]> <!DOCTYPE html> -<![endif]--> <?xml version="1.0" encoding="UTF-8" ?> <html lang="en"> <head> http://git-wip-us.apache.org/repos/asf/hbase/blob/f10f8198/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon index 708e72d..bf3b623 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon @@ -93,9 +93,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); } </%class> -<!--[if IE]> <!DOCTYPE html> -<![endif]--> <?xml version="1.0" encoding="UTF-8" ?> <html lang="en"> <head> http://git-wip-us.apache.org/repos/asf/hbase/blob/f10f8198/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon index 7219c0a..61795e0 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon @@ -50,9 +50,7 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker; : masterAddressTracker.getMasterAddress(); int infoPort = masterAddressTracker == null ? 0 : masterAddressTracker.getMasterInfoPort(); </%java> -<!--[if IE]> <!DOCTYPE html> -<![endif]--> <?xml version="1.0" encoding="UTF-8" ?> <html lang="en"> <head> http://git-wip-us.apache.org/repos/asf/hbase/blob/f10f8198/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp b/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp index 00d8ead..29c3d45 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp @@ -59,9 +59,7 @@ List<LockInfo> locks = master.listLocks(); %> -<!--[if IE]> <!DOCTYPE html> -<![endif]--> <?xml version="1.0" encoding="UTF-8" ?> <html xmlns="http://www.w3.org/1999/xhtml"> <head> http://git-wip-us.apache.org/repos/asf/hbase/blob/f10f8198/hbase-server/src/main/resources/hbase-webapps/master/processMaster.jsp ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/processMaster.jsp b/hbase-server/src/main/resources/hbase-webapps/master/processMaster.jsp index b1211b9..d8e29ce 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/processMaster.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/processMaster.jsp @@ -45,9 +45,7 @@ collector2 = gcBeans.get(1); } catch(IndexOutOfBoundsException e) {} List<MemoryPoolMXBean> mPools = JSONMetricUtil.getMemoryPools(); %> -<!--[if IE]> <!DOCTYPE html> -<![endif]--> <?xml version="1.0" encoding="UTF-8" ?> <html xmlns="http://www.w3.org/1999/xhtml"> <head> http://git-wip-us.apache.org/repos/asf/hbase/blob/f10f8198/hbase-server/src/main/resources/hbase-webapps/master/processRS.jsp ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/processRS.jsp b/hbase-server/src/main/resources/hbase-webapps/master/processRS.jsp index fa1f7d1..6abf8a1 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/processRS.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/processRS.jsp @@ -46,9 +46,7 @@ collector2 = gcBeans.get(1); } catch(IndexOutOfBoundsException e) {} List<MemoryPoolMXBean> mPools = JSONMetricUtil.getMemoryPools(); %> -<!--[if IE]> <!DOCTYPE html> -<![endif]--> <?xml version="1.0" encoding="UTF-8" ?> <html xmlns="http://www.w3.org/1999/xhtml"> <head> http://git-wip-us.apache.org/repos/asf/hbase/blob/f10f8198/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp b/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp index a6ec23d..1733613 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp @@ -54,9 +54,7 @@ String cloneName = request.getParameter("cloneName"); boolean isActionResultPage = (!readOnly && action != null); %> -<!--[if IE]> <!DOCTYPE html> -<![endif]--> <?xml version="1.0" encoding="UTF-8" ?> <html xmlns="http://www.w3.org/1999/xhtml"> <head> http://git-wip-us.apache.org/repos/asf/hbase/blob/f10f8198/hbase-server/src/main/resources/hbase-webapps/master/snapshotsStats.jsp ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/snapshotsStats.jsp b/hbase-server/src/main/resources/hbase-webapps/master/snapshotsStats.jsp index 434784d..cf022c3 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/snapshotsStats.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/snapshotsStats.jsp @@ -51,9 +51,7 @@ totalSize = totalSharedSize.get() + totalArchivedSize.get() + totalMobSize.get(); } %> -<!--[if IE]> <!DOCTYPE html> -<![endif]--> <?xml version="1.0" encoding="UTF-8" ?> <html xmlns="http://www.w3.org/1999/xhtml"> <head> http://git-wip-us.apache.org/repos/asf/hbase/blob/f10f8198/hbase-server/src/main/resources/hbase-webapps/master/table.jsp ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp index fbf26d8..6f3baf0 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp @@ -116,9 +116,7 @@ int numRegions = 0; %> -<!--[if IE]> <!DOCTYPE html> -<![endif]--> <?xml version="1.0" encoding="UTF-8" ?> <html xmlns="http://www.w3.org/1999/xhtml"> <head> http://git-wip-us.apache.org/repos/asf/hbase/blob/f10f8198/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp b/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp index eaa8c8f..044a832 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp @@ -30,9 +30,7 @@ HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER); Configuration conf = master.getConfiguration(); %> -<!--[if IE]> <!DOCTYPE html> -<![endif]--> <?xml version="1.0" encoding="UTF-8" ?> <html lang="en"> <head> http://git-wip-us.apache.org/repos/asf/hbase/blob/f10f8198/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp b/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp index d08a2c4..e1db648 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp @@ -26,9 +26,7 @@ HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER); ZooKeeperWatcher watcher = master.getZooKeeper(); %> -<!--[if IE]> <!DOCTYPE html> -<![endif]--> <?xml version="1.0" encoding="UTF-8" ?> <!-- Dont put a doctype jetty doesnt serve the css/js out correctly so we need quirks mode on --> <html xmlns="http://www.w3.org/1999/xhtml"> http://git-wip-us.apache.org/repos/asf/hbase/blob/f10f8198/hbase-server/src/main/resources/hbase-webapps/regionserver/processRS.jsp ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/regionserver/processRS.jsp b/hbase-server/src/main/resources/hbase-webapps/regionserver/processRS.jsp index fa1f7d1..6abf8a1 100644 --- a/hbase-server/src/main/resources/hbase-webapps/regionserver/processRS.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/regionserver/processRS.jsp @@ -46,9 +46,7 @@ collector2 = gcBeans.get(1); } catch(IndexOutOfBoundsException e) {} List<MemoryPoolMXBean> mPools = JSONMetricUtil.getMemoryPools(); %> -<!--[if IE]> <!DOCTYPE html> -<![endif]--> <?xml version="1.0" encoding="UTF-8" ?> <html xmlns="http://www.w3.org/1999/xhtml"> <head> http://git-wip-us.apache.org/repos/asf/hbase/blob/f10f8198/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp b/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp index 6a7fe7b..347c12d 100644 --- a/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp @@ -40,9 +40,7 @@ String displayName = HRegionInfo.getRegionNameAsStringForDisplay(region.getRegionInfo(), rs.getConfiguration()); %> -<!--[if IE]> <!DOCTYPE html> -<![endif]--> <?xml version="1.0" encoding="UTF-8" ?> <html lang="en"> <head> http://git-wip-us.apache.org/repos/asf/hbase/blob/f10f8198/hbase-server/src/main/resources/hbase-webapps/regionserver/storeFile.jsp ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/regionserver/storeFile.jsp b/hbase-server/src/main/resources/hbase-webapps/regionserver/storeFile.jsp index fe8cfe0..5997e24 100644 --- a/hbase-server/src/main/resources/hbase-webapps/regionserver/storeFile.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/regionserver/storeFile.jsp @@ -32,9 +32,7 @@ HRegionServer rs = (HRegionServer) getServletContext().getAttribute(HRegionServer.REGIONSERVER); Configuration conf = rs.getConfiguration(); %> -<!--[if IE]> <!DOCTYPE html> -<![endif]--> <?xml version="1.0" encoding="UTF-8" ?> <html lang="en"> <head>