This is an automated email from the ASF dual-hosted git repository. ayushsaxena pushed a commit to branch branch-3.3 in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit b84bc63aa2df0df060081fd9eb8b91bb8e06e761 Author: Akira Ajisaka <[email protected]> AuthorDate: Tue Nov 10 15:19:40 2020 +0900 HADOOP-17344. Harmonize guava version and shade guava in yarn-csi. (#2434) Reviewed-by: Ayush Saxena <[email protected]> Reviewed-by: Wei-Chiu Chuang <[email protected]> --- .../hadoop-yarn/hadoop-yarn-csi/pom.xml | 18 ++---------------- .../hadoop/yarn/csi/adaptor/TestCsiAdaptorService.java | 4 ++-- .../adaptor/TestValidateVolumeCapabilityRequest.java | 4 ++-- .../apache/hadoop/yarn/csi/client/TestCsiClient.java | 2 +- 4 files changed, 7 insertions(+), 21 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml index b57f238..3cbb951 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml @@ -27,16 +27,14 @@ <properties> <protobuf.version>3.6.1</protobuf.version> - <guava.version>20.0</guava.version> <grpc.version>1.26.0</grpc.version> <os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version> </properties> <dependencies> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${guava.version}</version> + <groupId>org.apache.hadoop.thirdparty</groupId> + <artifactId>hadoop-shaded-guava</artifactId> </dependency> <dependency> <groupId>com.google.protobuf</groupId> @@ -209,18 +207,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>com.google.code.maven-replacer-plugin</groupId> - <artifactId>replacer</artifactId> - <executions> - <execution> - <id>replace-guava</id> - <configuration> - <skip>true</skip> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestCsiAdaptorService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestCsiAdaptorService.java index 2375b06..206fb14 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestCsiAdaptorService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestCsiAdaptorService.java @@ -17,8 +17,6 @@ */ package org.apache.hadoop.yarn.csi.adaptor; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import csi.v0.Csi; import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; @@ -26,6 +24,8 @@ import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.service.ServiceStateException; import org.apache.hadoop.test.GenericTestUtils; +import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableList; +import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap; import org.apache.hadoop.yarn.api.CsiAdaptorProtocol; import org.apache.hadoop.yarn.api.CsiAdaptorPlugin; import org.apache.hadoop.yarn.api.impl.pb.client.CsiAdaptorProtocolPBClientImpl; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestValidateVolumeCapabilityRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestValidateVolumeCapabilityRequest.java index 303cfc4..127ddb3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestValidateVolumeCapabilityRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestValidateVolumeCapabilityRequest.java @@ -17,8 +17,8 @@ */ package org.apache.hadoop.yarn.csi.adaptor; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; +import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableList; +import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap; import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesRequest; import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesRequest.VolumeCapability; import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.ValidateVolumeCapabilitiesRequestPBImpl; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/TestCsiClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/TestCsiClient.java index 9e7ac19..f025bc6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/TestCsiClient.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/TestCsiClient.java @@ -20,7 +20,7 @@ package org.apache.hadoop.yarn.csi.client; import csi.v0.Csi; import org.apache.commons.io.FileUtils; -import com.google.common.io.Files; +import org.apache.hadoop.thirdparty.com.google.common.io.Files; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Assume; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
