From 7ec421d71bb2d2ad856954f3b3e9850c8ac29d00 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 | 32 +++++++++ hbase-common/pom.xml | 28 ++++++-- hbase-procedure/pom.xml | 16 +++++ hbase-rsgroup/pom.xml | 18 +++++ .../hbase-shaded-check-invariants/pom.xml | 28 ++++++++ hbase-shaded/hbase-shaded-client/pom.xml | 16 +++++ hbase-shaded/hbase-shaded-server/pom.xml | 32 +++++++++ .../hbase-shaded-testing-util/pom.xml | 68 +++++++++++++++++++ hbase-shaded/pom.xml | 4 -- 9 files changed, 234 insertions(+), 8 deletions(-) diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 01e334ab43..c42db595dc 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 @@ -177,6 +189,10 @@ org.codehaus.jackson jackson-mapper-asl + + org.codehaus.jackson + jackson-core-asl + org.jruby.jcodings jcodings @@ -282,6 +298,14 @@ tomcat jasper-runtime + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + @@ -332,6 +356,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..7ee3d3d748 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -272,6 +272,14 @@ commons-io compile + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + com.google.protobuf protobuf-java @@ -286,10 +294,6 @@ htrace-core - - org.apache.avro - avro - @@ -399,6 +403,14 @@ tomcat jasper-runtime + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + @@ -449,6 +461,14 @@ 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..dab26e53eb 100644 --- a/hbase-procedure/pom.xml +++ b/hbase-procedure/pom.xml @@ -102,6 +102,14 @@ commons-logging commons-logging + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + @@ -165,6 +173,14 @@ tomcat jasper-runtime + + 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..c8e3d25704 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,10 @@ org.apache.htrace htrace-core + + org.codehaus.jackson + jackson-xc + @@ -235,6 +249,10 @@ org.apache.htrace htrace-core + + org.codehaus.jackson + jackson-xc + 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..0650fd33f5 100644 --- a/hbase-shaded/hbase-shaded-client/pom.xml +++ b/hbase-shaded/hbase-shaded-client/pom.xml @@ -48,6 +48,14 @@ + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + org.apache.hbase hbase-client @@ -56,6 +64,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..020b193cc3 100644 --- a/hbase-shaded/hbase-shaded-server/pom.xml +++ b/hbase-shaded/hbase-shaded-server/pom.xml @@ -48,6 +48,22 @@ + + 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-server @@ -154,6 +170,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 -- 2.17.2 (Apple Git-113)