[hbase] branch branch-2.3 updated: HBASE-24168 Align the internal.protobuf.version in hbase-protocol-shaded with hbase-thirdparty (#1488)

[zh...@apache.org]

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

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


The following commit(s) were added to refs/heads/branch-2.3 by this push:
     new 80011db  HBASE-24168 Align the internal.protobuf.version in hbase-protocol-shaded with hbase-thirdparty (#1488)
80011db is described below

commit 80011db571e19db41858369adfb8d9929ba2460f
Author: Joseph295 <51...@qq.com>
AuthorDate: Mon Apr 13 08:50:18 2020 +0800

    HBASE-24168 Align the internal.protobuf.version in hbase-protocol-shaded with hbase-thirdparty (#1488)
    
    Co-authored-by: Joseph295 <jo...@gmail.com>
    Signed-off-by: Duo Zhang <zh...@apache.org>
---
 hbase-protocol-shaded/pom.xml | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index 54c3047..5641891 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -33,20 +33,10 @@
     <maven.javadoc.skip>true</maven.javadoc.skip>
     <!--Version of protobuf that hbase uses internally (we shade our pb)
          Must match what is out in hbase-thirdparty include.
-         3.5.1-1 is the same as 3.5.1 except includes corrected binaries for el6
-         to work around https://github.com/google/protobuf/issues/4109
            -->
-    <internal.protobuf.version>3.5.1-1</internal.protobuf.version>
+    <internal.protobuf.version>3.11.4</internal.protobuf.version>
   </properties>
   <build>
-    <resources>
-      <resource>
-        <directory>src/main/</directory>
-        <includes>
-          <include>**/*.proto</include>
-        </includes>
-      </resource>
-    </resources>
     <plugins>
       <!-- Make a jar and put the sources in the jar -->
       <plugin>
@@ -88,7 +78,6 @@
             </goals>
             <configuration>
               <protocArtifact>com.google.protobuf:protoc:${internal.protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
-              <attachProtoSources>false</attachProtoSources>
               <checkStaleness>true</checkStaleness>
             </configuration>
           </execution>