From 84d092cb1d2db5d7b764da24ed07c7400a56bc8f Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Wed, 21 Aug 2019 19:36:05 +0530 Subject: [PATCH] HBASE-22863 Cleanup transitive Jackson1 vulnerable dependencies(forward-port HBASE-22728) (#505) Signed-off-by: Duo Zhang Signed-off-by: Reid Chan --- hbase-mapreduce/pom.xml | 10 +++ hbase-server/pom.xml | 6 ++ .../hbase-shaded-client-byo-hadoop/pom.xml | 64 +++++++++++++++++++ hbase-shaded/hbase-shaded-mapreduce/pom.xml | 64 +++++++++++++++++++ .../hbase-shaded-testing-util-tester/pom.xml | 6 ++ .../hbase-shaded-testing-util/pom.xml | 40 ++++++++++++ pom.xml | 32 ++++++++++ 7 files changed, 222 insertions(+) diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml index 99f0819a0b2..90d948ffe79 100644 --- a/hbase-mapreduce/pom.xml +++ b/hbase-mapreduce/pom.xml @@ -221,6 +221,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 4089ec6ae91..1feb8e0efc5 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -333,6 +333,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 62325eb1fec..06768b92a26 100644 --- a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml +++ b/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml @@ -87,6 +87,38 @@ hadoop-common provided + + org.codehaus.jackson + 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 + + + @@ -113,6 +145,38 @@ hadoop-common provided + + org.codehaus.jackson + 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 02e4893e10f..6a433b8449d 100644 --- a/hbase-shaded/hbase-shaded-mapreduce/pom.xml +++ b/hbase-shaded/hbase-shaded-mapreduce/pom.xml @@ -265,6 +265,38 @@ + + org.codehaus.jackson + 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 hadoop-auth @@ -315,6 +347,38 @@ + + org.codehaus.jackson + 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-testing-util-tester/pom.xml b/hbase-shaded/hbase-shaded-testing-util-tester/pom.xml index 43049148d19..b1ac6805ae0 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 + diff --git a/hbase-shaded/hbase-shaded-testing-util/pom.xml b/hbase-shaded/hbase-shaded-testing-util/pom.xml index 5fe4b3f9f15..47c46e76227 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 be3f38e0a72..4cdd403f4e3 100755 --- a/pom.xml +++ b/pom.xml @@ -2418,6 +2418,14 @@ com.sun.jersey jersey-core + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + io.netty netty @@ -2592,6 +2600,14 @@ com.sun.jersey jersey-core + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + commons-beanutils commons-beanutils @@ -2645,6 +2661,14 @@ com.google.code.findbugs jsr305 + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + @@ -2747,6 +2771,14 @@ com.sun.jersey jersey-core + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + io.netty netty