Repository: ranger Updated Branches: refs/heads/master 370cb4fc6 -> 9260e0de0
RANGER-1797:Tomcat Security Vulnerability Alert. The version of the tomcat for ranger should upgrade to 7.0.82. Signed-off-by: peng.jianhua <peng.jian...@zte.com.cn> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/9260e0de Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/9260e0de Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/9260e0de Branch: refs/heads/master Commit: 9260e0de099d1c4c092c276217088b7512db134a Parents: 370cb4f Author: peng.jianhua <peng.jian...@zte.com.cn> Authored: Tue Dec 5 10:23:34 2017 +0800 Committer: peng.jianhua <peng.jian...@zte.com.cn> Committed: Wed Dec 6 10:24:38 2017 +0800 ---------------------------------------------------------------------- embeddedwebserver/pom.xml | 5 +++++ pom.xml | 2 +- src/main/assembly/admin-web.xml | 1 + src/main/assembly/kms.xml | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/9260e0de/embeddedwebserver/pom.xml ---------------------------------------------------------------------- diff --git a/embeddedwebserver/pom.xml b/embeddedwebserver/pom.xml index 8169957..0af4478 100644 --- a/embeddedwebserver/pom.xml +++ b/embeddedwebserver/pom.xml @@ -34,6 +34,11 @@ <version>${tomcat.embed.version}</version> </dependency> <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-annotations-api</artifactId> + <version>${tomcat.embed.version}</version> + </dependency> + <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-el</artifactId> <version>${tomcat.embed.version}</version> http://git-wip-us.apache.org/repos/asf/ranger/blob/9260e0de/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 589cd6a..c603d66 100644 --- a/pom.xml +++ b/pom.xml @@ -212,7 +212,7 @@ <springframework.version>3.2.10.RELEASE</springframework.version> <sqoop.version>1.99.7</sqoop.version> <storm.version>1.0.2</storm.version> - <tomcat.embed.version>7.0.77</tomcat.embed.version> + <tomcat.embed.version>7.0.82</tomcat.embed.version> <velocity.version>1.7</velocity.version> <zookeeper.version>3.4.6</zookeeper.version> <hive.thrift.version>0.9.3</hive.thrift.version> http://git-wip-us.apache.org/repos/asf/ranger/blob/9260e0de/src/main/assembly/admin-web.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/admin-web.xml b/src/main/assembly/admin-web.xml index aa37426..29d728a 100644 --- a/src/main/assembly/admin-web.xml +++ b/src/main/assembly/admin-web.xml @@ -200,6 +200,7 @@ <outputDirectory>/ews/lib</outputDirectory> <includes> <include>org.apache.tomcat.embed:tomcat-embed*</include> + <include>org.apache.tomcat:tomcat-annotations-api*</include> <include>org.eclipse.jdt.core.compiler:ecj:jar:P20140317-1600</include> <include>log4j:log4j</include> <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include> http://git-wip-us.apache.org/repos/asf/ranger/blob/9260e0de/src/main/assembly/kms.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/kms.xml b/src/main/assembly/kms.xml index 7c40ce4..120ee00 100755 --- a/src/main/assembly/kms.xml +++ b/src/main/assembly/kms.xml @@ -137,6 +137,7 @@ <outputDirectory>/ews/webapp/WEB-INF/classes/lib</outputDirectory> <includes> <include>org.apache.tomcat.embed:tomcat-embed*</include> + <include>org.apache.tomcat:tomcat-annotations-api*</include> <include>org.eclipse.jdt.core.compiler:ecj:jar:P20140317-1600</include> <include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include> <include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include>
