Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-24168 Align the internal.protobuf.version in hbase-protocol-shaded with hbase-thirdparty (#1489) 

Co-authored-by: Joseph295 <johnhomsea@gmail.com>
Signed-off-by: Duo Zhang <zhangduo@apache.org>
This commit is contained in:
Joseph295 2020-04-13 08:49:12 +08:00 committed by GitHub
parent 45622abe2f
commit 91361ca999
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hbase-protocol-shaded/pom.xml
View File

@ -33,20 +33,10 @@
<maven.javadoc.skip>true</maven.javadoc.skip> <maven.javadoc.skip>true</maven.javadoc.skip>
<!--Version of protobuf that hbase uses internally (we shade our pb) <!--Version of protobuf that hbase uses internally (we shade our pb)
Must match what is out in hbase-thirdparty include. 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> </properties>
<build> <build>
<resources>
<resource>
<directory>src/main/</directory>
<includes>
<include>**/*.proto</include>
</includes>
</resource>
</resources>
<plugins> <plugins>
<!-- Make a jar and put the sources in the jar --> <!-- Make a jar and put the sources in the jar -->
<plugin> <plugin>
@ -88,7 +78,6 @@
</goals> </goals>
<configuration> <configuration>
<protocArtifact>com.google.protobuf:protoc:${internal.protobuf.version}:exe:${os.detected.classifier}</protocArtifact> <protocArtifact>com.google.protobuf:protoc:${internal.protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
<attachProtoSources>false</attachProtoSources>
<checkStaleness>true</checkStaleness> <checkStaleness>true</checkStaleness>
</configuration> </configuration>
</execution> </execution>