This is an automated email from the ASF dual-hosted git repository. stevel pushed a commit to branch branch-3.3 in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push: new ea851c5e4a8 HADOOP-15983. Use jersey-json that is built to use jackson2 ((#3988) ea851c5e4a8 is described below commit ea851c5e4a8eeb2807e55e5f9ffca521604e35b3 Author: PJ Fanning <pjfann...@users.noreply.github.com> AuthorDate: Thu Oct 20 17:37:56 2022 +0100 HADOOP-15983. Use jersey-json that is built to use jackson2 ((#3988) Moves from com.sun.jersey 1.19 to the artifact com.github.pjfanning:jersey-json:1.20 This allows jackson 1 to be removed from the classpath. Contains * HADOOP-16908. Prune Jackson 1 from the codebase and restrict its usage for future * HADOOP-18219. Fix shaded client test failure These are needed for the HADOOP-15983 changes to build. Contributed by PJ Fanning. --- LICENSE-binary | 16 +++--- .../hadoop-client-minicluster/pom.xml | 40 ++++++++------ hadoop-client-modules/hadoop-client/pom.xml | 8 +-- hadoop-common-project/hadoop-common/pom.xml | 31 ++++++++++- hadoop-project/pom.xml | 63 ++++++++++------------ hadoop-tools/hadoop-azure/pom.xml | 12 ----- .../apache/hadoop/fs/azure/security/JsonUtils.java | 1 - .../contracts/services/ListResultEntrySchema.java | 4 +- .../contracts/services/ListResultSchema.java | 4 +- .../fs/azurebfs/oauth2/AzureADAuthenticator.java | 6 +-- .../fs/azurebfs/services/AbfsHttpOperation.java | 13 +++-- hadoop-tools/hadoop-resourceestimator/pom.xml | 16 +++++- .../pom.xml | 17 +++++- .../hadoop-yarn/hadoop-yarn-common/pom.xml | 16 +++++- .../pom.xml | 16 +++++- .../hadoop-yarn-server-nodemanager/pom.xml | 16 +++++- .../hadoop-yarn-server-resourcemanager/pom.xml | 16 +++++- .../pom.xml | 12 +++++ 18 files changed, 206 insertions(+), 101 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index 56b3e803a51..84ca5078aa3 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -347,10 +347,6 @@ org.apache.kerby:token-provider:1.0.1 org.apache.yetus:audience-annotations:0.5.0 org.apache.zookeeper:zookeeper:3.5.6 org.apache.zookeeper:zookeeper-jute:3.5.6 -org.codehaus.jackson:jackson-core-asl:1.9.13 -org.codehaus.jackson:jackson-jaxrs:1.9.13 -org.codehaus.jackson:jackson-mapper-asl:1.9.13 -org.codehaus.jackson:jackson-xc:1.9.13 org.codehaus.jettison:jettison:1.5.1 org.eclipse.jetty:jetty-annotations:9.4.48.v20220622 org.eclipse.jetty:jetty-http:9.4.48.v20220622 @@ -468,12 +464,12 @@ org.slf4j:slf4j-reload4j:1.7.35 CDDL 1.1 + GPLv2 with classpath exception ----------------------------------------- -com.sun.jersey:jersey-client:1.19 -com.sun.jersey:jersey-core:1.19 -com.sun.jersey:jersey-guice:1.19 -com.sun.jersey:jersey-json:1.19 -com.sun.jersey:jersey-server:1.19 -com.sun.jersey:jersey-servlet:1.19 +com.github.pjfanning:jersey-json:1.20 +com.sun.jersey:jersey-client:1.19.4 +com.sun.jersey:jersey-core:1.19.4 +com.sun.jersey:jersey-guice:1.19.4 +com.sun.jersey:jersey-server:1.19.4 +com.sun.jersey:jersey-servlet:1.19.4 com.sun.xml.bind:jaxb-impl:2.2.3-1 javax.annotation:javax.annotation-api:1.3.2 javax.servlet:javax.servlet-api:3.1.0 diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml index b6301dee61d..bef5da60797 100644 --- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml +++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml @@ -423,29 +423,25 @@ <optional>true</optional> </dependency> <dependency> - <groupId>com.sun.jersey</groupId> + <groupId>com.github.pjfanning</groupId> <artifactId>jersey-json</artifactId> <optional>true</optional> <exclusions> <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> </exclusion> <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> </exclusion> <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-jaxrs</artifactId> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> </exclusion> <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-xc</artifactId> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> </exclusion> </exclusions> </dependency> @@ -455,9 +451,23 @@ <optional>true</optional> </dependency> <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-servlet</artifactId> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-servlet</artifactId> <optional>true</optional> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.cal10n</groupId> + <artifactId>cal10n-api</artifactId> + </exclusion> + </exclusions> </dependency> <!-- skip org.apache.avro:avro-ipc because it doesn't look like hadoop-common actually uses it --> <dependency> diff --git a/hadoop-client-modules/hadoop-client/pom.xml b/hadoop-client-modules/hadoop-client/pom.xml index 1c9b7ae496e..05326d493a1 100644 --- a/hadoop-client-modules/hadoop-client/pom.xml +++ b/hadoop-client-modules/hadoop-client/pom.xml @@ -66,7 +66,7 @@ <artifactId>jersey-core</artifactId> </exclusion> <exclusion> - <groupId>com.sun.jersey</groupId> + <groupId>com.github.pjfanning</groupId> <artifactId>jersey-json</artifactId> </exclusion> <exclusion> @@ -179,7 +179,7 @@ <artifactId>jersey-core</artifactId> </exclusion> <exclusion> - <groupId>com.sun.jersey</groupId> + <groupId>com.github.pjfanning</groupId> <artifactId>jersey-json</artifactId> </exclusion> <exclusion> @@ -230,7 +230,7 @@ <artifactId>jersey-server</artifactId> </exclusion> <exclusion> - <groupId>com.sun.jersey</groupId> + <groupId>com.github.pjfanning</groupId> <artifactId>jersey-json</artifactId> </exclusion> <exclusion> @@ -287,7 +287,7 @@ <artifactId>guice-servlet</artifactId> </exclusion> <exclusion> - <groupId>com.sun.jersey</groupId> + <groupId>com.github.pjfanning</groupId> <artifactId>jersey-json</artifactId> </exclusion> <exclusion> diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 77a509029e8..2b0e7c8079f 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -141,12 +141,39 @@ <groupId>com.sun.jersey</groupId> <artifactId>jersey-servlet</artifactId> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.cal10n</groupId> + <artifactId>cal10n-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <!-- Used, even though 'mvn dependency:analyze' doesn't find it --> - <groupId>com.sun.jersey</groupId> + <groupId>com.github.pjfanning</groupId> <artifactId>jersey-json</artifactId> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.sun.jersey</groupId> diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index fc864363e6c..034df4c037b 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -66,13 +66,15 @@ <avro.version>1.7.7</avro.version> <!-- jersey version --> - <jersey.version>1.19</jersey.version> + <jersey.version>1.19.4</jersey.version> <!-- jackson versions --> - <jackson.version>1.9.13</jackson.version> <jackson2.version>2.12.7</jackson2.version> <jackson2.databind.version>2.12.7.1</jackson2.databind.version> + <!-- javax ws rs api version --> + <javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version> + <!-- httpcomponents versions --> <httpclient.version>4.5.13</httpclient.version> <httpcore.version>4.4.13</httpcore.version> @@ -897,13 +899,21 @@ <version>${jersey.version}</version> </dependency> <dependency> - <groupId>com.sun.jersey</groupId> + <groupId>com.github.pjfanning</groupId> <artifactId>jersey-json</artifactId> - <version>${jersey.version}</version> + <version>1.20</version> <exclusions> <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> </exclusion> </exclusions> </dependency> @@ -1239,26 +1249,6 @@ <artifactId>woodstox-core</artifactId> <version>${woodstox.version}</version> </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-jaxrs</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-xc</artifactId> - <version>${jackson.version}</version> - </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> @@ -2369,16 +2359,16 @@ <!-- for JDK 8 support --> <include>cglib:cglib:3.2.0</include> <include>com.google.inject:guice:4.0</include> - <include>com.sun.jersey:jersey-core:1.19</include> - <include>com.sun.jersey:jersey-servlet:1.19</include> - <include>com.sun.jersey:jersey-json:1.19</include> - <include>com.sun.jersey:jersey-server:1.19</include> - <include>com.sun.jersey:jersey-client:1.19</include> - <include>com.sun.jersey:jersey-grizzly2:1.19</include> - <include>com.sun.jersey:jersey-grizzly2-servlet:1.19</include> - <include>com.sun.jersey.jersey-test-framework:jersey-test-framework-core:1.19</include> - <include>com.sun.jersey.jersey-test-framework:jersey-test-framework-grizzly2:1.19</include> - <include>com.sun.jersey.contribs:jersey-guice:1.19</include> + <include>com.sun.jersey:jersey-core:1.19.4</include> + <include>com.sun.jersey:jersey-servlet:1.19.4</include> + <include>com.github.pjfanning:jersey-json:1.20</include> + <include>com.sun.jersey:jersey-server:1.19.4</include> + <include>com.sun.jersey:jersey-client:1.19.4</include> + <include>com.sun.jersey:jersey-grizzly2:1.19.4</include> + <include>com.sun.jersey:jersey-grizzly2-servlet:1.19.4</include> + <include>com.sun.jersey.jersey-test-framework:jersey-test-framework-core:1.19.4</include> + <include>com.sun.jersey.jersey-test-framework:jersey-test-framework-grizzly2:1.19.4</include> + <include>com.sun.jersey.contribs:jersey-guice:1.19.4</include> <include>org.ow2.asm:asm:5.0.0</include> </includes> </bannedDependencies> @@ -2636,5 +2626,6 @@ </profiles> <repositories> + </repositories> </project> diff --git a/hadoop-tools/hadoop-azure/pom.xml b/hadoop-tools/hadoop-azure/pom.xml index b093c558476..9d0e482b251 100644 --- a/hadoop-tools/hadoop-azure/pom.xml +++ b/hadoop-tools/hadoop-azure/pom.xml @@ -178,18 +178,6 @@ <scope>compile</scope> </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - <scope>compile</scope> - </dependency> - <dependency> <groupId>org.wildfly.openssl</groupId> <artifactId>wildfly-openssl</artifactId> diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/security/JsonUtils.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/security/JsonUtils.java index 9c40325e217..251ae6c9310 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/security/JsonUtils.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/security/JsonUtils.java @@ -18,7 +18,6 @@ package org.apache.hadoop.fs.azure.security; -import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.hadoop.util.JsonSerialization; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/contracts/services/ListResultEntrySchema.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/contracts/services/ListResultEntrySchema.java index cdf3decdc98..a9883dd2ce5 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/contracts/services/ListResultEntrySchema.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/contracts/services/ListResultEntrySchema.java @@ -18,8 +18,8 @@ package org.apache.hadoop.fs.azurebfs.contracts.services; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.hadoop.classification.InterfaceStability; diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/contracts/services/ListResultSchema.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/contracts/services/ListResultSchema.java index e3519fb429b..dc7da04b5bd 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/contracts/services/ListResultSchema.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/contracts/services/ListResultSchema.java @@ -20,8 +20,8 @@ package org.apache.hadoop.fs.azurebfs.contracts.services; import java.util.List; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.hadoop.classification.InterfaceStability; diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/oauth2/AzureADAuthenticator.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/oauth2/AzureADAuthenticator.java index 49f90feb22e..9f1aa8e576d 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/oauth2/AzureADAuthenticator.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/oauth2/AzureADAuthenticator.java @@ -29,10 +29,10 @@ import java.util.Date; import java.util.Hashtable; import java.util.Map; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.JsonToken; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsHttpOperation.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsHttpOperation.java index 0a3d773ece5..cd8cfa2147a 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsHttpOperation.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsHttpOperation.java @@ -28,20 +28,19 @@ import java.util.List; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLSocketFactory; -import org.apache.hadoop.fs.azurebfs.utils.UriUtils; -import org.apache.hadoop.security.ssl.DelegatingSSLSocketFactory; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.JsonToken; -import org.codehaus.jackson.map.ObjectMapper; - +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; +import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.hadoop.fs.azurebfs.utils.UriUtils; import org.apache.hadoop.fs.azurebfs.constants.AbfsHttpConstants; import org.apache.hadoop.fs.azurebfs.constants.HttpHeaderConfigurations; import org.apache.hadoop.fs.azurebfs.contracts.services.AbfsPerfLoggable; import org.apache.hadoop.fs.azurebfs.contracts.services.ListResultSchema; +import org.apache.hadoop.security.ssl.DelegatingSSLSocketFactory; /** * Represents an HTTP operation. diff --git a/hadoop-tools/hadoop-resourceestimator/pom.xml b/hadoop-tools/hadoop-resourceestimator/pom.xml index 8761104575e..bc5d2a07229 100644 --- a/hadoop-tools/hadoop-resourceestimator/pom.xml +++ b/hadoop-tools/hadoop-resourceestimator/pom.xml @@ -79,8 +79,22 @@ <artifactId>jersey-server</artifactId> </dependency> <dependency> - <groupId>com.sun.jersey</groupId> + <groupId>com.github.pjfanning</groupId> <artifactId>jersey-json</artifactId> + <exclusions> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>junit</groupId> diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml index 705c8091f3a..154f19004bd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml @@ -92,9 +92,22 @@ </dependency> <dependency> - <groupId>com.sun.jersey</groupId> + <groupId>com.github.pjfanning</groupId> <artifactId>jersey-json</artifactId> - <version>${jersey.version}</version> + <exclusions> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml index 99f16e153dc..b5f0d07b09c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -156,8 +156,22 @@ <artifactId>jersey-server</artifactId> </dependency> <dependency> - <groupId>com.sun.jersey</groupId> + <groupId>com.github.pjfanning</groupId> <artifactId>jersey-json</artifactId> + <exclusions> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.sun.jersey.contribs</groupId> diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml index bd30aa0f15d..046132f0c0a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml @@ -92,8 +92,22 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.sun.jersey</groupId> + <groupId>com.github.pjfanning</groupId> <artifactId>jersey-json</artifactId> + <exclusions> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.sun.jersey.contribs</groupId> diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml index 7297e98083d..0e941a08ae2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml @@ -147,8 +147,22 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.sun.jersey</groupId> + <groupId>com.github.pjfanning</groupId> <artifactId>jersey-json</artifactId> + <exclusions> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.sun.jersey.contribs</groupId> diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml index c4b1fdefc0a..b2e46b8b6c6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml @@ -107,8 +107,22 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.sun.jersey</groupId> + <groupId>com.github.pjfanning</groupId> <artifactId>jersey-json</artifactId> + <exclusions> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.sun.jersey.contribs</groupId> diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml index d9c0ea105ec..f185dd3206b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml @@ -96,6 +96,14 @@ <groupId>tomcat</groupId> <artifactId>jasper-runtime</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs-client</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-json</artifactId> + </exclusion> </exclusions> </dependency> @@ -301,6 +309,10 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-json</artifactId> + </exclusion> </exclusions> </dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org