diff --git a/LICENSE-binary b/LICENSE-binary index 1ebc44b0580a3..befba3a285965 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -218,12 +218,12 @@ com.aliyun.oss:aliyun-sdk-oss:3.13.2 com.amazonaws:aws-java-sdk-bundle:1.12.565 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.davidmoten:rxjava-extras:0.8.0.17 @@ -496,7 +496,8 @@ org.slf4j:slf4j-log4j12:1.7.25 CDDL 1.1 + GPLv2 with classpath exception ----------------------------------------- -com.github.pjfanning:jersey-json:1.20 +com.github.pjfanning:jersey-json:1.21.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 diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml index 9c9df2216fe8e..eab41e43bed93 100644 --- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml +++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml @@ -449,6 +449,11 @@ + + com.github.pjfanning + jsr311-compat + true + com.sun.jersey jersey-server diff --git a/hadoop-client-modules/hadoop-client/pom.xml b/hadoop-client-modules/hadoop-client/pom.xml index 08452aa20ef02..f4db74d786cfb 100644 --- a/hadoop-client-modules/hadoop-client/pom.xml +++ b/hadoop-client-modules/hadoop-client/pom.xml @@ -69,6 +69,10 @@ com.github.pjfanning jersey-json + + com.github.pjfanning + jsr311-compat + org.codehaus.jettison jettison @@ -174,6 +178,10 @@ com.github.pjfanning jersey-json + + com.github.pjfanning + jsr311-compat + org.codehaus.jettison jettison @@ -229,6 +237,10 @@ com.github.pjfanning jersey-json + + com.github.pjfanning + jsr311-compat + org.codehaus.jettison jettison @@ -290,6 +302,10 @@ com.github.pjfanning jersey-json + + com.github.pjfanning + jsr311-compat + org.codehaus.jettison jettison diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 938d0c4506022..754fa527166d2 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -179,6 +179,11 @@ + + com.github.pjfanning + jsr311-compat + runtime + - 2.12.7 - 2.12.7.1 + 2.14.3 + 2.14.3 4.5.13 @@ -901,7 +901,7 @@ com.github.pjfanning jersey-json - 1.20 + 1.21.0 com.fasterxml.jackson.core @@ -921,6 +921,11 @@ + + com.github.pjfanning + jsr311-compat + 0.1.0 + com.sun.jersey jersey-server @@ -2382,7 +2387,8 @@ com.google.inject:guice:4.0 com.sun.jersey:jersey-core:1.19.4 com.sun.jersey:jersey-servlet:1.19.4 - com.github.pjfanning:jersey-json:1.20 + com.github.pjfanning:jersey-json:1.21.0 + com.github.pjfanning:jsr311-compat:0.1.0 com.sun.jersey:jersey-server:1.19.4 com.sun.jersey:jersey-client:1.19.4 com.sun.jersey:jersey-grizzly2:1.19.4 diff --git a/hadoop-tools/hadoop-resourceestimator/pom.xml b/hadoop-tools/hadoop-resourceestimator/pom.xml index a6f6c691b36f6..0ca5af07d3d9f 100644 --- a/hadoop-tools/hadoop-resourceestimator/pom.xml +++ b/hadoop-tools/hadoop-resourceestimator/pom.xml @@ -100,6 +100,11 @@ + + com.github.pjfanning + jsr311-compat + runtime + junit junit 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 1a2c37faad4cd..99df80b9f406d 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 @@ -130,6 +130,12 @@ + + com.github.pjfanning + jsr311-compat + runtime + + org.apache.solr solr-solrj 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 4f6b40891d38e..8ddda8e0876f3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -198,6 +198,11 @@ + + com.github.pjfanning + jsr311-compat + runtime + com.sun.jersey.contribs jersey-guice 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 eb68251aa607a..122d1ba5457c8 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 @@ -123,6 +123,11 @@ + + com.github.pjfanning + jsr311-compat + runtime + com.sun.jersey.contribs jersey-guice 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 3b5c373f50c33..a36490cb64c0b 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 @@ -172,6 +172,11 @@ + + com.github.pjfanning + jsr311-compat + runtime + com.sun.jersey.contribs jersey-guice 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 fcd68ab2f52a6..f419d9a61db80 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 @@ -129,6 +129,11 @@ + + com.github.pjfanning + jsr311-compat + runtime + com.sun.jersey.contribs jersey-guice