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:41 UTC
[hadoop-thirdparty] branch branch-1.1 updated (98cd467 -> db2fc27)
This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a change to branch branch-1.1
in repository https://gitbox.apache.org/repos/asf/hadoop-thirdparty.git.
from 98cd467 HADOOP-17697. Fix license error in GitHub Actions workflow files. (#16)
new e1db87b HADOOP-17707. Remove jaeger document from site index.
new db2fc27 HADOOP-17730. Add back error_prone (#18)
The 2 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.
Summary of changes:
LICENSE-binary | 1 +
hadoop-shaded-guava/pom.xml | 7 -------
src/site/markdown/index.md.vm | 22 ++++++----------------
3 files changed, 7 insertions(+), 23 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop-thirdparty] 02/02: HADOOP-17730. Add back error_prone (#18)
Posted by we...@apache.org.
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
[hadoop-thirdparty] 01/02: HADOOP-17707. Remove jaeger document
from site index.
Posted by we...@apache.org.
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 e1db87b85117b5694972f2725aa32c9975a83b5b
Author: Takanobu Asanuma <ta...@apache.org>
AuthorDate: Tue May 18 12:11:59 2021 +0900
HADOOP-17707. Remove jaeger document from site index.
(cherry picked from commit 0577cb91153c74f4c871528fdde9cfdf65aff4f6)
---
src/site/markdown/index.md.vm | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm
index 280b1c6..a2c2076 100644
--- a/src/site/markdown/index.md.vm
+++ b/src/site/markdown/index.md.vm
@@ -51,23 +51,13 @@ Following are relocations under *hadoop-shaded-protobuf_3_7* artifact:
|com.google.protobuf|org.apache.hadoop.thirdparty.protobuf|
-io.jaegertracing:jaeger-client
-------------------------------
-jaeger-client: 0.34.2 jar is available as *org.apache.hadoop.thirdparty:hadoop-shaded-jaeger* artifact.
+Guava
+-------------
+Google Guava's 30.1.1 jar is available as *org.apache.hadoop.thirdparty:hadoop-shaded-guava* artifact.
-Following are relocations under *hadoop-shaded-jaeger* artifact:
+Following are relocations under *hadoop-shaded-guava* artifact:
|Original package | Shaded package |
|---|---|
-|com.google.gson | org.apache.hadoop.thirdparty.io.jaegertracing.com.google.gson|
-|io.jaegertracing.thriftjava|org.apache.hadoop.thirdparty.io.jaegertracing.thriftjava|
-|io.jaegertracing.crossdock|org.apache.hadoop.thirdparty.io.jaegertracing.crossdock|
-|io.jaegertracing.thrift|org.apache.hadoop.thirdparty.io.jaegertracing.thrift|
-|io.jaegertracing.agent|org.apache.hadoop.thirdparty.io.jaegertracing.agent|
-|org.apache.thrift|org.apache.hadoop.thirdparty.io.jaegertracing.apache.thrift|
-|com.twitter.zipkin|org.apache.hadoop.thirdparty.io.jaegertracing.com.twitter.zipkin|
-|okhttp3|org.apache.hadoop.thirdparty.io.jaegertracing.okhttp3|
-|kotlin|org.apache.hadoop.thirdparty.io.jaegertracing.kotlin|
-|org.intellij|org.apache.hadoop.thirdparty.io.jaegertracing.org.intellij|
-|org.jetbrains|org.apache.hadoop.thirdparty.io.jaegertracing.org.jetbrains|
-|okio|org.apache.hadoop.thirdparty.io.jaegertracing.okio|
\ No newline at end of file
+|com.google.guava|org.apache.hadoop.thirdparty.com.google|
+|org.checkerframework|org.apache.hadoop.thirdparty.org.checkerframework|
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org