From c31b60e2f8b6f6d79b67ee1e9f081d1a71076af6 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 22 Feb 2022 20:07:44 +0100 Subject: [PATCH 1/4] [HADOOP-15983] use jersey-json that is built to use jackson2 Update LICENSE-binary merge issues Update pom.xml Update pom.xml --- LICENSE-binary | 16 ++--- .../hadoop-client-minicluster/pom.xml | 22 ++---- hadoop-client-modules/hadoop-client/pom.xml | 8 +-- hadoop-common-project/hadoop-common/pom.xml | 23 +++---- hadoop-project/pom.xml | 68 ++++++------------- hadoop-tools/hadoop-resourceestimator/pom.xml | 18 ++--- .../pom.xml | 17 ++++- .../hadoop-yarn/hadoop-yarn-common/pom.xml | 16 ++++- .../pom.xml | 30 ++++++-- .../hadoop-yarn-server-common/pom.xml | 20 ------ .../hadoop-yarn-server-nodemanager/pom.xml | 16 ++++- .../pom.xml | 16 ++++- .../pom.xml | 8 +++ 13 files changed, 149 insertions(+), 129 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index ef0db1bb6a4d7..fe60ac3609c2c 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -324,10 +324,6 @@ org.apache.kerby:token-provider:1.0.1 org.apache.solr:solr-solrj:8.8.2 org.apache.yetus:audience-annotations:0.5.0 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.eclipse.jetty:jetty-annotations: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 ----------------------------------------- -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 d70198ac428fa..0e92afc4b6f4c 100644 --- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml +++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml @@ -423,29 +423,21 @@ true - com.sun.jersey + com.github.pjfanning jersey-json true - javax.xml.bind - jaxb-api - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-core - org.codehaus.jackson - jackson-jaxrs + com.fasterxml.jackson.core + jackson-databind - org.codehaus.jackson - jackson-xc + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider diff --git a/hadoop-client-modules/hadoop-client/pom.xml b/hadoop-client-modules/hadoop-client/pom.xml index dced359b286d9..b48a221bdf179 100644 --- a/hadoop-client-modules/hadoop-client/pom.xml +++ b/hadoop-client-modules/hadoop-client/pom.xml @@ -66,7 +66,7 @@ jersey-core - com.sun.jersey + com.github.pjfanning jersey-json @@ -167,7 +167,7 @@ jersey-core - com.sun.jersey + com.github.pjfanning jersey-json @@ -218,7 +218,7 @@ jersey-server - com.sun.jersey + com.github.pjfanning jersey-json @@ -275,7 +275,7 @@ guice-servlet - com.sun.jersey + com.github.pjfanning jersey-json diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 467c2717562ca..6e762f567c180 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -150,29 +150,28 @@ javax.servlet servlet-api + + ch.qos.cal10n + cal10n-api + - - com.sun.jersey + com.github.pjfanning jersey-json compile - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-core - org.codehaus.jackson - jackson-jaxrs + com.fasterxml.jackson.core + jackson-databind - org.codehaus.jackson - jackson-xc + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index bdca6ebb9e7aa..4ffb288321e44 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -66,10 +66,9 @@ 1.9.2 - 1.19 + 1.19.4 - 1.9.13 2.13.2 2.13.2.2 @@ -878,29 +877,21 @@ ${jersey.version} - com.sun.jersey + com.github.pjfanning jersey-json - ${jersey.version} + 1.20 - stax - stax-api + com.fasterxml.jackson.core + jackson-core - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-databind - org.codehaus.jackson - jackson-mapper-asl - - - org.codehaus.jackson - jackson-jaxrs - - - org.codehaus.jackson - jackson-xc + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider @@ -1182,26 +1173,6 @@ woodstox-core ${woodstox.version} - - org.codehaus.jackson - jackson-mapper-asl - ${jackson.version} - - - org.codehaus.jackson - jackson-core-asl - ${jackson.version} - - - org.codehaus.jackson - jackson-jaxrs - ${jackson.version} - - - org.codehaus.jackson - jackson-xc - ${jackson.version} - com.fasterxml.jackson.core jackson-core @@ -2265,16 +2236,16 @@ cglib:cglib:3.2.0 com.google.inject:guice:4.0 - com.sun.jersey:jersey-core:1.19 - com.sun.jersey:jersey-servlet:1.19 - com.sun.jersey:jersey-json:1.19 - com.sun.jersey:jersey-server:1.19 - com.sun.jersey:jersey-client:1.19 - com.sun.jersey:jersey-grizzly2:1.19 - com.sun.jersey:jersey-grizzly2-servlet:1.19 - com.sun.jersey.jersey-test-framework:jersey-test-framework-core:1.19 - com.sun.jersey.jersey-test-framework:jersey-test-framework-grizzly2:1.19 - com.sun.jersey.contribs:jersey-guice:1.19 + com.sun.jersey:jersey-core:1.19.4 + com.sun.jersey:jersey-servlet:1.19.4 + com.github.pjfanning:jersey-json:1.20 + com.sun.jersey:jersey-server:1.19.4 + com.sun.jersey:jersey-client:1.19.4 + com.sun.jersey:jersey-grizzly2:1.19.4 + com.sun.jersey:jersey-grizzly2-servlet:1.19.4 + com.sun.jersey.jersey-test-framework:jersey-test-framework-core:1.19.4 + com.sun.jersey.jersey-test-framework:jersey-test-framework-grizzly2:1.19.4 + com.sun.jersey.contribs:jersey-guice:1.19.4 org.ow2.asm:asm:5.0.0 @@ -2537,5 +2508,6 @@ + diff --git a/hadoop-tools/hadoop-resourceestimator/pom.xml b/hadoop-tools/hadoop-resourceestimator/pom.xml index 1ef264ba2120b..89e248f9a7efe 100644 --- a/hadoop-tools/hadoop-resourceestimator/pom.xml +++ b/hadoop-tools/hadoop-resourceestimator/pom.xml @@ -79,24 +79,20 @@ jersey-server - com.sun.jersey + com.github.pjfanning jersey-json - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-core - org.codehaus.jackson - jackson-jaxrs + com.fasterxml.jackson.core + jackson-databind - org.codehaus.jackson - jackson-xc + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider 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 a36169d645b85..8ad0fc6931679 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 @@ - com.sun.jersey + com.github.pjfanning jersey-json - ${jersey.version} + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + 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 9c88950690c51..27fac5f13f135 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 @@ jersey-server - com.sun.jersey + com.github.pjfanning jersey-json + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + com.sun.jersey.contribs 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 9d2ade2f1f5b5..003c891ee9652 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 @@ -100,12 +100,26 @@ jersey-client - com.sun.jersey.contribs - jersey-guice + com.github.pjfanning + jersey-json + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + - com.sun.jersey - jersey-json + com.sun.jersey.contribs + jersey-guice @@ -132,6 +146,14 @@ org.codehaus.jettison jettison + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-client + org.apache.hadoop.thirdparty hadoop-shaded-guava diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml index 2d903b0be42dc..3bf70bf7560e5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml @@ -90,26 +90,6 @@ com.google.protobuf protobuf-java - - org.codehaus.jackson - jackson-core-asl - runtime - - - org.codehaus.jackson - jackson-mapper-asl - runtime - - - org.codehaus.jackson - jackson-jaxrs - runtime - - - org.codehaus.jackson - jackson-xc - runtime - junit junit 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 79bb6cfa22de4..b8697635205df 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 @@ -152,8 +152,22 @@ test - com.sun.jersey + com.github.pjfanning jersey-json + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + com.sun.jersey.contribs 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 f17ef707ef4b4..025827c42f5f4 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 @@ test - com.sun.jersey + com.github.pjfanning jersey-json + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + com.sun.jersey.contribs 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 e0151afd0c666..adc4c3bcbb53e 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 @@ -100,6 +100,10 @@ org.apache.hadoop hadoop-hdfs-client + + com.sun.jersey + jersey-json + @@ -328,6 +332,10 @@ org.apache.hadoop hadoop-auth + + com.sun.jersey + jersey-json + From 2a10fb116a42a517827da1da112f409b945fb514 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 8 Apr 2022 12:23:24 +0200 Subject: [PATCH 2/4] add exclusion due to dependency convergence issue --- hadoop-client-modules/hadoop-client-minicluster/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml index 0e92afc4b6f4c..732ec1de92ac2 100644 --- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml +++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml @@ -459,6 +459,10 @@ javax.enterprise cdi-api + + ch.qos.cal10n + cal10n-api + From 2387b0a6a06b413f69234e99308edca951126647 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sun, 10 Apr 2022 21:53:25 +0200 Subject: [PATCH 3/4] Update pom.xml --- .../hadoop-yarn-server-applicationhistoryservice/pom.xml | 8 -------- 1 file changed, 8 deletions(-) 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 003c891ee9652..2a21c0dc092fc 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 @@ -146,14 +146,6 @@ org.codehaus.jettison jettison - - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-client - org.apache.hadoop.thirdparty hadoop-shaded-guava From 629399a162b2ffb4793131c1300a238224b9e1d6 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 11 Apr 2022 17:10:22 +0200 Subject: [PATCH 4/4] try to fix issue with jaxb classes appearing in minicluster bundle --- hadoop-client-modules/hadoop-client-minicluster/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml index 732ec1de92ac2..8281e9e2dd229 100644 --- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml +++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml @@ -439,6 +439,10 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider + + com.sun.xml.bind + jaxb-impl +