You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by pr...@apache.org on 2019/06/10 08:33:21 UTC

[ranger] branch master updated: RANGER-2464: Upgrade spring, zookeeper, c3p0, jackson-databind, tomcat libraries

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

pradeep pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/master by this push:
     new 3503738  RANGER-2464: Upgrade spring, zookeeper, c3p0, jackson-databind, tomcat libraries
3503738 is described below

commit 35037380d4eb099c31ee52efcd5d0c0429d8e3b4
Author: Pradeep <pr...@apache.org>
AuthorDate: Fri Jun 7 15:05:59 2019 +0530

    RANGER-2464: Upgrade spring, zookeeper, c3p0, jackson-databind, tomcat libraries
---
 pom.xml                         | 16 ++++++++--------
 security-admin/pom.xml          |  5 +++++
 src/main/assembly/admin-web.xml |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 74305dc..5b1eb65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,11 +84,11 @@
         <aspectj.version>1.8.2</aspectj.version>
         <atlas.version>2.0.0</atlas.version>
         <atlas.gson.version>2.5</atlas.gson.version>
-        <atlas.jackson.version>2.9.8</atlas.jackson.version>
+        <atlas.jackson.version>2.9.9</atlas.jackson.version>
         <atlas.jettison.version>1.3.7</atlas.jettison.version>
         <atlas.commons.logging.version>1.1.3</atlas.commons.logging.version>
         <bouncycastle.version>1.55</bouncycastle.version>
-        <c3p0.version>0.9.5.2</c3p0.version>
+        <c3p0.version>0.9.5.3</c3p0.version>
         <cglib.version>2.2.0-b23</cglib.version>
         <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
         <commons.beanutils.version>1.9.3</commons.beanutils.version>
@@ -172,18 +172,18 @@
         <slf4j-api.version>1.7.25</slf4j-api.version>
         <solr.version>7.7.1</solr.version>
         <spring-ldap-core.version>2.3.2.RELEASE</spring-ldap-core.version>
-        <springframework.security.version>4.2.7.RELEASE</springframework.security.version>
-        <springframework.test.version>4.3.18.RELEASE</springframework.test.version>
-        <springframework.version>4.3.18.RELEASE</springframework.version>
+        <springframework.security.version>4.2.12.RELEASE</springframework.security.version>
+        <springframework.test.version>4.3.20.RELEASE</springframework.test.version>
+        <springframework.version>4.3.20.RELEASE</springframework.version>
         <sqoop.version>1.99.7</sqoop.version>
         <storm.version>1.2.0</storm.version>
         <sun-jersey-bundle.version>1.19</sun-jersey-bundle.version>
-        <tomcat.embed.version>7.0.91</tomcat.embed.version>
+        <tomcat.embed.version>7.0.94</tomcat.embed.version>
         <velocity.version>1.7</velocity.version>
-        <zookeeper.version>3.4.13</zookeeper.version>
+        <zookeeper.version>3.4.14</zookeeper.version>
         <codehaus.woodstox.stax2api.version>3.1.4</codehaus.woodstox.stax2api.version>
 		<fasterxml.woodstox.version>5.0.3</fasterxml.woodstox.version>
-		<fasterxml.jackson.version>2.9.8</fasterxml.jackson.version>
+		<fasterxml.jackson.version>2.9.9</fasterxml.jackson.version>
 		<kstruct.gethostname4j.version>0.0.2</kstruct.gethostname4j.version>
 		<jna.version>5.2.0</jna.version>
 		<jna-platform.version>5.2.0</jna-platform.version>
diff --git a/security-admin/pom.xml b/security-admin/pom.xml
index 3ada9a3..7bf4cb9 100644
--- a/security-admin/pom.xml
+++ b/security-admin/pom.xml
@@ -561,6 +561,11 @@
             <artifactId>hbase-shaded-miscellaneous</artifactId>
             <version>${hbase-shaded-miscellaneous}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+            <version>${zookeeper.version}</version>
+        </dependency>
 	</dependencies>
     <build>
         <pluginManagement>
diff --git a/src/main/assembly/admin-web.xml b/src/main/assembly/admin-web.xml
index a2d4194..39fb054 100644
--- a/src/main/assembly/admin-web.xml
+++ b/src/main/assembly/admin-web.xml
@@ -222,7 +222,7 @@
                     <include>org.apache.httpcomponents:httpclient</include>
                     <include>org.apache.httpcomponents:httpcore</include>
                     <include>org.noggit:noggit</include>
-                    <include>org.apache.zookeeper:zookeeper</include>
+                    <include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
                     <include>org.apache.httpcomponents:httpmime</include>
                     <include>commons-codec:commons-codec</include>
                     <include>org.apache.htrace:htrace-core4:jar:${htrace-core.version}</include>