Skip to content

Commit

Permalink
HADOOP-19230. Jackson 2.14.3
Browse files Browse the repository at this point in the history
  • Loading branch information
pjfanning committed Jul 19, 2024
1 parent 9a9ad6c commit 8bc784f
Show file tree
Hide file tree
Showing 11 changed files with 46 additions and 10 deletions.
13 changes: 7 additions & 6 deletions LICENSE-binary
Original file line number Diff line number Diff line change
Expand Up @@ -218,12 +218,12 @@ com.aliyun:aliyun-java-sdk-sts:3.0.0
com.aliyun.oss:aliyun-sdk-oss:3.13.2
com.cedarsoftware:java-util:1.9.0
com.cedarsoftware:json-io:2.5.1
com.fasterxml.jackson.core:jackson-annotations:2.12.7
com.fasterxml.jackson.core:jackson-core:2.12.7
com.fasterxml.jackson.core:jackson-databind:2.12.7.1
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.12.7
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.12.7
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.12.7
com.fasterxml.jackson.core:jackson-annotations:2.14.3
com.fasterxml.jackson.core:jackson-core:2.14.3
com.fasterxml.jackson.core:jackson-databind:2.14.3
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.14.3
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.14.3
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.14.3
com.fasterxml.uuid:java-uuid-generator:3.1.4
com.fasterxml.woodstox:woodstox-core:5.4.0
com.github.ben-manes.caffeine:caffeine:2.9.3
Expand Down Expand Up @@ -499,6 +499,7 @@ CDDL 1.1 + GPLv2 with classpath exception
-----------------------------------------

com.github.pjfanning:jersey-json:1.22.0
com.github.pjfanning:jsr311-compat:0.1.0
com.sun.jersey:jersey-client:1.19.4
com.sun.jersey:jersey-core:1.19.4
com.sun.jersey:jersey-guice:1.19.4
Expand Down
4 changes: 2 additions & 2 deletions hadoop-client-modules/hadoop-client-minicluster/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -422,8 +422,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
2 changes: 2 additions & 0 deletions hadoop-client-modules/hadoop-client-runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@
<exclude>org.xerial.snappy:*</exclude>
<!-- leave out kotlin classes -->
<exclude>org.jetbrains.kotlin:*</exclude>
<!-- leave out jsr311-compat classes -->
<exclude>com.github.pjfanning:jsr311-compat</exclude>
</excludes>
</artifactSet>
<filters>
Expand Down
4 changes: 4 additions & 0 deletions hadoop-common-project/hadoop-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.pjfanning</groupId>
<artifactId>jsr311-compat</artifactId>
</dependency>
<dependency>
<!--
adding jettison as direct dependency (as jersey-json's jettison dependency is vulnerable with verison 1.1),
Expand Down
9 changes: 7 additions & 2 deletions hadoop-project/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
<jersey.version>1.19.4</jersey.version>

<!-- jackson versions -->
<jackson2.version>2.12.7</jackson2.version>
<jackson2.databind.version>2.12.7.1</jackson2.databind.version>
<jackson2.version>2.14.3</jackson2.version>
<jackson2.databind.version>2.14.3</jackson2.databind.version>

<!-- httpcomponents versions -->
<httpclient.version>4.5.13</httpclient.version>
Expand Down Expand Up @@ -955,6 +955,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.pjfanning</groupId>
<artifactId>jsr311-compat</artifactId>
<version>0.1.0</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
Expand Down
4 changes: 4 additions & 0 deletions hadoop-tools/hadoop-resourceestimator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.pjfanning</groupId>
<artifactId>jsr311-compat</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.pjfanning</groupId>
<artifactId>jsr311-compat</artifactId>
</dependency>

<dependency>
<groupId>org.apache.solr</groupId>
Expand Down
4 changes: 4 additions & 0 deletions hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,10 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.pjfanning</groupId>
<artifactId>jsr311-compat</artifactId>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-guice</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.pjfanning</groupId>
<artifactId>jsr311-compat</artifactId>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-guice</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,10 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.pjfanning</groupId>
<artifactId>jsr311-compat</artifactId>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-guice</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.pjfanning</groupId>
<artifactId>jsr311-compat</artifactId>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-guice</artifactId>
Expand Down

0 comments on commit 8bc784f

Please sign in to comment.