You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by co...@apache.org on 2017/02/17 12:20:54 UTC
[2/2] ranger git commit: Upgrade jersey to 1.19.3
Upgrade jersey to 1.19.3
Change-Id: I552258e4b9ab21f9018c74e3e4d8a9b656647765
Signed-off-by: Colm O hEigeartaigh <co...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/983f1bee
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/983f1bee
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/983f1bee
Branch: refs/heads/master
Commit: 983f1bee1121dfe7b3e109761f90c6be351644eb
Parents: 4734abe
Author: Zsombor Gegesy <zg...@hortonworks.com>
Authored: Mon Feb 13 16:13:16 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Feb 17 11:07:32 2017 +0000
----------------------------------------------------------------------
kms/pom.xml | 8 +++----
pom.xml | 10 ++++-----
security-admin/pom.xml | 53 +++++++++++++++++++++++++++++++++++++--------
3 files changed, 52 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/983f1bee/kms/pom.xml
----------------------------------------------------------------------
diff --git a/kms/pom.xml b/kms/pom.xml
index b7609f4..adc26d6 100644
--- a/kms/pom.xml
+++ b/kms/pom.xml
@@ -136,13 +136,13 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
- <version>${sun-jersey-bundle.version}</version>
+ <version>${jersey-core.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>${sun-jersey-bundle.version}</version>
+ <version>${jersey-server.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -190,7 +190,7 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId>
- <version>${sun-jersey-bundle.version}</version>
+ <version>${jersey-bundle.version}</version>
</dependency>
<dependency>
<groupId>asm</groupId>
@@ -346,7 +346,7 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
- <version>${sun-jersey-bundle.version}</version>
+ <version>${jersey-bundle.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
http://git-wip-us.apache.org/repos/asf/ranger/blob/983f1bee/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9dcae20..4fb62e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,9 +174,11 @@
<jaxb-api.version>2.2.2</jaxb-api.version>
<jaxb-impl.version>2.2.3-1</jaxb-impl.version>
<jericho.html.version>3.3</jericho.html.version>
- <jersey-bundle.version>1.17.1</jersey-bundle.version>
+ <jersey-bundle.version>1.19.3</jersey-bundle.version>
<jersey-client.version>2.6</jersey-client.version>
- <jersey-server.version>1.9</jersey-server.version>
+ <jersey-core.version>1.19.3</jersey-core.version>
+ <jersey-server.version>1.19.3</jersey-server.version>
+ <jersey-spring.version>1.19.3</jersey-spring.version>
<jettison.version>1.1</jettison.version>
<jline.version>0.9.94</jline.version>
<joda-time.version>2.5</joda-time.version>
@@ -212,10 +214,6 @@
<springframework.test.version>3.1.3.RELEASE</springframework.test.version>
<springframework.version>3.1.3.RELEASE</springframework.version>
<storm.version>1.0.2</storm.version>
- <sun-jersey-bundle.version>1.19</sun-jersey-bundle.version>
- <sun.jersey.bundle.version>1.4</sun.jersey.bundle.version>
- <sun.jersey.core.version>1.4</sun.jersey.core.version>
- <sun.jersey.spring.version>1.4</sun.jersey.spring.version>
<tez.version>0.5.2</tez.version>
<tomcat.embed.version>7.0.68</tomcat.embed.version>
<velocity.version>1.7</velocity.version>
http://git-wip-us.apache.org/repos/asf/ranger/blob/983f1bee/security-admin/pom.xml
----------------------------------------------------------------------
diff --git a/security-admin/pom.xml b/security-admin/pom.xml
index 9654d22..d2a9e18 100644
--- a/security-admin/pom.xml
+++ b/security-admin/pom.xml
@@ -220,17 +220,22 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId>
- <version>${sun.jersey.bundle.version}</version>
+ <version>${jersey-bundle.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
- <version>${sun.jersey.core.version}</version>
+ <version>${jersey-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>${jettison.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-spring</artifactId>
- <version>${sun.jersey.spring.version}</version>
+ <version>${jersey-spring.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -252,14 +257,22 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-multipart</artifactId>
- <version>${sun.jersey.core.version}</version>
- </dependency>
- <dependency>
+ <dependency>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-multipart</artifactId>
+ <version>${jersey-core.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<version>${solr.version}</version>
@@ -401,12 +414,34 @@
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.ranger</groupId>