This is an automated email from the ASF dual-hosted git repository.
vinayakumarb pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop-thirdparty.git
The following commit(s) were added to refs/heads/trunk by this push:
new eac5a3d HADOOP-16821. [pb-upgrade] Use 'o.a.h.thirdparty.protobuf'
shaded prefix instead of 'protobuf_3_7' (#3)
eac5a3d is described below
commit eac5a3df55fcc3b1fd4b50cf2fa129250d4c384b
Author: Vinayakumar B <vinayakum...@apache.org>
AuthorDate: Tue Jan 21 22:59:27 2020 +0530
HADOOP-16821. [pb-upgrade] Use 'o.a.h.thirdparty.protobuf' shaded prefix
instead of 'protobuf_3_7' (#3)
---
hadoop-shaded-protobuf_3_7/pom.xml | 2 +-
pom.xml | 1 +
src/site/markdown/index.md.vm | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/hadoop-shaded-protobuf_3_7/pom.xml
b/hadoop-shaded-protobuf_3_7/pom.xml
index 102625c..5a622cd 100644
--- a/hadoop-shaded-protobuf_3_7/pom.xml
+++ b/hadoop-shaded-protobuf_3_7/pom.xml
@@ -74,7 +74,7 @@
<relocations>
<relocation>
<pattern>com/google/protobuf</pattern>
- <shadedPattern>${shaded.prefix}.protobuf_3_7</shadedPattern>
+ <shadedPattern>${protobuf.shade.prefix}</shadedPattern>
</relocation>
<relocation>
<pattern>google/</pattern>
diff --git a/pom.xml b/pom.xml
index 155a0a2..0754cb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,6 +93,7 @@
<!--thirdparty dependency versions-->
<shaded.prefix>org.apache.hadoop.thirdparty</shaded.prefix>
+ <protobuf.shade.prefix>${shaded.prefix}.protobuf</protobuf.shade.prefix>
<protobuf_3_7.version>3.7.1</protobuf_3_7.version>
<!-- maven plugin versions -->
diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm
index adafd02..f7acb74 100644
--- a/src/site/markdown/index.md.vm
+++ b/src/site/markdown/index.md.vm
@@ -43,3 +43,4 @@ This page provides an overview of the major changes.
Protobuf-java
-------------
Google Protobuf's 3.7.1 jar is available as
*org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7* artifact.
+*com.google.protobuf* package is shaded as
*org.apache.hadoop.thirdparty.protobuf*.
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
