From 76e0d2667cd012440f6cdeec4b39b13e69942e46 Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Wed, 21 Aug 2019 10:51:57 +0530 Subject: [PATCH] HBASE-22863 : Cleanup transitive Jackson1 vulnerable dependencies(forward-port HBASE-22728) --- 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 192faa29c5..e34caf9f95 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 9011013bb7..61f87d4443 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 886d538c55..a3f3f38af5 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 be7aeb5900..480eebe338 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 5461d2c43e..a4a7971d5c 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 f064a18575..40d8ed40f8 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 c22a451b67..4633662a62 100755 --- a/pom.xml +++ b/pom.xml @@ -2372,6 +2372,14 @@ com.sun.jersey jersey-core + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + io.netty netty @@ -2546,6 +2554,14 @@ com.sun.jersey jersey-core + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + commons-beanutils commons-beanutils @@ -2599,6 +2615,14 @@ com.google.code.findbugs jsr305 + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + @@ -2701,6 +2725,14 @@ com.sun.jersey jersey-core + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + io.netty netty -- 2.17.2 (Apple Git-113)