You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by ta...@apache.org on 2019/08/19 23:44:02 UTC
[impala] 03/03: IMPALA-8866: Bump versions of dependencies
This is an automated email from the ASF dual-hosted git repository.
tarmstrong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
commit 014c455aaaa38010ae706228f7b439c080c0bc7d
Author: Tim Armstrong <ta...@cloudera.com>
AuthorDate: Tue Aug 13 17:59:33 2019 -0700
IMPALA-8866: Bump versions of dependencies
Bumped derby to next patch version, 10.14.2.0
Bumped jackson-databind to next patch version, 2.9.9.2
Bump jquery to 3.4.1, the most recent release.
Testing:
Manually inspected debug page, clicked through most of the screens
to sanity check them.
Ran exhaustive tests with Hive 2 and Hive 3 configs.
Change-Id: Ia60d1ffec034790205404550c4bac54b247547d7
Reviewed-on: http://gerrit.cloudera.org:8080/14083
Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
.gitattributes | 2 +-
bin/rat_exclude_files.txt | 2 +-
fe/pom.xml | 12 ++++++++++++
impala-parent/pom.xml | 2 ++
www/common-header.tmpl | 2 +-
www/jquery/jquery-1.12.4.min.js | 5 -----
www/jquery/jquery-3.4.1.min.js | 2 ++
7 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/.gitattributes b/.gitattributes
index 2c1789c..2a6a642 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -17,4 +17,4 @@ www/DataTables-1.10.12/js/dataTables.foundation.min.js binary
www/DataTables-1.10.12/js/dataTables.jqueryui.min.js binary
www/DataTables-1.10.12/js/jquery.dataTables.min.js binary
www/datatables.min.js binary
-www/jquery/jquery-1.12.4.min.js binary
+www/jquery/jquery-3.4.1.min.js binary
diff --git a/bin/rat_exclude_files.txt b/bin/rat_exclude_files.txt
index 182b717..e4592e7 100644
--- a/bin/rat_exclude_files.txt
+++ b/bin/rat_exclude_files.txt
@@ -43,7 +43,7 @@ shell/ext-py/sqlparse-0.1.19/*
shell/ext-py/sasl-0.1.1/*
shell/ext-py/bitarray-0.9.0/*
www/d3.v3.min.js
-www/jquery/jquery-1.12.4.min.js
+www/jquery/jquery-3.4.1.min.js
tests/comparison/leopard/static/css/hljs.css
tests/comparison/leopard/static/js/highlight.pack.js
common/protobuf/kudu
diff --git a/fe/pom.xml b/fe/pom.xml
index 40005a5..9f96474 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -409,6 +409,12 @@ under the License.
</dependency>
<dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<version>2.3.1</version>
@@ -451,6 +457,12 @@ under the License.
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson-databind.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.23.4</version>
diff --git a/impala-parent/pom.xml b/impala-parent/pom.xml
index cb77741..46af7d8 100644
--- a/impala-parent/pom.xml
+++ b/impala-parent/pom.xml
@@ -57,6 +57,8 @@ under the License.
<!-- hive-exec seems to leak this version of guava onto our classpath,
so it's important to depend on the same one -->
<guava.version>14.0.1</guava.version>
+ <derby.version>10.14.2.0</derby.version>
+ <jackson-databind.version>2.9.9.2</jackson-databind.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
diff --git a/www/common-header.tmpl b/www/common-header.tmpl
index 2864435..033dd6b 100644
--- a/www/common-header.tmpl
+++ b/www/common-header.tmpl
@@ -21,7 +21,7 @@ common-footer.tmpl) }}
<!DOCTYPE html>
<html>
<head><title>Apache Impala</title>
- <script src='/www/jquery/jquery-1.12.4.min.js'></script>
+ <script src='/www/jquery/jquery-3.4.1.min.js'></script>
<script src='/www/bootstrap/js/bootstrap.min.js'></script>
<script src='/www/scripts/util.js'></script>
<link rel="stylesheet" type="text/css" href="/www/datatables.min.css"/>
diff --git a/www/jquery/jquery-1.12.4.min.js b/www/jquery/jquery-1.12.4.min.js
deleted file mode 100644
index e836475..0000000
--- a/www/jquery/jquery-1.12.4.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*! jQuery v1.12.4 | (c) jQuery Foundation | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="1.12.4",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r [...]
-}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(M(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),"object"!=typeof b&&"function"!=typeof b||(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d& [...]
-marginLeft:0},function(){return a.getBoundingClientRect().left}):0))+"px":void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+V[d]+b]=f[d]||f[d-2]||f[0];return e}},Na.test(a)||(n.cssHooks[a+b].set=db)}),n.fn.extend({css:function(a,b){return Y(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Ra(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return v [...]
-padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return Y(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.extend({bind:function(a,b,c){ [...]
diff --git a/www/jquery/jquery-3.4.1.min.js b/www/jquery/jquery-3.4.1.min.js
new file mode 100644
index 0000000..a1c07fd
--- /dev/null
+++ b/www/jquery/jquery-3.4.1.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.4.1 | (c) JS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e& [...]