From 9e66128dbdcdf65b4665d39ddbe3d93e7a1f5d05 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Thu, 7 Dec 2017 15:18:48 -0800 Subject: [PATCH 2/2] HBASE-19349 Introduce wrong version depencency of servlet-api jar Move the hadoop-hdfs guava exclude in modules up to the top pom. Looks like an exclude in a module is not additive but rather exclusive blanking out the top level set of exclusions. Tested by looking in lib dir of the built tarball. --- hbase-endpoint/pom.xml | 16 ---------------- hbase-mapreduce/pom.xml | 16 ---------------- hbase-server/pom.xml | 12 ------------ hbase-shell/pom.xml | 20 -------------------- hbase-testing-util/pom.xml | 20 -------------------- pom.xml | 16 ++++++++++++++++ 6 files changed, 16 insertions(+), 84 deletions(-) diff --git a/hbase-endpoint/pom.xml b/hbase-endpoint/pom.xml index b2b20f0fb9..45efbaa30f 100644 --- a/hbase-endpoint/pom.xml +++ b/hbase-endpoint/pom.xml @@ -287,28 +287,12 @@ org.apache.hadoop hadoop-hdfs - - - com.google.guava - guava - - org.apache.hadoop hadoop-hdfs test-jar test - - - org.apache.htrace - htrace-core - - - com.google.guava - guava - - org.apache.hadoop diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml index 732034a39b..7e0a87c85a 100644 --- a/hbase-mapreduce/pom.xml +++ b/hbase-mapreduce/pom.xml @@ -245,28 +245,12 @@ hadoop-mapreduce-client-jobclient test-jar test - - - com.google.guava - guava - - org.apache.hadoop hadoop-hdfs test-jar test - - - org.apache.htrace - htrace-core - - - com.google.guava - guava - - log4j diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index a83fbb4005..2995981a7c 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -754,24 +754,12 @@ org.apache.hadoop hadoop-hdfs - - - com.google.guava - guava - - org.apache.hadoop hadoop-hdfs test-jar test - - - com.google.guava - guava - - org.apache.hadoop diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml index 3c7cb3fd96..9bbeed70d6 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -357,32 +357,12 @@ org.apache.hadoop hadoop-hdfs - - - org.apache.htrace - htrace-core - - - com.google.guava - guava - - org.apache.hadoop hadoop-hdfs test-jar test - - - org.apache.htrace - htrace-core - - - com.google.guava - guava - - org.apache.hadoop diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml index 7fabf022b0..d8ec6a7dab 100644 --- a/hbase-testing-util/pom.xml +++ b/hbase-testing-util/pom.xml @@ -201,32 +201,12 @@ org.apache.hadoop hadoop-hdfs compile - - - org.apache.htrace - htrace-core - - - com.google.guava - guava - - org.apache.hadoop hadoop-hdfs test-jar compile - - - org.apache.htrace - htrace-core - - - com.google.guava - guava - - org.apache.hadoop diff --git a/pom.xml b/pom.xml index 5cf0c4cb5c..b9f528dacc 100755 --- a/pom.xml +++ b/pom.xml @@ -2549,6 +2549,10 @@ org.codehaus.jackson jackson-mapper-asl + + com.google.guava + guava + ${hadoop-two.version} @@ -2591,6 +2595,10 @@ org.codehaus.jackson jackson-mapper-asl + + com.google.guava + guava + @@ -2799,6 +2807,10 @@ org.codehaus.jackson jackson-mapper-asl + + com.google.guava + guava + ${hadoop-three.version} @@ -2837,6 +2849,10 @@ org.codehaus.jackson jackson-mapper-asl + + com.google.guava + guava + -- 2.11.0 (Apple Git-81)