You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by do...@apache.org on 2022/08/24 10:01:58 UTC
[orc] branch branch-1.8 updated: ORC-1261: Rename shaded pattern `com.google.protobuf25` to `org.apache.orc.protobuf`
This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-1.8
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/branch-1.8 by this push:
new 49ea0e7ca ORC-1261: Rename shaded pattern `com.google.protobuf25` to `org.apache.orc.protobuf`
49ea0e7ca is described below
commit 49ea0e7cab02296672be382f93716c90b671dffa
Author: Dongjoon Hyun <do...@apache.org>
AuthorDate: Wed Aug 24 03:01:40 2022 -0700
ORC-1261: Rename shaded pattern `com.google.protobuf25` to `org.apache.orc.protobuf`
### What changes were proposed in this pull request?
This PR aims to rename `shadedPattern` from `com.google.protobuf25` to `org.apache.orc.protobuf`.
### Why are the changes needed?
We had better use `protobuf-java`-version-neutral name because we start to shade this.
### How was this patch tested?
Pass the CIs.
Closes #1234 from dongjoon-hyun/ORC-1261.
Lead-authored-by: Dongjoon Hyun <do...@apache.org>
Co-authored-by: Yiqun Zhang <gu...@gmail.com>
Signed-off-by: Dongjoon Hyun <do...@apache.org>
(cherry picked from commit 72220851cbde164a22706f8d47741fd1ad3db190)
Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
java/pom.xml | 4 ++--
java/tools/pom.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/pom.xml b/java/pom.xml
index 5f1c19e92..12acbce92 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -470,7 +470,7 @@
<relocations>
<relocation>
<pattern>com.google.protobuf</pattern>
- <shadedPattern>com.google.protobuf25</shadedPattern>
+ <shadedPattern>org.apache.orc.protobuf</shadedPattern>
</relocation>
</relocations>
<filters>
@@ -505,7 +505,7 @@
<relocations>
<relocation>
<pattern>com.google.protobuf</pattern>
- <shadedPattern>com.google.protobuf25</shadedPattern>
+ <shadedPattern>org.apache.orc.protobuf</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.hadoop.hive</pattern>
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index 6ee1c0792..5991406bd 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -136,7 +136,7 @@
<relocations>
<relocation>
<pattern>com.google.protobuf</pattern>
- <shadedPattern>com.google.protobuf25</shadedPattern>
+ <shadedPattern>org.apache.orc.protobuf</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.hadoop.hive</pattern>