big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-15983. Use jersey-json that is built to use jackson2 (#3988)

Browse Source 
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
This commit is contained in:
PJ Fanning 2022-04-28 07:18:19 +02:00 committed by GitHub
parent b4ff49a394
commit 63187083cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 147 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
LICENSE-binary
View File

@ -324,10 +324,6 @@ org.apache.kerby:token-provider:1.0.1
org.apache.solr:solr-solrj:8.8.2 org.apache.solr:solr-solrj:8.8.2
org.apache.yetus:audience-annotations:0.5.0 org.apache.yetus:audience-annotations:0.5.0
org.apache.zookeeper:zookeeper:3.6.3 org.apache.zookeeper:zookeeper:3.6.3
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.1 org.codehaus.jettison:jettison:1.1
org.eclipse.jetty:jetty-annotations:9.4.44.v20210927 org.eclipse.jetty:jetty-annotations:9.4.44.v20210927
org.eclipse.jetty:jetty-http:9.4.44.v20210927 org.eclipse.jetty:jetty-http:9.4.44.v20210927
@ -484,12 +480,12 @@ org.slf4j:slf4j-log4j12:1.7.25
CDDL 1.1 + GPLv2 with classpath exception CDDL 1.1 + GPLv2 with classpath exception
----------------------------------------- -----------------------------------------
com.sun.jersey:jersey-client:1.19 com.github.pjfanning:jersey-json:1.20
com.sun.jersey:jersey-core:1.19 com.sun.jersey:jersey-client:1.19.4
com.sun.jersey:jersey-guice:1.19 com.sun.jersey:jersey-core:1.19.4
com.sun.jersey:jersey-json:1.19 com.sun.jersey:jersey-guice:1.19.4
com.sun.jersey:jersey-server:1.19 com.sun.jersey:jersey-server:1.19.4
com.sun.jersey:jersey-servlet:1.19 com.sun.jersey:jersey-servlet:1.19.4
com.sun.xml.bind:jaxb-impl:2.2.3-1 com.sun.xml.bind:jaxb-impl:2.2.3-1
javax.annotation:javax.annotation-api:1.3.2 javax.annotation:javax.annotation-api:1.3.2
javax.servlet:javax.servlet-api:3.1.0 javax.servlet:javax.servlet-api:3.1.0

26
hadoop-client-modules/hadoop-client-minicluster/pom.xml
View File

@ -423,29 +423,25 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.jersey</groupId> <groupId>com.github.pjfanning</groupId>
<artifactId>jersey-json</artifactId> <artifactId>jersey-json</artifactId>
<optional>true</optional> <optional>true</optional>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>javax.xml.bind</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jackson-core</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core-asl</artifactId> <artifactId>jackson-databind</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-mapper-asl</artifactId> <artifactId>jackson-jaxrs-json-provider</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.codehaus.jackson</groupId> <groupId>com.sun.xml.bind</groupId>
<artifactId>jackson-jaxrs</artifactId> <artifactId>jaxb-impl</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
@ -467,6 +463,10 @@
<groupId>javax.enterprise</groupId> <groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId> <artifactId>cdi-api</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>ch.qos.cal10n</groupId>
<artifactId>cal10n-api</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- skip org.apache.avro:avro-ipc because it doesn't look like hadoop-common actually uses it --> <!-- skip org.apache.avro:avro-ipc because it doesn't look like hadoop-common actually uses it -->

8
hadoop-client-modules/hadoop-client/pom.xml
View File

@ -66,7 +66,7 @@
<artifactId>jersey-core</artifactId> <artifactId>jersey-core</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>com.sun.jersey</groupId> <groupId>com.github.pjfanning</groupId>
<artifactId>jersey-json</artifactId> <artifactId>jersey-json</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
@ -167,7 +167,7 @@
<artifactId>jersey-core</artifactId> <artifactId>jersey-core</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>com.sun.jersey</groupId> <groupId>com.github.pjfanning</groupId>
<artifactId>jersey-json</artifactId> <artifactId>jersey-json</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
@ -218,7 +218,7 @@
<artifactId>jersey-server</artifactId> <artifactId>jersey-server</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>com.sun.jersey</groupId> <groupId>com.github.pjfanning</groupId>
<artifactId>jersey-json</artifactId> <artifactId>jersey-json</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
@ -275,7 +275,7 @@
<artifactId>guice-servlet</artifactId> <artifactId>guice-servlet</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>com.sun.jersey</groupId> <groupId>com.github.pjfanning</groupId>
<artifactId>jersey-json</artifactId> <artifactId>jersey-json</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>

23
hadoop-common-project/hadoop-common/pom.xml
View File

@ -150,29 +150,28 @@
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>servlet-api</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>ch.qos.cal10n</groupId>
<artifactId>cal10n-api</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<!-- Used, even though 'mvn dependency:analyze' doesn't find it --> <groupId>com.github.pjfanning</groupId>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId> <artifactId>jersey-json</artifactId>
<scope>compile</scope> <scope>compile</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core-asl</artifactId> <artifactId>jackson-core</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-mapper-asl</artifactId> <artifactId>jackson-databind</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs</artifactId> <artifactId>jackson-jaxrs-json-provider</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>

72
hadoop-project/pom.xml
View File

@ -66,10 +66,9 @@
<avro.version>1.9.2</avro.version> <avro.version>1.9.2</avro.version>
<!-- jersey version --> <!-- jersey version -->
<jersey.version>1.19</jersey.version> <jersey.version>1.19.4</jersey.version>
<!-- jackson versions --> <!-- jackson versions -->
<jackson.version>1.9.13</jackson.version>
<jackson2.version>2.13.2</jackson2.version> <jackson2.version>2.13.2</jackson2.version>
<jackson2.databind.version>2.13.2.2</jackson2.databind.version> <jackson2.databind.version>2.13.2.2</jackson2.databind.version>
@ -878,29 +877,21 @@
<version>${jersey.version}</version> <version>${jersey.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.jersey</groupId> <groupId>com.github.pjfanning</groupId>
<artifactId>jersey-json</artifactId> <artifactId>jersey-json</artifactId>
<version>${jersey.version}</version> <version>1.20</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>stax</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>stax-api</artifactId> <artifactId>jackson-core</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core-asl</artifactId> <artifactId>jackson-databind</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-mapper-asl</artifactId> <artifactId>jackson-jaxrs-json-provider</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
@ -1182,30 +1173,6 @@
<artifactId>woodstox-core</artifactId> <artifactId>woodstox-core</artifactId>
<version>${woodstox.version}</version> <version>${woodstox.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>${jackson.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>${jackson.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<version>${jackson.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
<version>${jackson.version}</version>
<scope>runtime</scope>
</dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId> <artifactId>jackson-core</artifactId>
@ -2248,16 +2215,16 @@
<!-- for JDK 8 support --> <!-- for JDK 8 support -->
<include>cglib:cglib:3.2.0</include> <include>cglib:cglib:3.2.0</include>
<include>com.google.inject:guice:4.0</include> <include>com.google.inject:guice:4.0</include>
<include>com.sun.jersey:jersey-core:1.19</include> <include>com.sun.jersey:jersey-core:1.19.4</include>
<include>com.sun.jersey:jersey-servlet:1.19</include> <include>com.sun.jersey:jersey-servlet:1.19.4</include>
<include>com.sun.jersey:jersey-json:1.19</include> <include>com.github.pjfanning:jersey-json:1.20</include>
<include>com.sun.jersey:jersey-server:1.19</include> <include>com.sun.jersey:jersey-server:1.19.4</include>
<include>com.sun.jersey:jersey-client:1.19</include> <include>com.sun.jersey:jersey-client:1.19.4</include>
<include>com.sun.jersey:jersey-grizzly2:1.19</include> <include>com.sun.jersey:jersey-grizzly2:1.19.4</include>
<include>com.sun.jersey:jersey-grizzly2-servlet:1.19</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</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</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</include> <include>com.sun.jersey.contribs:jersey-guice:1.19.4</include>
<include>org.ow2.asm:asm:5.0.0</include> <include>org.ow2.asm:asm:5.0.0</include>
</includes> </includes>
</bannedDependencies> </bannedDependencies>
@ -2520,5 +2487,6 @@
</profiles> </profiles>
<repositories> <repositories>
</repositories> </repositories>
</project> </project>

18
hadoop-tools/hadoop-resourceestimator/pom.xml
View File

@ -79,24 +79,20 @@
<artifactId>jersey-server</artifactId> <artifactId>jersey-server</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.jersey</groupId> <groupId>com.github.pjfanning</groupId>
<artifactId>jersey-json</artifactId> <artifactId>jersey-json</artifactId>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core-asl</artifactId> <artifactId>jackson-core</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-mapper-asl</artifactId> <artifactId>jackson-databind</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs</artifactId> <artifactId>jackson-jaxrs-json-provider</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>

17
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
View File

@ -92,9 +92,22 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.jersey</groupId> <groupId>com.github.pjfanning</groupId>
<artifactId>jersey-json</artifactId> <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>
<dependency> <dependency>

16
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
View File

@ -156,8 +156,22 @@
<artifactId>jersey-server</artifactId> <artifactId>jersey-server</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.jersey</groupId> <groupId>com.github.pjfanning</groupId>
<artifactId>jersey-json</artifactId> <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>
<dependency> <dependency>
<groupId>com.sun.jersey.contribs</groupId> <groupId>com.sun.jersey.contribs</groupId>

22
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml
View File

@ -100,12 +100,26 @@
<artifactId>jersey-client</artifactId> <artifactId>jersey-client</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.jersey.contribs</groupId> <groupId>com.github.pjfanning</groupId>
<artifactId>jersey-guice</artifactId> <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>
<dependency> <dependency>
<groupId>com.sun.jersey</groupId> <groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-json</artifactId> <artifactId>jersey-guice</artifactId>
</dependency> </dependency>
<!-- 'mvn dependency:analyze' fails to detect use of this dependency --> <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
<dependency> <dependency>

20
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
View File

@ -90,26 +90,6 @@
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId> <artifactId>protobuf-java</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
<scope>runtime</scope>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>

16
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
View File

@ -152,8 +152,22 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.jersey</groupId> <groupId>com.github.pjfanning</groupId>
<artifactId>jersey-json</artifactId> <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>
<dependency> <dependency>
<groupId>com.sun.jersey.contribs</groupId> <groupId>com.sun.jersey.contribs</groupId>

16
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
View File

@ -107,8 +107,22 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.jersey</groupId> <groupId>com.github.pjfanning</groupId>
<artifactId>jersey-json</artifactId> <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>
<dependency> <dependency>
<groupId>com.sun.jersey.contribs</groupId> <groupId>com.sun.jersey.contribs</groupId>

8
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
View File

@ -100,6 +100,10 @@
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-client</artifactId> <artifactId>hadoop-hdfs-client</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
@ -328,6 +332,10 @@
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId> <artifactId>hadoop-auth</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>