This is an automated email from the ASF dual-hosted git repository.
nihaljain pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.5 by this push:
new c8638fafb29 HBASE-29167 Upgrade vega and its related js libraries
(#6759)
c8638fafb29 is described below
commit c8638fafb2926c0f7b07547251d38622518b4bba
Author: Nihal Jain <[email protected]>
AuthorDate: Fri Mar 7 11:27:25 2025 +0530
HBASE-29167 Upgrade vega and its related js libraries (#6759)
- Upgrades vega to 5.32.0, vega-lite to 5.23.0 and vega-embed to 6.29.0
- Fixes [CVE-2025-25304](https://github.com/advisories/GHSA-mp7w-mhcv-673j)
Signed-off-by: Nick Dimiduk <[email protected]>
Reviewed-by: Dávid Paksy <[email protected]>
(cherry picked from commit 98312d31c1dd47116cc7359b774f1ec3550a25cf)
---
LICENSE.txt | 4 ++--
.../org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon | 6 +++---
.../resources/hbase-webapps/static/js/[email protected] | 7 -------
.../resources/hbase-webapps/static/js/[email protected] | 7 +++++++
.../main/resources/hbase-webapps/static/js/[email protected] | 2 ++
.../main/resources/hbase-webapps/static/js/[email protected] | 2 --
.../src/main/resources/hbase-webapps/static/js/[email protected] | 2 --
.../src/main/resources/hbase-webapps/static/js/[email protected] | 2 ++
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/LICENSE.txt b/LICENSE.txt
index 197ace3b792..7705050f79e 100755
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -642,8 +642,8 @@ under a '2-clause BSD' license.
----
This project bundles a copy of the Vega minified javascript library version
-5.24.0, the Vega-Lite minified javascript library version 5.6.1, and the
-Vega-Embed minified javascript library version 6.21.3. All three are
+5.32.0, the Vega-Lite minified javascript library version 5.23.0, and the
+Vega-Embed minified javascript library version 6.29.0. All three are
available under the following '3-clause BSD' license.
Copyright (c) 2015-2023, University of Washington Interactive Data Lab
diff --git
a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon
b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon
index ee6899edc1e..0b7b0c081ca 100644
---
a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon
+++
b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon
@@ -17,9 +17,9 @@ See the License for the specific language governing
permissions and
limitations under the License.
</%doc>
- <script type="text/javascript"
src="/static/js/[email protected]"></script>
- <script type="text/javascript"
src="/static/js/[email protected]"></script>
- <script type="text/javascript"
src="/static/js/[email protected]"></script>
+ <script type="text/javascript"
src="/static/js/[email protected]"></script>
+ <script type="text/javascript"
src="/static/js/[email protected]"></script>
+ <script type="text/javascript"
src="/static/js/[email protected]"></script>
<div id="vis" style="width:80%;"></div>
<script type="text/javascript">
diff --git
a/hbase-server/src/main/resources/hbase-webapps/static/js/[email protected]
b/hbase-server/src/main/resources/hbase-webapps/static/js/[email protected]
deleted file mode 100644
index 5f8c633bc84..00000000000
---
a/hbase-server/src/main/resources/hbase-webapps/static/js/[email protected]
+++ /dev/null
@@ -1,7 +0,0 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof
module?module.exports=t(require("vega"),require("vega-lite")):"function"==typeof
define&&define.amd?define(["vega","vega-lite"],t):(e="undefined"!=typeof
globalThis?globalThis:e||self).vegaEmbed=t(e.vega,e.vegaLite)}(this,(function(e,t){"use
strict";function n(e){var t=Object.create(null);return
e&&Object.keys(e).forEach((function(n){if("default"!==n){var
r=Object.getOwnPropertyDescriptor(e,n);Object.defineProperty(t,n,r.get?r: [...]
-/*!
- * https://github.com/Starcounter-Jack/JSON-Patch
- * (c) 2017-2021 Joachim Wester
- * MIT license
- */function S(e,t){void 0===t&&(t=!1);var
n=R.get(e.object);D(n.value,e.object,e.patches,"",t),e.patches.length&&A(n.value,e.patches);var
r=e.patches;return
r.length>0&&(e.patches=[],e.callback&&e.callback(r)),r}function
D(e,t,n,r,i){if(t!==e){"function"==typeof t.toJSON&&(t=t.toJSON());for(var
o=c(t),a=c(e),s=!1,p=a.length-1;p>=0;p--){var u=e[g=a[p]];if(!l(t,g)||void
0===t[g]&&void
0!==u&&!1===Array.isArray(t))Array.isArray(e)===Array.isArray(t)?(i&&n.push({op:"test",path:r+"/"+d(g)
[...]
-//# sourceMappingURL=vega-embed.min.js.map
diff --git
a/hbase-server/src/main/resources/hbase-webapps/static/js/[email protected]
b/hbase-server/src/main/resources/hbase-webapps/static/js/[email protected]
new file mode 100644
index 00000000000..8ae62235ac4
--- /dev/null
+++
b/hbase-server/src/main/resources/hbase-webapps/static/js/[email protected]
@@ -0,0 +1,7 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof
module?module.exports=t(require("vega"),require("vega-lite")):"function"==typeof
define&&define.amd?define(["vega","vega-lite"],t):(e="undefined"!=typeof
globalThis?globalThis:e||self).vegaEmbed=t(e.vega,e.vegaLite)}(this,(function(e,t){"use
strict";function n(e){var t=Object.create(null);return
e&&Object.keys(e).forEach((function(n){if("default"!==n){var
r=Object.getOwnPropertyDescriptor(e,n);Object.defineProperty(t,n,r.get?r: [...]
+/*!
+ * https://github.com/Starcounter-Jack/JSON-Patch
+ * (c) 2017-2021 Joachim Wester
+ * MIT license
+ */function S(e,t){void 0===t&&(t=!1);var
n=$.get(e.object);C(n.value,e.object,e.patches,"",t),e.patches.length&&A(n.value,e.patches);var
r=e.patches;return
r.length>0&&(e.patches=[],e.callback&&e.callback(r)),r}function
C(e,t,n,r,i){if(t!==e){"function"==typeof t.toJSON&&(t=t.toJSON());for(var
o=c(t),a=c(e),s=!1,d=a.length-1;d>=0;d--){var u=e[g=a[d]];if(!l(t,g)||void
0===t[g]&&void
0!==u&&!1===Array.isArray(t))Array.isArray(e)===Array.isArray(t)?(i&&n.push({op:"test",path:r+"/"+p(g)
[...]
+//# sourceMappingURL=vega-embed.min.js.map
diff --git
a/hbase-server/src/main/resources/hbase-webapps/static/js/[email protected]
b/hbase-server/src/main/resources/hbase-webapps/static/js/[email protected]
new file mode 100644
index 00000000000..31b00323e15
--- /dev/null
+++
b/hbase-server/src/main/resources/hbase-webapps/static/js/[email protected]
@@ -0,0 +1,2 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof
module?t(exports,require("vega")):"function"==typeof
define&&define.amd?define(["exports","vega"],t):t((e="undefined"!=typeof
globalThis?globalThis:e||self).vegaLite={},e.vega)}(this,(function(e,t){"use
strict";var n="5.23.0";function i(e){return J(e,"or")}function r(e){return
J(e,"and")}function o(e){return J(e,"not")}function
a(e,t){if(o(e))a(e.not,t);else if(r(e))for(const n of e.and)a(n,t);else
if(i(e))for(const n of e.or)a [...]
+//# sourceMappingURL=vega-lite.min.js.map
diff --git
a/hbase-server/src/main/resources/hbase-webapps/static/js/[email protected]
b/hbase-server/src/main/resources/hbase-webapps/static/js/[email protected]
deleted file mode 100644
index 9974c4d18f5..00000000000
---
a/hbase-server/src/main/resources/hbase-webapps/static/js/[email protected]
+++ /dev/null
@@ -1,2 +0,0 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof
module?t(exports,require("vega")):"function"==typeof
define&&define.amd?define(["exports","vega"],t):t((e="undefined"!=typeof
globalThis?globalThis:e||self).vegaLite={},e.vega)}(this,(function(e,t){"use
strict";var n="5.6.1",i={};!function(e){var t=function(){function e(e,t){return
null!=t&&e instanceof t}var
t,n,i;try{t=Map}catch(e){t=function(){}}try{n=Set}catch(e){n=function(){}}try{i=Promise}catch(e){i=function(){}}function
[...]
-//# sourceMappingURL=vega-lite.min.js.map
diff --git
a/hbase-server/src/main/resources/hbase-webapps/static/js/[email protected]
b/hbase-server/src/main/resources/hbase-webapps/static/js/[email protected]
deleted file mode 100644
index 83c28e7fee3..00000000000
--- a/hbase-server/src/main/resources/hbase-webapps/static/js/[email protected]
+++ /dev/null
@@ -1,2 +0,0 @@
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof
module?e(exports):"function"==typeof
define&&define.amd?define(["exports"],e):e((t="undefined"!=typeof
globalThis?globalThis:t||self).vega={})}(this,(function(t){"use
strict";function e(t,e,n){return t.fields=e||[],t.fname=n,t}function
n(t){return null==t?null:t.fname}function r(t){return
null==t?null:t.fields}function i(t){return 1===t.length?o(t[0]):a(t)}const
o=t=>function(e){return e[t]},a=t=>{const e=t.length;return functi [...]
-//# sourceMappingURL=vega.min.js.map
diff --git
a/hbase-server/src/main/resources/hbase-webapps/static/js/[email protected]
b/hbase-server/src/main/resources/hbase-webapps/static/js/[email protected]
new file mode 100644
index 00000000000..d776440000d
--- /dev/null
+++ b/hbase-server/src/main/resources/hbase-webapps/static/js/[email protected]
@@ -0,0 +1,2 @@
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof
module?e(exports):"function"==typeof
define&&define.amd?define(["exports"],e):e((t="undefined"!=typeof
globalThis?globalThis:t||self).vega={})}(this,(function(t){"use
strict";function e(t,e,n){return t.fields=e||[],t.fname=n,t}function
n(t){return null==t?null:t.fname}function r(t){return
null==t?null:t.fields}function i(t){return 1===t.length?o(t[0]):a(t)}const
o=t=>function(e){return e[t]},a=t=>{const e=t.length;return functi [...]
+//# sourceMappingURL=vega.min.js.map
