Repository: kylin Updated Branches: refs/heads/master 4a202d16d -> e7740c852
KYLIN-1774 update tomcat version Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/e7740c85 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e7740c85 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e7740c85 Branch: refs/heads/master Commit: e7740c852e5db40e2c37527de2e99d81e3beb928 Parents: 4a202d1 Author: shaofengshi <shaofeng...@apache.org> Authored: Wed Jun 8 16:39:17 2016 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Wed Jun 8 16:39:17 2016 +0800 ---------------------------------------------------------------------- build/script/download-tomcat.sh | 14 +++++++------- server/pom.xml | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/e7740c85/build/script/download-tomcat.sh ---------------------------------------------------------------------- diff --git a/build/script/download-tomcat.sh b/build/script/download-tomcat.sh index ea2b86e..87467ce 100755 --- a/build/script/download-tomcat.sh +++ b/build/script/download-tomcat.sh @@ -27,22 +27,22 @@ if [[ `uname -a` =~ "Darwin" ]]; then alias md5cmd="md5 -q" fi -if [ ! -f "build/apache-tomcat-7.0.59.tar.gz" ] +if [ ! -f "build/apache-tomcat-7.0.69.tar.gz" ] then echo "no binary file found" - wget --directory-prefix=build/ http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.59/bin/apache-tomcat-7.0.59.tar.gz || echo "download tomcat failed" + wget --directory-prefix=build/ http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.69/bin/apache-tomcat-7.0.69.tar.gz || echo "download tomcat failed" else - if [ `md5cmd build/apache-tomcat-7.0.59.tar.gz | awk '{print $1}'` != "ec570258976edf9a833cd88fd9220909" ] + if [ `md5cmd build/apache-tomcat-7.0.69.tar.gz | awk '{print $1}'` != "10a071e5169a1a8b14ff35a0ad181052" ] then echo "md5 check failed" - rm build/apache-tomcat-7.0.59.tar.gz - wget --directory-prefix=build/ http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.59/bin/apache-tomcat-7.0.59.tar.gz || echo "download tomcat failed" + rm build/apache-tomcat-7.0.69.tar.gz + wget --directory-prefix=build/ http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.69/bin/apache-tomcat-7.0.69.tar.gz || echo "download tomcat failed" fi fi unalias md5cmd -tar -zxvf build/apache-tomcat-7.0.59.tar.gz -C build/ -mv build/apache-tomcat-7.0.59 build/tomcat +tar -zxvf build/apache-tomcat-7.0.69.tar.gz -C build/ +mv build/apache-tomcat-7.0.69 build/tomcat rm -rf build/tomcat/webapps/* mv build/tomcat/conf/server.xml build/tomcat/conf/server.xml.bak http://git-wip-us.apache.org/repos/asf/kylin/blob/e7740c85/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index bb70808..3909d79 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -411,19 +411,19 @@ <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-catalina</artifactId> - <version>7.0.52</version> + <version>7.0.69</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-jasper</artifactId> - <version>7.0.52</version> + <version>7.0.69</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-core</artifactId> - <version>7.0.52</version> + <version>7.0.69</version> <scope>provided</scope> </dependency> <dependency>