From 53edd0de5ae6cbf0cbba101f387507ab9f49c8af Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Wed, 8 Dec 2021 13:22:22 +0530 Subject: [PATCH] HADOOP-18033. Upgrade fasterxml Jackson to 2.13.0 (#3749) Signed-off-by: Akira Ajisaka --- LICENSE-binary | 13 +++++++------ .../hadoop-client-minicluster/pom.xml | 7 +++++++ hadoop-client-modules/hadoop-client-runtime/pom.xml | 7 +++++++ .../hadoop-mapreduce-client/pom.xml | 4 ++++ hadoop-project/pom.xml | 12 ++++++++++-- .../hadoop-yarn/hadoop-yarn-api/pom.xml | 4 ++++ .../hadoop-yarn-applications-catalog-webapp/pom.xml | 5 +++++ .../pom.xml | 4 ++++ .../hadoop-yarn-services-core/pom.xml | 5 +++++ .../hadoop/yarn/service/utils/ServiceApiUtil.java | 10 +++++----- .../hadoop/yarn/service/ServiceTestUtils.java | 4 ++-- .../hadoop-yarn/hadoop-yarn-common/pom.xml | 4 ++++ .../pom.xml | 5 +++++ .../hadoop-yarn-server-nodemanager/pom.xml | 5 +++++ .../hadoop-yarn-server-resourcemanager/pom.xml | 4 ++++ .../hadoop-yarn-server-router/pom.xml | 5 +++++ .../hadoop-yarn-server-tests/pom.xml | 4 ++++ .../pom.xml | 4 ++++ .../pom.xml | 4 ++++ .../pom.xml | 5 +++++ .../hadoop-yarn-server-timelineservice/pom.xml | 5 +++++ 21 files changed, 105 insertions(+), 15 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index df08689258..07dd67a22a 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -218,12 +218,12 @@ com.aliyun.oss:aliyun-sdk-oss:3.13.0 com.amazonaws:aws-java-sdk-bundle:1.11.901 com.cedarsoftware:java-util:1.9.0 com.cedarsoftware:json-io:2.5.1 -com.fasterxml.jackson.core:jackson-annotations:2.9.9 -com.fasterxml.jackson.core:jackson-core:2.9.9 -com.fasterxml.jackson.core:jackson-databind:2.9.9.2 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.9.9 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.9.9 -com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.9.9 +com.fasterxml.jackson.core:jackson-annotations:2.13.0 +com.fasterxml.jackson.core:jackson-core:2.13.0 +com.fasterxml.jackson.core:jackson-databind:2.13.0 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.13.0 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.13.0 +com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.13.0 com.fasterxml.uuid:java-uuid-generator:3.1.4 com.fasterxml.woodstox:woodstox-core:5.3.0 com.github.davidmoten:rxjava-extras:0.8.0.17 @@ -494,6 +494,7 @@ javax.annotation:javax.annotation-api:1.3.2 javax.servlet:javax.servlet-api:3.1.0 javax.servlet.jsp:jsp-api:2.1 javax.websocket:javax.websocket-api:1.0 +javax.ws.rs:javax.ws.rs-api:2.1.1 javax.ws.rs:jsr311-api:1.1.1 javax.xml.bind:jaxb-api:2.2.11 diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml index 066b518652..2a0a5c1923 100644 --- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml +++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml @@ -690,6 +690,7 @@ org.bouncycastle:* org.xerial.snappy:* + javax.ws.rs:javax.ws.rs-api @@ -736,6 +737,12 @@ testdata/* + + com.fasterxml.jackson.*:* + + META-INF/versions/11/module-info.class + + diff --git a/hadoop-client-modules/hadoop-client-runtime/pom.xml b/hadoop-client-modules/hadoop-client-runtime/pom.xml index 6dae4f6196..35fbd7665f 100644 --- a/hadoop-client-modules/hadoop-client-runtime/pom.xml +++ b/hadoop-client-modules/hadoop-client-runtime/pom.xml @@ -163,6 +163,7 @@ org.bouncycastle:* org.xerial.snappy:* + javax.ws.rs:javax.ws.rs-api @@ -242,6 +243,12 @@ google/protobuf/**/*.proto + + com.fasterxml.jackson.*:* + + META-INF/versions/11/module-info.class + + diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml index 55940ae4ff..bf18d3edbc 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml @@ -70,6 +70,10 @@ + + javax.ws.rs + javax.ws.rs-api + org.apache.hadoop hadoop-common diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index ca6886641f..f3608f86db 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -70,8 +70,11 @@ 1.9.13 - 2.10.5 - 2.10.5.1 + 2.13.0 + 2.13.0 + + + 2.1.1 4.5.13 @@ -760,6 +763,11 @@ jsr311-api 1.1.1 + + javax.ws.rs + javax.ws.rs-api + ${javax.ws.rs-api.version} + org.eclipse.jetty jetty-server diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml index 61747c2cd8..6e7c27a23e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml @@ -115,6 +115,10 @@ com.fasterxml.jackson.core jackson-annotations + + javax.ws.rs + javax.ws.rs-api + 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 e790cc8cef..57edd96871 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 @@ -248,6 +248,11 @@ jackson-jaxrs-base ${jackson2.version} + + + javax.ws.rs + javax.ws.rs-api + ${artifact.name} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml index 318831126b..7e473895ca 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml @@ -154,6 +154,10 @@ test test-jar + + javax.ws.rs + javax.ws.rs-api + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml index b671c71659..5c7a9b7de8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml @@ -137,6 +137,11 @@ jackson-annotations + + javax.ws.rs + javax.ws.rs-api + + org.apache.hadoop hadoop-hdfs-client diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ServiceApiUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ServiceApiUtil.java index 91db639c1d..b96d04a98e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ServiceApiUtil.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ServiceApiUtil.java @@ -18,7 +18,7 @@ package org.apache.hadoop.yarn.service.utils; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; import org.apache.hadoop.classification.VisibleForTesting; import org.apache.hadoop.util.Preconditions; import org.apache.hadoop.thirdparty.com.google.common.collect.ArrayListMultimap; @@ -75,20 +75,20 @@ public class ServiceApiUtil { LoggerFactory.getLogger(ServiceApiUtil.class); public static JsonSerDeser jsonSerDeser = new JsonSerDeser<>(Service.class, - PropertyNamingStrategy.SNAKE_CASE); + PropertyNamingStrategies.SNAKE_CASE); public static final JsonSerDeser CONTAINER_JSON_SERDE = new JsonSerDeser<>(Container[].class, - PropertyNamingStrategy.SNAKE_CASE); + PropertyNamingStrategies.SNAKE_CASE); public static final JsonSerDeser COMP_CONTAINERS_JSON_SERDE = new JsonSerDeser<>( ComponentContainers[].class, - PropertyNamingStrategy.SNAKE_CASE); + PropertyNamingStrategies.SNAKE_CASE); public static final JsonSerDeser COMP_JSON_SERDE = new JsonSerDeser<>(Component[].class, - PropertyNamingStrategy.SNAKE_CASE); + PropertyNamingStrategies.SNAKE_CASE); private static final PatternValidator namePattern = new PatternValidator("[a-z][a-z0-9-]*"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/ServiceTestUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/ServiceTestUtils.java index cd148ced48..b5ce0f17ac 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/ServiceTestUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/ServiceTestUtils.java @@ -18,7 +18,7 @@ package org.apache.hadoop.yarn.service; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; import org.apache.hadoop.thirdparty.com.google.common.base.Throwables; import org.apache.hadoop.thirdparty.com.google.common.collect.HashMultimap; import org.apache.hadoop.thirdparty.com.google.common.collect.Multimap; @@ -98,7 +98,7 @@ public class ServiceTestUtils { public static final JsonSerDeser JSON_SER_DESER = new JsonSerDeser<>(Service.class, - PropertyNamingStrategy.SNAKE_CASE); + PropertyNamingStrategies.SNAKE_CASE); // Example service definition // 2 components, each of which has 2 containers. 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 195999fe1f..489236acf3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -183,6 +183,10 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider + + javax.ws.rs + javax.ws.rs-api + 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 d73853d5ca..06e98fd2b7 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 @@ -191,6 +191,11 @@ + + + javax.ws.rs + javax.ws.rs-api + 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 6f84bfc59b..79bb6cfa22 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 @@ -186,6 +186,11 @@ test-jar test + + + javax.ws.rs + javax.ws.rs-api + 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 deae04ad2b..ee1d77066b 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 @@ -320,6 +320,10 @@ com.fasterxml.jackson.dataformat jackson-dataformat-yaml + + javax.ws.rs + javax.ws.rs-api + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/pom.xml index d29929047a..8ef7b62f24 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/pom.xml @@ -116,6 +116,11 @@ guice + + javax.ws.rs + javax.ws.rs-api + + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml index 2de2c13f16..f6f56f818a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml @@ -132,6 +132,10 @@ test test-jar + + javax.ws.rs + javax.ws.rs-api + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/pom.xml index 835f2fed09..0954c56642 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/pom.xml @@ -133,6 +133,10 @@ com.fasterxml.jackson.core jackson-databind + + javax.ws.rs + javax.ws.rs-api + 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 4180d88acb..8eebb782da 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 @@ -417,6 +417,10 @@ commons-lang3 test + + javax.ws.rs + javax.ws.rs-api + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml index 26ccbd8662..b1ff0ca437 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml @@ -95,6 +95,11 @@ junit test + + + javax.ws.rs + javax.ws.rs-api + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/pom.xml index 65af3afadd..0876cb3e03 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/pom.xml @@ -117,6 +117,11 @@ 1.1.1 + + javax.ws.rs + javax.ws.rs-api + + org.apache.hadoop