diff --git a/hadoop-hdds/hadoop-dependency-client/pom.xml b/hadoop-hdds/hadoop-dependency-client/pom.xml index f29232090fdf..93f2d275a909 100644 --- a/hadoop-hdds/hadoop-dependency-client/pom.xml +++ b/hadoop-hdds/hadoop-dependency-client/pom.xml @@ -47,6 +47,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.xerial.snappy snappy-java + + org.apache.hadoop.thirdparty + hadoop-shaded-guava + org.apache.hadoop hadoop-annotations @@ -202,12 +206,20 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> + + org.apache.hadoop.thirdparty + hadoop-shaded-guava + org.apache.hadoop hadoop-hdfs ${hadoop.version} compile + + org.apache.hadoop.thirdparty + hadoop-shaded-guava + com.google.guava guava diff --git a/hadoop-hdds/hadoop-dependency-server/pom.xml b/hadoop-hdds/hadoop-dependency-server/pom.xml index 82e4c33325e2..84d3117ae866 100644 --- a/hadoop-hdds/hadoop-dependency-server/pom.xml +++ b/hadoop-hdds/hadoop-dependency-server/pom.xml @@ -47,6 +47,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.xerial.snappy snappy-java + + org.apache.hadoop.thirdparty + hadoop-shaded-guava + org.apache.curator * @@ -109,6 +113,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> + + org.apache.hadoop.thirdparty + hadoop-shaded-guava + commons-cli @@ -120,6 +128,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> ${hadoop.version} compile + + org.apache.hadoop.thirdparty + hadoop-shaded-guava + io.netty * diff --git a/pom.xml b/pom.xml index cad0caab3b89..811b63d36e7d 100644 --- a/pom.xml +++ b/pom.xml @@ -303,6 +303,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 1.2.1 3.9.6 1.1.10.5 + 1.2.0 @@ -1539,6 +1540,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs snappy-java ${snappy-java.version} + + org.apache.hadoop.thirdparty + hadoop-shaded-guava + ${hadoop-shaded-guava.version} +