Skip to content

Commit 2eb9f45

Browse files
author
Joseph295
committed
HBASE-24168 Align the internal.protobuf.version in hbase-protocol-shaded with hbase-thirdparty
1 parent cc4aaef commit 2eb9f45

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

hbase-protocol-shaded/pom.xml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,10 @@
3333
<maven.javadoc.skip>true</maven.javadoc.skip>
3434
<!--Version of protobuf that hbase uses internally (we shade our pb)
3535
Must match what is out in hbase-thirdparty include.
36-
3.5.1-1 is the same as 3.5.1 except includes corrected binaries for el6
37-
to work around https://github.com/google/protobuf/issues/4109
3836
-->
39-
<internal.protobuf.version>3.5.1-1</internal.protobuf.version>
37+
<internal.protobuf.version>3.11.4</internal.protobuf.version>
4038
</properties>
4139
<build>
42-
<resources>
43-
<resource>
44-
<directory>src/main/</directory>
45-
<includes>
46-
<include>**/*.proto</include>
47-
</includes>
48-
</resource>
49-
</resources>
5040
<plugins>
5141
<!-- Make a jar and put the sources in the jar -->
5242
<plugin>
@@ -88,7 +78,6 @@
8878
</goals>
8979
<configuration>
9080
<protocArtifact>com.google.protobuf:protoc:${internal.protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
91-
<attachProtoSources>false</attachProtoSources>
9281
<checkStaleness>true</checkStaleness>
9382
</configuration>
9483
</execution>

0 commit comments

Comments
 (0)