From 3251c54311a7d6644c4695df2f72e079c6b0260c Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Sun, 18 Aug 2019 19:49:11 +0530 Subject: [PATCH 1/3] exclusions in parent pom --- hbase-mapreduce/pom.xml | 10 +++++ hbase-server/pom.xml | 6 +++ .../hbase-shaded-client-byo-hadoop/pom.xml | 24 +++++++++++ hbase-shaded/hbase-shaded-mapreduce/pom.xml | 24 +++++++++++ .../hbase-shaded-testing-util/pom.xml | 40 +++++++++++++++++++ pom.xml | 32 +++++++++++++++ 6 files changed, 136 insertions(+) diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml index 87943bf2f393..9da2c6fd5fde 100644 --- a/hbase-mapreduce/pom.xml +++ b/hbase-mapreduce/pom.xml @@ -204,6 +204,16 @@ hadoop-mapreduce-client-jobclient test-jar test + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + org.apache.hadoop diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index b51d7b837f53..a2577da0750c 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -245,6 +245,12 @@ org.apache.hbase hbase-http + + + org.codehaus.jackson + jackson-core-asl + + org.apache.hbase diff --git a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml b/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml index bf85f22e8880..ddd1affc9370 100644 --- a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml +++ b/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml @@ -87,6 +87,18 @@ hadoop-common provided + + org.codehaus.jackson + jackson-jaxrs + 1.9.13 + provided + + + org.codehaus.jackson + jackson-xc + 1.9.13 + provided + @@ -113,6 +125,18 @@ hadoop-common provided + + org.codehaus.jackson + jackson-jaxrs + 1.9.13 + provided + + + org.codehaus.jackson + jackson-xc + 1.9.13 + provided + diff --git a/hbase-shaded/hbase-shaded-mapreduce/pom.xml b/hbase-shaded/hbase-shaded-mapreduce/pom.xml index 38bddd06acb9..4e5801570794 100644 --- a/hbase-shaded/hbase-shaded-mapreduce/pom.xml +++ b/hbase-shaded/hbase-shaded-mapreduce/pom.xml @@ -265,6 +265,18 @@ + + org.codehaus.jackson + jackson-jaxrs + 1.9.13 + provided + + + org.codehaus.jackson + jackson-xc + 1.9.13 + provided + org.apache.hadoop hadoop-auth @@ -315,6 +327,18 @@ + + org.codehaus.jackson + jackson-jaxrs + 1.9.13 + provided + + + org.codehaus.jackson + jackson-xc + 1.9.13 + provided + diff --git a/hbase-shaded/hbase-shaded-testing-util/pom.xml b/hbase-shaded/hbase-shaded-testing-util/pom.xml index b4cf8e096142..8fa37913d24b 100644 --- a/hbase-shaded/hbase-shaded-testing-util/pom.xml +++ b/hbase-shaded/hbase-shaded-testing-util/pom.xml @@ -45,6 +45,22 @@ javax.servlet.jsp jsp-api + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + @@ -59,6 +75,24 @@ ${hadoop.version} test-jar compile + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + org.apache.hadoop @@ -97,6 +131,12 @@ test-jar compile + + org.codehaus.jackson + jackson-mapper-asl + 1.9.13 + test + org.apache.hbase diff --git a/pom.xml b/pom.xml index 7652b4ffb23b..6a22192733fc 100755 --- a/pom.xml +++ b/pom.xml @@ -2545,6 +2545,14 @@ com.sun.jersey jersey-core + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + io.netty netty @@ -2719,6 +2727,14 @@ com.sun.jersey jersey-core + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + commons-beanutils commons-beanutils @@ -2772,6 +2788,14 @@ com.google.code.findbugs jsr305 + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + @@ -2874,6 +2898,14 @@ com.sun.jersey jersey-core + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + io.netty netty From f7700f5c10f835c636601a3dd95c801487c5496c Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Sun, 18 Aug 2019 20:05:38 +0530 Subject: [PATCH 2/3] minor changes --- .../hbase-shaded-client-byo-hadoop/pom.xml | 40 +++++++++++++++++++ hbase-shaded/hbase-shaded-mapreduce/pom.xml | 40 +++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml b/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml index ddd1affc9370..f011ff1bd091 100644 --- a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml +++ b/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml @@ -92,12 +92,32 @@ jackson-jaxrs 1.9.13 provided + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + org.codehaus.jackson jackson-xc 1.9.13 provided + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + @@ -130,12 +150,32 @@ jackson-jaxrs 1.9.13 provided + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + org.codehaus.jackson jackson-xc 1.9.13 provided + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + diff --git a/hbase-shaded/hbase-shaded-mapreduce/pom.xml b/hbase-shaded/hbase-shaded-mapreduce/pom.xml index 4e5801570794..fdd389a1fb34 100644 --- a/hbase-shaded/hbase-shaded-mapreduce/pom.xml +++ b/hbase-shaded/hbase-shaded-mapreduce/pom.xml @@ -270,12 +270,32 @@ jackson-jaxrs 1.9.13 provided + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + org.codehaus.jackson jackson-xc 1.9.13 provided + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + org.apache.hadoop @@ -332,12 +352,32 @@ jackson-jaxrs 1.9.13 provided + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + org.codehaus.jackson jackson-xc 1.9.13 provided + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + From aee9c214864e598695a844f14adebcf8bcc036c7 Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Mon, 19 Aug 2019 00:53:19 +0530 Subject: [PATCH 3/3] minor change --- hbase-shaded/hbase-shaded-testing-util-tester/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hbase-shaded/hbase-shaded-testing-util-tester/pom.xml b/hbase-shaded/hbase-shaded-testing-util-tester/pom.xml index 1fb81d585278..4750c9c96795 100644 --- a/hbase-shaded/hbase-shaded-testing-util-tester/pom.xml +++ b/hbase-shaded/hbase-shaded-testing-util-tester/pom.xml @@ -57,6 +57,12 @@ ${project.version} test + + org.codehaus.jackson + jackson-mapper-asl + 1.9.13 + test +