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:
parent
45622abe2f
commit
91361ca999
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue