You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2021/11/29 01:14:22 UTC

[hbase-thirdparty] branch master updated: HBASE-26496 [hbase-thirdparty] Exclude the original protobuf-java jar when shading (#56)

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase-thirdparty.git


The following commit(s) were added to refs/heads/master by this push:
     new 247c926  HBASE-26496 [hbase-thirdparty] Exclude the original protobuf-java jar when shading (#56)
247c926 is described below

commit 247c926b387c88c1d2abceae9c32f0bf4b930f84
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Mon Nov 29 09:14:18 2021 +0800

    HBASE-26496 [hbase-thirdparty] Exclude the original protobuf-java jar when shading (#56)
    
    Signed-off-by: Andrew Purtell <ap...@apache.org>
---
 hbase-shaded-protobuf/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hbase-shaded-protobuf/pom.xml b/hbase-shaded-protobuf/pom.xml
index 9bc2a4b..cb0ac5d 100644
--- a/hbase-shaded-protobuf/pom.xml
+++ b/hbase-shaded-protobuf/pom.xml
@@ -148,6 +148,12 @@
             <configuration>
               <shadeSourcesContent>true</shadeSourcesContent>
               <createSourcesJar>true</createSourcesJar>
+              <artifactSet>
+                <excludes>
+                  <!-- We will compile our own version, so exclude the original one -->
+                  <exclude>com.google.protobuf:protobuf-java</exclude>
+                </excludes>
+              </artifactSet>
               <relocations>
                 <relocation>
                   <pattern>com.google.protobuf</pattern>