Skip to content

Commit 340551b

Browse files
committed
HBASE-29317 Bump hbase-thirdparty to 4.1.11 (#6993)
* Update allowed_expr to allow `org/jspecify/annotation/*.class` which is coming from guava due to google/guava@2cc8c5e * Bump maven-shade-plugin to 3.6.0 as we see failure `META-INF/versions/22/com/fasterxml/jackson/core/internal/shaded/fdp/v2_19_0/FastDoubleSwar.class: java.lang.IllegalArgumentException: Unsupported class file major version 66` due to FasterXML/jackson-core@7d8dc09 * Add `--should-stop=ifError=FLOW` as `compilerArgs`. This is required by error prone >= 2.36.0, otherwise compile fails. See google/error-prone@e71db1f for details! Signed-off-by: Istvan Toth <stoty@apache.org> (cherry picked from commit 899e4fc)
1 parent 91076e4 commit 340551b

6 files changed

Lines changed: 14 additions & 10 deletions

File tree

hbase-build-configuration/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@
9292
<arg>-XDcompilePolicy=simple</arg>
9393
<!-- All -Xep need to be on single line see: https://github.com/google/error-prone/pull/1115 -->
9494
<arg>-Xplugin:ErrorProne -XepDisableWarningsInGeneratedCode -XepExcludedPaths:.*/target/.* -Xep:FallThrough:OFF -Xep:MutablePublicArray:OFF -Xep:ClassNewInstance:ERROR -Xep:MissingDefault:ERROR -Xep:BanJNDI:WARN</arg>
95+
<!-- Required by error prone >= 2.36.0. See https://github.com/google/error-prone/commit/e71db1f369a9367f6f2db34c4fbd006b6d6238fd !-->
96+
<arg>--should-stop=ifError=FLOW</arg>
9597
</compilerArgs>
9698
<annotationProcessorPaths>
9799
<path>

hbase-examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
Version of protobuf that hbase uses internally (we shade our pb) Must match what is out
3535
in hbase-thirdparty include.
3636
-->
37-
<internal.protobuf.version>4.28.2</internal.protobuf.version>
37+
<internal.protobuf.version>4.30.2</internal.protobuf.version>
3838
</properties>
3939
<dependencies>
4040
<dependency>

hbase-shaded/hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ allowed_expr+="|^PropertyList-1.0.dtd$"
9696
# Shaded jetty resources
9797
allowed_expr+="|^about.html$"
9898
allowed_expr+="|^jetty-dir.css$"
99-
99+
# Coming from Guava, see https://github.com/google/guava/commit/2cc8c5eddb587db3ac12dacdd5563e79a4681ec4
100+
allowed_expr+="|^org/jspecify/$|^org/jspecify/annotations/$|^org/jspecify/annotations/.*\.class$"
100101

101102
if [ -n "${allow_hadoop}" ]; then
102103
# * classes in packages that start with org.apache.hadoop, which by

hbase-shaded/hbase-shaded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ allowed_expr+="|^PropertyList-1.0.dtd$"
9696
# Shaded jetty resources
9797
allowed_expr+="|^about.html$"
9898
allowed_expr+="|^jetty-dir.css$"
99-
99+
# Coming from Guava, see https://github.com/google/guava/commit/2cc8c5eddb587db3ac12dacdd5563e79a4681ec4
100+
allowed_expr+="|^org/jspecify/$|^org/jspecify/annotations/$|^org/jspecify/annotations/.*\.class$"
100101

101102
if [ -n "${allow_hadoop}" ]; then
102103
# * classes in packages that start with org.apache.hadoop, which by

hbase-shaded/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<plugin>
9191
<groupId>org.apache.maven.plugins</groupId>
9292
<artifactId>maven-shade-plugin</artifactId>
93-
<version>3.5.1</version>
93+
<version>3.6.0</version>
9494
<executions>
9595
<execution>
9696
<id>aggregate-into-a-jar-with-relocated-third-parties</id>

pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@
816816
in the dependencyManagement section as it could still lead to different versions of netty
817817
modules and cause trouble if we only rely on transitive dependencies.
818818
-->
819-
<netty4.version>4.1.119.Final</netty4.version>
819+
<netty4.version>4.1.121.Final</netty4.version>
820820
<!-- end HBASE-15925 default hadoop compatibility values -->
821821
<audience-annotations.version>0.15.0</audience-annotations.version>
822822
<javadoc.audience-annotations.version>0.15.0</javadoc.audience-annotations.version>
@@ -836,8 +836,8 @@
836836
Note that the version of jackson-[annotations,core,databind] must be kept in sync with the
837837
version of jackson-jaxrs-json-provider shipped in hbase-thirdparty.
838838
-->
839-
<jackson.version>2.17.2</jackson.version>
840-
<jackson.databind.version>2.17.2</jackson.databind.version>
839+
<jackson.version>2.19.0</jackson.version>
840+
<jackson.databind.version>2.19.0</jackson.databind.version>
841841
<jaxb-api.version>2.3.1</jaxb-api.version>
842842
<servlet.api.version>3.1.0</servlet.api.version>
843843
<wx.rs.api.version>2.1.1</wx.rs.api.version>
@@ -855,7 +855,7 @@
855855
Version of protobuf that hbase uses internally (we shade our pb) Must match what is out
856856
in hbase-thirdparty include.
857857
-->
858-
<internal.protobuf.version>4.28.2</internal.protobuf.version>
858+
<internal.protobuf.version>4.30.2</internal.protobuf.version>
859859
<protobuf.plugin.version>0.6.1</protobuf.plugin.version>
860860
<thrift.path>thrift</thrift.path>
861861
<thrift.version>0.14.1</thrift.version>
@@ -881,7 +881,7 @@
881881
-->
882882
<checkstyle.version>8.29</checkstyle.version>
883883
<exec.maven.version>3.1.0</exec.maven.version>
884-
<error-prone.version>2.28.0</error-prone.version>
884+
<error-prone.version>2.38.0</error-prone.version>
885885
<jamon.plugin.version>2.4.2</jamon.plugin.version>
886886
<lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
887887
<maven.antrun.version>1.8</maven.antrun.version>
@@ -915,7 +915,7 @@
915915
databind] must be kept in sync with the version of jackson-jaxrs-json-provider shipped in
916916
hbase-thirdparty.
917917
-->
918-
<hbase-thirdparty.version>4.1.10</hbase-thirdparty.version>
918+
<hbase-thirdparty.version>4.1.11</hbase-thirdparty.version>
919919
<!-- for.exclusion version are NOT for direct dependencies. To use the provided
920920
scope to transitively exclude some transitive dependencies, we need to specify
921921
some existing version to for maven. -->

0 commit comments

Comments
 (0)