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 we...@apache.org on 2021/05/26 05:45:43 UTC
[hadoop-thirdparty] 02/02: HADOOP-17730. Add back error_prone (#18)
This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch branch-1.1
in repository https://gitbox.apache.org/repos/asf/hadoop-thirdparty.git
commit db2fc27e2f53637a06c36c3a9d8dae0a8c894cd8
Author: Wei-Chiu Chuang <we...@apache.org>
AuthorDate: Tue May 25 22:39:28 2021 -0700
HADOOP-17730. Add back error_prone (#18)
Reviewed-by: Ayush Saxena <ay...@apache.org>
Reviewed-by: Takanobu Asanuma <ta...@apache.org>
Reviewed-by: Akira Ajisaka <aa...@apache.org>
(cherry picked from commit a476f24008c9fe21b385ab57d9a36289153ac8a3)
---
LICENSE-binary | 1 +
hadoop-shaded-guava/pom.xml | 7 -------
src/site/markdown/index.md.vm | 4 ++--
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index 6e5d636..978d1d7 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -207,6 +207,7 @@ License Version 2.0:
com.google.guava:guava:jar:30.1.1-jre
com.google.j2objc:j2objc-annotations:1.3
+com.google.errorprone:error_prone_annotations:2.5.1
--------------------------------------------------------------------------------
This product bundles various third-party components under other open source
diff --git a/hadoop-shaded-guava/pom.xml b/hadoop-shaded-guava/pom.xml
index 60a8478..9c33ad7 100644
--- a/hadoop-shaded-guava/pom.xml
+++ b/hadoop-shaded-guava/pom.xml
@@ -36,13 +36,6 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
- <exclusions>
- <!-- Excluding error_prone_annotations because of YARN-10195-->
- <exclusion>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_annotations</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm
index a2c2076..fcaba6d 100644
--- a/src/site/markdown/index.md.vm
+++ b/src/site/markdown/index.md.vm
@@ -59,5 +59,5 @@ Following are relocations under *hadoop-shaded-guava* artifact:
|Original package | Shaded package |
|---|---|
-|com.google.guava|org.apache.hadoop.thirdparty.com.google|
-|org.checkerframework|org.apache.hadoop.thirdparty.org.checkerframework|
+|com.google|org.apache.hadoop.thirdparty.com.google|
+|org.checkerframework|org.apache.hadoop.thirdparty.org.checkerframework|
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org