From 0fdcebc20455601ca130463b797ea01b3b6086a7 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 | 34 ++++++ hbase-common/pom.xml | 30 +++++- hbase-examples/pom.xml | 78 +++++++++++++- hbase-external-blockcache/pom.xml | 18 ++++ hbase-hadoop2-compat/pom.xml | 36 +++++++ hbase-it/pom.xml | 62 +++++++++++ hbase-prefix-tree/pom.xml | 32 ++++++ hbase-procedure/pom.xml | 8 ++ hbase-rest/pom.xml | 81 +++++++++++++- hbase-rsgroup/pom.xml | 42 ++++++++ hbase-server/pom.xml | 77 ++++++++++++++ .../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 | 100 ++++++++++++++++++ hbase-testing-util/pom.xml | 90 ++++++++++++++++ hbase-thrift/pom.xml | 70 ++++++++++++ 19 files changed, 865 insertions(+), 17 deletions(-) diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 01e334ab43..cbd15deef3 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,12 @@ org.codehaus.jackson jackson-mapper-asl + provided + + + org.codehaus.jackson + jackson-core-asl + provided org.jruby.jcodings @@ -282,6 +300,14 @@ tomcat jasper-runtime + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + @@ -332,6 +358,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..bfdcb04eb7 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -272,6 +272,16 @@ commons-io compile + + org.codehaus.jackson + jackson-core-asl + provided + + + org.codehaus.jackson + jackson-mapper-asl + provided + com.google.protobuf protobuf-java @@ -286,10 +296,6 @@ htrace-core - - org.apache.avro - avro - @@ -399,6 +405,14 @@ tomcat jasper-runtime + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + @@ -449,6 +463,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..9a9e8620a9 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -153,6 +153,24 @@ 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 @@ -191,10 +209,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 +295,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..d686c3d3ea 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -255,6 +255,16 @@ org.apache.htrace htrace-core + + org.codehaus.jackson + jackson-core-asl + provided + + + org.codehaus.jackson + jackson-mapper-asl + provided + io.netty @@ -333,6 +343,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 +371,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 +444,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..4d86111436 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 @@ -287,10 +283,17 @@ org.codehaus.jackson jackson-core-asl + provided org.codehaus.jackson jackson-jaxrs + provided + + + org.codehaus.jackson + jackson-xc + provided org.mortbay.jetty @@ -316,7 +319,7 @@ org.codehaus.jackson jackson-mapper-asl - test + provided @@ -400,10 +403,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 +475,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 +506,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..17049e4849 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 @@ -206,6 +216,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 +261,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..c30bd23ac9 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -527,14 +527,17 @@ org.codehaus.jackson jackson-core-asl + provided org.codehaus.jackson jackson-mapper-asl + provided org.codehaus.jackson jackson-jaxrs + provided tomcat @@ -700,6 +703,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 +733,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 +761,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 +849,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..7fdd84cd47 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -207,6 +207,16 @@ org.apache.hbase hbase-protocol + + org.codehaus.jackson + jackson-core-asl + provided + + + org.codehaus.jackson + jackson-mapper-asl + provided + org.apache.hbase hbase-client @@ -319,6 +329,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 +359,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 +387,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 +482,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 +512,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..9047d1f4a3 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -512,6 +512,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 +540,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 +624,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 +650,14 @@ org.apache.htrace htrace-core + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + -- 2.17.2 (Apple Git-113)