Skip to content

HBASE-29317 Bump hbase-thirdparty to 4.1.11 #6993

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

Merged
NihalJain merged 4 commits into from
Jun 2, 2025
Merged

HBASE-29317 Bump hbase-thirdparty to 4.1.11 #6993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3bfc13
HBASE-29317 Bump hbase-thirdparty to 4.1.11
NihalJain May 15, 2025
952495f
Add `--should-stop=ifError=FLOW` as compilerArgs. This is required by…
NihalJain May 16, 2025
1d96a8f
Update to use RC1 jars
NihalJain May 27, 2025
bbedbe4
Drop staging repo
NihalJain May 31, 2025
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
2 changes: 2 additions & 0 deletions hbase-build-configuration/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@
<arg>-XDcompilePolicy=simple</arg>
<!-- All -Xep need to be on single line see: https://github.com/google/error-prone/pull/1115 -->
<arg>-Xplugin:ErrorProne -XepDisableWarningsInGeneratedCode -XepExcludedPaths:.*/target/.* -Xep:FallThrough:OFF -Xep:MutablePublicArray:OFF -Xep:ClassNewInstance:ERROR -Xep:MissingDefault:ERROR -Xep:BanJNDI:WARN</arg>
<!-- Required by error prone >= 2.36.0. See https://github.com/google/error-prone/commit/e71db1f369a9367f6f2db34c4fbd006b6d6238fd !-->
<arg>--should-stop=ifError=FLOW</arg>
</compilerArgs>
<annotationProcessorPaths>
<path>
Expand Down
2 changes: 1 addition & 1 deletion hbase-examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
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>
<internal.protobuf.version>4.30.2</internal.protobuf.version>
</properties>
<dependencies>
<dependency>
Expand Down
3 changes: 2 additions & 1 deletion ...ded/hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ allowed_expr+="|^PropertyList-1.0.dtd$"
# Shaded jetty resources
allowed_expr+="|^about.html$"
allowed_expr+="|^jetty-dir.css$"

# Coming from Guava, see https://github.com/google/guava/commit/2cc8c5eddb587db3ac12dacdd5563e79a4681ec4
allowed_expr+="|^org/jspecify/$|^org/jspecify/annotations/$|^org/jspecify/annotations/.*\.class$"

if [ -n "${allow_hadoop}" ]; then
# * classes in packages that start with org.apache.hadoop, which by
Expand Down
3 changes: 2 additions & 1 deletion ...aded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ allowed_expr+="|^PropertyList-1.0.dtd$"
# Shaded jetty resources
allowed_expr+="|^about.html$"
allowed_expr+="|^jetty-dir.css$"

# Coming from Guava, see https://github.com/google/guava/commit/2cc8c5eddb587db3ac12dacdd5563e79a4681ec4
allowed_expr+="|^org/jspecify/$|^org/jspecify/annotations/$|^org/jspecify/annotations/.*\.class$"

if [ -n "${allow_hadoop}" ]; then
# * classes in packages that start with org.apache.hadoop, which by
Expand Down
2 changes: 1 addition & 1 deletion hbase-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.1</version>
<version>3.6.0</version>
<executions>
<execution>
<id>aggregate-into-a-jar-with-relocated-third-parties</id>
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,7 @@
in the dependencyManagement section as it could still lead to different versions of netty
modules and cause trouble if we only rely on transitive dependencies.
-->
<netty4.version>4.1.119.Final</netty4.version>
<netty4.version>4.1.121.Final</netty4.version>
<!-- end HBASE-15925 default hadoop compatibility values -->
<audience-annotations.version>0.15.0</audience-annotations.version>
<javadoc.audience-annotations.version>0.15.0</javadoc.audience-annotations.version>
Expand All @@ -860,8 +860,8 @@
Note that the version of jackson-[annotations,core,databind] must be kept in sync with the
version of jackson-jaxrs-json-provider shipped in hbase-thirdparty.
-->
<jackson.version>2.17.2</jackson.version>
<jackson.databind.version>2.17.2</jackson.databind.version>
<jackson.version>2.19.0</jackson.version>
<jackson.databind.version>2.19.0</jackson.databind.version>
<jaxb-api.version>2.3.1</jaxb-api.version>
<servlet.api.version>3.1.0</servlet.api.version>
<wx.rs.api.version>2.1.1</wx.rs.api.version>
Expand All @@ -879,7 +879,7 @@
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>
<internal.protobuf.version>4.30.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 @@ -907,7 +907,7 @@
-->
<checkstyle.version>8.29</checkstyle.version>
<exec.maven.version>3.1.0</exec.maven.version>
<error-prone.version>2.28.0</error-prone.version>
<error-prone.version>2.38.0</error-prone.version>
<jamon.plugin.version>2.4.2</jamon.plugin.version>
<lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
<maven.antrun.version>1.8</maven.antrun.version>
Expand Down Expand Up @@ -941,7 +941,7 @@
databind] must be kept in sync with the version of jackson-jaxrs-json-provider shipped in
hbase-thirdparty.
-->
<hbase-thirdparty.version>4.1.10</hbase-thirdparty.version>
<hbase-thirdparty.version>4.1.11</hbase-thirdparty.version>
<!-- for.exclusion version are NOT for direct dependencies. To use the provided
scope to transitively exclude some transitive dependencies, we need to specify
some existing version to for maven. -->
Expand Down