[kylin] branch 2.5.x-hadoop3.1 updated: Upgrade tomcat vertion to 8.5.51

[sh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

shaofengshi pushed a commit to branch 2.5.x-hadoop3.1
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/2.5.x-hadoop3.1 by this push:
     new 3e4a34a  Upgrade tomcat vertion to 8.5.51
3e4a34a is described below

commit 3e4a34a7560e06b939922344dbec8d3ba2b5a4b9
Author: rupengwang <wa...@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                                                     | 4 ++--
 server/src/main/java/org/apache/kylin/rest/DebugTomcat.java | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/script/download-tomcat.sh b/build/script/download-tomcat.sh
index eefc6ba..7823e32 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 5220c47..2c9440b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,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.91</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>
@@ -1004,7 +1004,7 @@
         <repository>
             <id>nexus</id>
             <name>Kyligence Repository</name>
-            <url>http://repository.kyligence.io:8081/repository/maven-public/
+            <url>https://repository.kyligence.io/repository/maven-public/
             </url>
             <releases>
                 <enabled>true</enabled>
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;