This is an automated email from the ASF dual-hosted git repository. nic pushed a commit to branch 3.0.x-hadoop3.1 in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 1f2c81857e7c8333a13fec96b675db3c2dce3d62 Author: rupengwang <wangrup...@live.cn> AuthorDate: Sat Feb 29 13:12:21 2020 +0800 Upgrade tomcat vertion to 8.5.51 --- build/script/download-tomcat.sh | 8 ++++---- pom.xml | 2 +- server/src/main/java/org/apache/kylin/rest/DebugTomcat.java | 2 +- .../java/org/apache/kylin/tool/extractor/HBaseUsageExtractor.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/script/download-tomcat.sh b/build/script/download-tomcat.sh index 0f580e9..ae562a3 100755 --- a/build/script/download-tomcat.sh +++ b/build/script/download-tomcat.sh @@ -27,19 +27,19 @@ if [[ `uname -a` =~ "Darwin" ]]; then alias md5cmd="md5 -q" fi -tomcat_pkg_version="7.0.100" -tomcat_pkg_md5="79be4ba5a6e770730a4be3d5cb3c7862" +tomcat_pkg_version="8.5.51" +tomcat_pkg_md5="be0e56e47b2b3d56a2fec527d3e14ee1" if [ ! -f "build/apache-tomcat-${tomcat_pkg_version}.tar.gz" ] then echo "no binary file found" - wget --directory-prefix=build/ http://archive.apache.org/dist/tomcat/tomcat-7/v${tomcat_pkg_version}/bin/apache-tomcat-${tomcat_pkg_version}.tar.gz || echo "Download tomcat failed" + wget --directory-prefix=build/ http://archive.apache.org/dist/tomcat/tomcat-8/v${tomcat_pkg_version}/bin/apache-tomcat-${tomcat_pkg_version}.tar.gz || echo "Download tomcat failed" else if [ `md5cmd build/apache-tomcat-${tomcat_pkg_version}.tar.gz | awk '{print $1}'` != "${tomcat_pkg_md5}" ] then echo "md5 check failed" rm build/apache-tomcat-${tomcat_pkg_version}.tar.gz - wget --directory-prefix=build/ http://archive.apache.org/dist/tomcat/tomcat-7/v${tomcat_pkg_version}/bin/apache-tomcat-${tomcat_pkg_version}.tar.gz || echo "download tomcat failed" + wget --directory-prefix=build/ http://archive.apache.org/dist/tomcat/tomcat-8/v${tomcat_pkg_version}/bin/apache-tomcat-${tomcat_pkg_version}.tar.gz || echo "download tomcat failed" fi fi unalias md5cmd diff --git a/pom.xml b/pom.xml index 902cbd4..859a056 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ <cglib.version>3.2.4</cglib.version> <supercsv.version>2.4.0</supercsv.version> <cors.version>2.5</cors.version> - <tomcat.version>7.0.100</tomcat.version> + <tomcat.version>8.5.51</tomcat.version> <t-digest.version>3.1</t-digest.version> <freemarker.version>2.3.23</freemarker.version> <rocksdb.version>5.9.2</rocksdb.version> diff --git a/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java b/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java index a238a8f..96698f9 100644 --- a/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java +++ b/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java @@ -21,7 +21,7 @@ package org.apache.kylin.rest; import org.apache.catalina.Context; import org.apache.catalina.core.AprLifecycleListener; import org.apache.catalina.core.StandardServer; -import org.apache.catalina.deploy.ErrorPage; +import org.apache.tomcat.util.descriptor.web.ErrorPage; import org.apache.catalina.startup.Tomcat; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; diff --git a/tool/src/main/java/org/apache/kylin/tool/extractor/HBaseUsageExtractor.java b/tool/src/main/java/org/apache/kylin/tool/extractor/HBaseUsageExtractor.java index 72129c3..f576339 100644 --- a/tool/src/main/java/org/apache/kylin/tool/extractor/HBaseUsageExtractor.java +++ b/tool/src/main/java/org/apache/kylin/tool/extractor/HBaseUsageExtractor.java @@ -90,7 +90,7 @@ public class HBaseUsageExtractor extends AbstractInfoExtractor { extractor.execute(args); } - private String getHBaseMasterUrl() throws IOException, KeeperException { + private String getHBaseMasterUrl() { String host = conf.get("hbase.master.info.bindAddress"); if (host.equals("0.0.0.0")) { try {