From e35cea091bef15eda2537e8ffb9e6f81a4116fb9 Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Sun, 28 Jul 2019 14:28:39 +0530 Subject: [PATCH] HBASE-22728 : jackson dependency cleanup --- hbase-client/pom.xml | 29 ++++++ hbase-common/pom.xml | 25 ++++- hbase-examples/pom.xml | 83 +++++++++++++++- hbase-external-blockcache/pom.xml | 18 ++++ hbase-hadoop2-compat/pom.xml | 36 +++++++ hbase-it/pom.xml | 57 +++++++++++ hbase-prefix-tree/pom.xml | 32 +++++++ hbase-procedure/pom.xml | 8 ++ hbase-rest/pom.xml | 80 ++++++++++++++-- hbase-rsgroup/pom.xml | 47 +++++++++ hbase-server/pom.xml | 80 +++++++++++++++- .../hbase-shaded-check-invariants/pom.xml | 28 ++++++ hbase-shaded/hbase-shaded-client/pom.xml | 8 ++ hbase-shaded/hbase-shaded-server/pom.xml | 16 ++++ .../hbase-shaded-testing-util/pom.xml | 68 +++++++++++++ hbase-shaded/pom.xml | 4 - hbase-shell/pom.xml | 95 +++++++++++++++++++ hbase-testing-util/pom.xml | 90 ++++++++++++++++++ hbase-thrift/pom.xml | 75 +++++++++++++++ 19 files changed, 856 insertions(+), 23 deletions(-) diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 01e334ab43..ee8e24bc5b 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -125,12 +125,24 @@ org.apache.hbase hbase-common + + + org.apache.avro + avro + + org.apache.hbase hbase-common test-jar test + + + org.apache.avro + avro + + org.apache.hbase @@ -176,6 +188,7 @@ org.codehaus.jackson jackson-mapper-asl + provided org.jruby.jcodings @@ -282,6 +295,14 @@ tomcat jasper-runtime + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + @@ -332,6 +353,14 @@ org.codehaus.jackson jackson-xc + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index b16d2031e9..0ad7d6fe63 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -272,6 +272,11 @@ commons-io compile + + org.codehaus.jackson + jackson-mapper-asl + provided + com.google.protobuf protobuf-java @@ -286,10 +291,6 @@ htrace-core - - org.apache.avro - avro - @@ -399,6 +400,14 @@ tomcat jasper-runtime + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + @@ -449,6 +458,14 @@ org.codehaus.jackson jackson-xc + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml index 9e9409be10..d7f32c3bfa 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -153,11 +153,34 @@ org.apache.hbase hbase-rest + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + com.google.protobuf protobuf-java + + org.codehaus.jackson + jackson-mapper-asl + provided + @@ -191,10 +214,46 @@ if we can combine these profiles somehow --> org.apache.hadoop hadoop-mapreduce-client-core + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-common + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + @@ -241,10 +300,26 @@ if we can combine these profiles somehow --> org.apache.hadoop hadoop-common - - org.apache.htrace - htrace-core - + + org.apache.htrace + htrace-core + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + diff --git a/hbase-external-blockcache/pom.xml b/hbase-external-blockcache/pom.xml index 3710dec696..9065994e4d 100644 --- a/hbase-external-blockcache/pom.xml +++ b/hbase-external-blockcache/pom.xml @@ -240,6 +240,24 @@ org.apache.hadoop hadoop-common + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml index 0ab428d8a4..b41e135ffd 100644 --- a/hbase-hadoop2-compat/pom.xml +++ b/hbase-hadoop2-compat/pom.xml @@ -183,11 +183,47 @@ limitations under the License. org.apache.hadoop hadoop-mapreduce-client-core ${hadoop.version} + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-common ${hadoop.version} + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + commons-lang diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 87fe7c73e0..028b97f64a 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -255,6 +255,11 @@ org.apache.htrace htrace-core + + org.codehaus.jackson + jackson-mapper-asl + provided + io.netty @@ -333,6 +338,24 @@ org.apache.hadoop hadoop-mapreduce-client-core + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -343,6 +366,24 @@ org.apache.hadoop hadoop-common + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -398,6 +439,22 @@ org.apache.htrace htrace-core + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + diff --git a/hbase-prefix-tree/pom.xml b/hbase-prefix-tree/pom.xml index 8f4221ec35..06aa6e9423 100644 --- a/hbase-prefix-tree/pom.xml +++ b/hbase-prefix-tree/pom.xml @@ -206,6 +206,22 @@ tomcat jasper-runtime + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + @@ -234,6 +250,22 @@ org.apache.htrace htrace-core + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + diff --git a/hbase-procedure/pom.xml b/hbase-procedure/pom.xml index 82fc77cd8a..2e67fc52a8 100644 --- a/hbase-procedure/pom.xml +++ b/hbase-procedure/pom.xml @@ -165,6 +165,14 @@ tomcat jasper-runtime + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index 09a72b30a1..1e66ada335 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -256,10 +256,6 @@ com.sun.jersey jersey-core - - com.sun.jersey - jersey-json - com.sun.jersey jersey-server @@ -286,11 +282,13 @@ org.codehaus.jackson - jackson-core-asl + jackson-jaxrs + provided org.codehaus.jackson - jackson-jaxrs + jackson-xc + provided org.mortbay.jetty @@ -316,7 +314,7 @@ org.codehaus.jackson jackson-mapper-asl - test + provided @@ -400,10 +398,46 @@ org.apache.hadoop hadoop-mapreduce-client-core test + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-common + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -436,6 +470,22 @@ com.google.guava guava + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + @@ -451,6 +501,22 @@ org.apache.htrace htrace-core + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + diff --git a/hbase-rsgroup/pom.xml b/hbase-rsgroup/pom.xml index bab5dc3867..4a0b06157e 100644 --- a/hbase-rsgroup/pom.xml +++ b/hbase-rsgroup/pom.xml @@ -124,6 +124,16 @@ org.apache.hbase hbase-client + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + org.apache.hbase @@ -147,6 +157,11 @@ hbase-testing-util test + + org.codehaus.jackson + jackson-mapper-asl + provided + @@ -206,6 +221,22 @@ org.apache.htrace htrace-core + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + @@ -235,6 +266,22 @@ org.apache.htrace htrace-core + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 71dd9d045e..0de00d8c76 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -524,17 +524,15 @@ org.mortbay.jetty servlet-api-2.5 - - org.codehaus.jackson - jackson-core-asl - org.codehaus.jackson jackson-mapper-asl + provided org.codehaus.jackson jackson-jaxrs + provided tomcat @@ -700,6 +698,24 @@ org.apache.hadoop hadoop-common + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -712,6 +728,24 @@ org.apache.hadoop hadoop-mapreduce-client-core + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -722,12 +756,32 @@ org.apache.hadoop hadoop-hdfs + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-hdfs test-jar test + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -790,6 +844,24 @@ org.apache.hadoop hadoop-common + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop diff --git a/hbase-shaded/hbase-shaded-check-invariants/pom.xml b/hbase-shaded/hbase-shaded-check-invariants/pom.xml index 1acbb86b32..d1bfdd288c 100644 --- a/hbase-shaded/hbase-shaded-check-invariants/pom.xml +++ b/hbase-shaded/hbase-shaded-check-invariants/pom.xml @@ -38,11 +38,39 @@ org.apache.hbase hbase-shaded-client ${project.version} + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + org.apache.hbase hbase-shaded-server ${project.version} + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + diff --git a/hbase-shaded/hbase-shaded-client/pom.xml b/hbase-shaded/hbase-shaded-client/pom.xml index 06e897a623..30001b28ee 100644 --- a/hbase-shaded/hbase-shaded-client/pom.xml +++ b/hbase-shaded/hbase-shaded-client/pom.xml @@ -56,6 +56,14 @@ javax.xml.bind jaxb-api + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + diff --git a/hbase-shaded/hbase-shaded-server/pom.xml b/hbase-shaded/hbase-shaded-server/pom.xml index 8a7d931ca9..5393590445 100644 --- a/hbase-shaded/hbase-shaded-server/pom.xml +++ b/hbase-shaded/hbase-shaded-server/pom.xml @@ -154,6 +154,22 @@ org.glassfish.jersey.media jersey-media-json-jackson1 + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + diff --git a/hbase-shaded/hbase-shaded-testing-util/pom.xml b/hbase-shaded/hbase-shaded-testing-util/pom.xml index 06ea3b41d0..a1efc7d4e6 100644 --- a/hbase-shaded/hbase-shaded-testing-util/pom.xml +++ b/hbase-shaded/hbase-shaded-testing-util/pom.xml @@ -39,18 +39,68 @@ hadoop-hdfs test-jar compile + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + org.apache.hbase hbase-common test-jar compile + + + org.apache.avro + avro + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hbase hbase-server test-jar compile + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + org.apache.hbase @@ -70,6 +120,24 @@ hbase-testing-util ${project.version} compile + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml index ed87764b72..0f30d9fa44 100644 --- a/hbase-shaded/pom.xml +++ b/hbase-shaded/pom.xml @@ -189,10 +189,6 @@ - - org.codehaus - org.apache.hadoop.hbase.shaded.org.codehaus - org.jcodings org.apache.hadoop.hbase.shaded.org.jcodings diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml index 8a78aecfbd..f5f4ebd969 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -207,6 +207,11 @@ org.apache.hbase hbase-protocol + + org.codehaus.jackson + jackson-mapper-asl + provided + org.apache.hbase hbase-client @@ -319,6 +324,24 @@ org.apache.hadoop hadoop-common + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -331,6 +354,24 @@ org.apache.hadoop hadoop-mapreduce-client-core + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -341,17 +382,47 @@ org.apache.hadoop hadoop-hdfs + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-hdfs test-jar test + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-minicluster test + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -406,6 +477,22 @@ org.apache.htrace htrace-core + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + @@ -420,6 +507,14 @@ com.google.guava guava + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml index 413453a67e..2ecd562b47 100644 --- a/hbase-testing-util/pom.xml +++ b/hbase-testing-util/pom.xml @@ -140,6 +140,24 @@ org.apache.hadoop hadoop-common compile + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -155,6 +173,24 @@ org.apache.hadoop hadoop-mapreduce-client-core compile + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -165,17 +201,47 @@ org.apache.hadoop hadoop-hdfs compile + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-hdfs test-jar compile + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-minicluster compile + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -208,6 +274,22 @@ org.apache.htrace htrace-core + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + @@ -219,6 +301,14 @@ org.apache.htrace htrace-core + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index 36dadac574..c00bcf62df 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -333,6 +333,11 @@ jasper-runtime compile + + org.codehaus.jackson + jackson-mapper-asl + provided + @@ -512,6 +517,24 @@ org.apache.hadoop hadoop-mapreduce-client-core + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -522,11 +545,39 @@ org.apache.hadoop hadoop-common + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-minicluster test + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + @@ -578,6 +629,22 @@ org.apache.htrace htrace-core + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + @@ -588,6 +655,14 @@ org.apache.htrace htrace-core + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + -- 2.17.2 (Apple Git-113)