This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-1.1-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.1-lts by this push:
new 026538a514 [chore](be web ui)upgrade jquery version to 3.6.0 #13947
026538a514 is described below
commit 026538a51462513eaf5ffb84dbe98dd7ceb08192
Author: jiafeng.zhang <zhang...@gmail.com>
AuthorDate: Thu Nov 3 18:59:29 2022 +0800
[chore](be web ui)upgrade jquery version to 3.6.0 #13947
---
be/src/http/web_page_handler.cpp | 2 +-
thirdparty/build-thirdparty.sh | 4 ++--
thirdparty/vars.sh | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/be/src/http/web_page_handler.cpp b/be/src/http/web_page_handler.cpp
index a4424c930b..fafda07216 100644
--- a/be/src/http/web_page_handler.cpp
+++ b/be/src/http/web_page_handler.cpp
@@ -128,7 +128,7 @@ static const std::string kMainTemplate = R"(
<meta charset='utf-8'/>
<link href='/Bootstrap-3.3.7/css/bootstrap.min.css' rel='stylesheet'
media='screen' />
<link href='/Bootstrap-3.3.7/css/bootstrap-table.min.css' rel='stylesheet'
media='screen' />
- <script src='/jQuery-3.3.1/jquery-3.3.1.min.js'></script>
+ <script src='/jQuery-3.6.0/jquery-3.6.0.min.js'></script>
<script src='/Bootstrap-3.3.7/js/bootstrap.min.js' defer></script>
<script src='/Bootstrap-3.3.7/js/bootstrap-table.min.js' defer></script>
<script src='/doris.js' defer></script>
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index a9ceb3820c..54f4de9e86 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -1117,13 +1117,13 @@ build_cctz() {
build_js_and_css() {
check_if_source_exist "${DATATABLES_SOURCE}"
check_if_source_exist 'Bootstrap-3.3.7'
- check_if_source_exist 'jQuery-3.3.1'
+ check_if_source_exist 'jQuery-3.6.0'
mkdir -p "${TP_INSTALL_DIR}/webroot"
cd "${TP_SOURCE_DIR}"
cp -r "${DATATABLES_SOURCE}" "${TP_INSTALL_DIR}/webroot/"
cp -r Bootstrap-3.3.7 "${TP_INSTALL_DIR}/webroot/"
- cp -r jQuery-3.3.1 "${TP_INSTALL_DIR}/webroot/"
+ cp -r jQuery-3.6.0 "${TP_INSTALL_DIR}/webroot/"
cp bootstrap-table.min.js "${TP_INSTALL_DIR}/webroot/Bootstrap-3.3.7/js"
cp bootstrap-table.min.css "${TP_INSTALL_DIR}/webroot/Bootstrap-3.3.7/css"
}
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index 96148f6628..b336c72017 100755
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -297,10 +297,10 @@ CCTZ_MD5SUM="209348e50b24dbbdec6d961059c2fc92"
# The origin download url is always changing:
https://datatables.net/download/builder?bs-3.3.7/jq-3.3.1/dt-1.10.25
# So we put it in our own http server.
# If someone can offer an official url for DataTables, please update this.
-DATATABLES_DOWNLOAD="https://doris-thirdparty-repo.bj.bcebos.com/thirdparty/DataTables.zip";
+DATATABLES_DOWNLOAD="https://github.com/apache/doris-thirdparty/releases/download/datatables-1.12.1/DataTables.zip";
DATATABLES_NAME="DataTables.zip"
-DATATABLES_SOURCE="DataTables-1.10.25"
-DATATABLES_MD5SUM="c8fd73997c9871e213ee4211847deed5"
+DATATABLES_SOURCE="DataTables-1.12.1"
+DATATABLES_MD5SUM="a3dd92a2a8b7254443e102a43036d743"
# bootstrap table js
BOOTSTRAP_TABLE_JS_DOWNLOAD="https://unpkg.com/bootstrap-table@1.17.1/dist/bootstrap-table.min.js";
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
