This is an automated email from the ASF dual-hosted git repository. nic pushed a commit to branch 2.6.x-hadoop3.1 in repository https://gitbox.apache.org/repos/asf/kylin.git
commit ec17aec387dc135055f86be3a51826b13dca6c3c 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 | 4 ++-- pom.xml | 2 +- server/src/main/java/org/apache/kylin/rest/DebugTomcat.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/script/download-tomcat.sh b/build/script/download-tomcat.sh index defd2aa..17b4345 100755 --- a/build/script/download-tomcat.sh +++ b/build/script/download-tomcat.sh @@ -27,8 +27,8 @@ if [[ `uname -a` =~ "Darwin" ]]; then alias md5cmd="md5 -q" fi -tomcat_pkg_version="8.5.33" -tomcat_pkg_md5="79a5ce0bb2c1503a8e46bf00c6ed9181" +tomcat_pkg_version="8.5.51" +tomcat_pkg_md5="be0e56e47b2b3d56a2fec527d3e14ee1" if [ ! -f "build/apache-tomcat-${tomcat_pkg_version}.tar.gz" ] then diff --git a/pom.xml b/pom.xml index 1d888b2..f7d05b0 100644 --- a/pom.xml +++ b/pom.xml @@ -124,7 +124,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 db28595..ef1dbb8 100644 --- a/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java +++ b/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java @@ -25,7 +25,7 @@ import java.lang.reflect.Modifier; 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;