You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2020/10/21 07:25:56 UTC
[hadoop] branch revert-2398-HADOOP-17315 created (now 905c0f4)
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a change to branch revert-2398-HADOOP-17315
in repository https://gitbox.apache.org/repos/asf/hadoop.git.
at 905c0f4 Revert "HADOOP-17315. Use shaded guava in ClientCache.java (#2398)"
This branch includes the following new commits:
new 905c0f4 Revert "HADOOP-17315. Use shaded guava in ClientCache.java (#2398)"
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 01/01: Revert "HADOOP-17315. Use shaded guava in
ClientCache.java (#2398)"
Posted by aa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch revert-2398-HADOOP-17315
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 905c0f4bc2918e46f3761c53759ff61c08e88d79
Author: Akira Ajisaka <aa...@apache.org>
AuthorDate: Wed Oct 21 16:25:35 2020 +0900
Revert "HADOOP-17315. Use shaded guava in ClientCache.java (#2398)"
This reverts commit 7b4359657f8772d1bc34d73ea1115b97627a7840.
---
hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml | 4 +++-
.../src/main/java/org/apache/hadoop/ipc/ClientCache.java | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml b/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml
index 0ff47b8..96e2849 100644
--- a/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml
+++ b/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml
@@ -121,7 +121,9 @@
<!-- See http://checkstyle.sf.net/config_import.html -->
<module name="IllegalImport">
<property name="regexp" value="true"/>
- <property name="illegalPkgs" value="^sun\.[^.]+, ^com\.google\.common\.[^.]+"/>
+ <property name="illegalPkgs" value="^sun\.[^.]+"/>
+ <property name="illegalClasses"
+ value="^com\.google\.common\.base\.(Optional|Function|Predicate|Supplier), ^com\.google\.common\.collect\.(ImmutableListMultimap)"/>
</module>
<module name="RedundantImport"/>
<module name="UnusedImports"/>
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ClientCache.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ClientCache.java
index 94a0f04..9c02c45 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ClientCache.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ClientCache.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.ObjectWritable;
import org.apache.hadoop.io.Writable;
-import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import com.google.common.annotations.VisibleForTesting;
/* Cache a client using its socket factory as the hash key */
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org