Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport "HBASE-28879 Bump hbase-thirdparty to 4.1.9" to branch-2.6 #6298

Merged
merged 5 commits into from
Sep 30, 2024
Merged

Backport "HBASE-28879 Bump hbase-thirdparty to 4.1.9" to branch-2.6 #6298

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4334a8f
Test with hbase-thirdparty 4.1.9RC0
ndimiduk Sep 25, 2024
d379c62
Bump internal.protobuf.version
ndimiduk Sep 25, 2024
573a1ee
reformat protobuf comment
ndimiduk Sep 25, 2024
3eeeb0d
spotless:apply
ndimiduk Sep 26, 2024
ecd95df
remove staging repository
ndimiduk Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,9 +608,11 @@
<external.protobuf.groupid>com.google.protobuf</external.protobuf.groupid>
<external.protobuf.version>2.5.0</external.protobuf.version>
<external.protoc.version>${external.protobuf.version}</external.protoc.version>
<!--Version of protobuf that hbase uses internally (we shade our pb)
Must match what is out in hbase-thirdparty include. -->
<internal.protobuf.version>4.26.1</internal.protobuf.version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like we missed syncing the internal protobuf version when we bumped to hbase-thirdparty-4.1.8.

<!--
Version of protobuf that hbase uses internally (we shade our pb) Must match what is out
in hbase-thirdparty include.
-->
<internal.protobuf.version>4.28.2</internal.protobuf.version>
<protobuf.plugin.version>0.6.1</protobuf.plugin.version>
<thrift.path>thrift</thrift.path>
<thrift.version>0.14.1</thrift.version>
Expand Down Expand Up @@ -669,7 +671,7 @@
databind] must be kept in sync with the version of jackson-jaxrs-json-provider shipped in
hbase-thirdparty.
-->
<hbase-thirdparty.version>4.1.8</hbase-thirdparty.version>
<hbase-thirdparty.version>4.1.9</hbase-thirdparty.version>
<!-- Coverage properties -->
<jacoco.version>0.8.8</jacoco.version>
<jacocoArgLine/>
Expand Down