diff --git a/LICENSE-binary b/LICENSE-binary index ff8012096a437..848b5cf1d3f99 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -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 @@ -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 diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml index 666df82f48381..7d4fb23663e45 100644 --- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml +++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml @@ -422,8 +422,8 @@ - com.sun.jersey - jersey-client + com.sun.jersey + jersey-client true diff --git a/hadoop-client-modules/hadoop-client-runtime/pom.xml b/hadoop-client-modules/hadoop-client-runtime/pom.xml index 22c8ae00a3a52..7f1d29b3d1e51 100644 --- a/hadoop-client-modules/hadoop-client-runtime/pom.xml +++ b/hadoop-client-modules/hadoop-client-runtime/pom.xml @@ -159,6 +159,8 @@ org.xerial.snappy:* org.jetbrains.kotlin:* + + com.github.pjfanning:jsr311-compat diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 7521cec6a1db4..a5cf1ced18353 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -179,6 +179,10 @@ + + com.github.pjfanning + jsr311-compat + - 2.12.7 - 2.12.7.1 + 2.14.3 + 2.14.3 4.5.13 @@ -955,6 +955,11 @@ + + com.github.pjfanning + jsr311-compat + 0.1.0 + com.sun.jersey jersey-server diff --git a/hadoop-tools/hadoop-resourceestimator/pom.xml b/hadoop-tools/hadoop-resourceestimator/pom.xml index 124c4452a5193..5597d2064a158 100644 --- a/hadoop-tools/hadoop-resourceestimator/pom.xml +++ b/hadoop-tools/hadoop-resourceestimator/pom.xml @@ -100,6 +100,10 @@ + + com.github.pjfanning + jsr311-compat + 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 ca0d09f30c646..92c67f2837c18 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 @@ -129,6 +129,10 @@ + + com.github.pjfanning + jsr311-compat + org.apache.solr 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 1bce868fb37cc..0ea35ea443ab3 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,10 @@ + + com.github.pjfanning + jsr311-compat + 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 7d9ad0d718a8a..f43aa7a4cd2de 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 @@ -124,6 +124,10 @@ + + com.github.pjfanning + jsr311-compat + 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 c138e6913c956..2925d11c2d6ed 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 @@ -168,6 +168,10 @@ + + com.github.pjfanning + jsr311-compat + 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 6350c1aef38ae..928222a2274fd 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 @@ -135,6 +135,10 @@ + + com.github.pjfanning + jsr311-compat + com.sun.jersey.contribs jersey-guice