From ea806f77dbfbb2257cb84b95bdc96a4441db134d Mon Sep 17 00:00:00 2001 From: Nihal Jain Date: Mon, 19 May 2025 21:48:21 +0530 Subject: [PATCH 1/4] HBASE-29317 Bump hbase-thirdparty to 4.1.11 * Update allowed_expr to allow `org/jspecify/annotation/*.class` which is coming from guava due to https://github.com/google/guava/commit/2cc8c5eddb587db3ac12dacdd5563e79a4681ec4 * 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 https://github.com/FasterXML/jackson-core/commit/7d8dc09bb772ffb0981e3dcf8e9d95b2273bd756 * Add `--should-stop=ifError=FLOW` as `compilerArgs`. This is required by error prone >= 2.36.0, otherwise compile fails. See https://github.com/google/error-prone/commit/e71db1f369a9367f6f2db34c4fbd006b6d6238fd for details! --- hbase-build-configuration/pom.xml | 2 ++ .../ensure-jars-have-correct-contents.sh | 3 ++- .../ensure-jars-have-correct-contents.sh | 3 ++- hbase-shaded/pom.xml | 2 +- pom.xml | 23 ++++++++++++++----- 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/hbase-build-configuration/pom.xml b/hbase-build-configuration/pom.xml index 5f6ef34e0f79..395f446d07b1 100644 --- a/hbase-build-configuration/pom.xml +++ b/hbase-build-configuration/pom.xml @@ -82,6 +82,8 @@ -XDcompilePolicy=simple -Xplugin:ErrorProne -XepDisableWarningsInGeneratedCode -XepExcludedPaths:.*/target/.* -Xep:FallThrough:OFF -Xep:MutablePublicArray:OFF -Xep:ClassNewInstance:ERROR -Xep:MissingDefault:ERROR -Xep:BanJNDI:WARN + + --should-stop=ifError=FLOW diff --git a/hbase-shaded/hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh b/hbase-shaded/hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh index c6a923fb9022..1d1350712b12 100644 --- a/hbase-shaded/hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh +++ b/hbase-shaded/hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh @@ -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 diff --git a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh b/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh index c6a923fb9022..1d1350712b12 100644 --- a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh +++ b/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh @@ -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 diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml index bbc2afd0a59b..9ef25f57227d 100644 --- a/hbase-shaded/pom.xml +++ b/hbase-shaded/pom.xml @@ -90,7 +90,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.1 + 3.6.0 aggregate-into-a-jar-with-relocated-third-parties diff --git a/pom.xml b/pom.xml index da922ff5f2c3..74871911bc3d 100644 --- a/pom.xml +++ b/pom.xml @@ -564,7 +564,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. --> - 4.1.119.Final + 4.1.121.Final 0.13.0 - 2.17.2 - 2.17.2 + 2.19.0 + 2.19.0 2.3.1 3.1.0 2.1.1 @@ -610,7 +610,7 @@ Version of protobuf that hbase uses internally (we shade our pb) Must match what is out in hbase-thirdparty include. --> - 4.28.2 + 4.30.2 0.6.1 thrift 0.14.1 @@ -637,7 +637,7 @@ --> 8.29 3.1.0 - 2.28.0 + 2.38.0 2.4.2 1.0.0 1.8 @@ -672,7 +672,7 @@ databind] must be kept in sync with the version of jackson-jaxrs-json-provider shipped in hbase-thirdparty. --> - 4.1.10 + 4.1.11-SNAPSHOT 0.8.8 @@ -1594,6 +1594,17 @@ test + + + + + true + always + + apache.snapshots + https://repository.apache.org/content/repositories/snapshots + + 8.29 3.1.0 - 2.38.0 + + 2.31.0 2.4.2 1.0.0 1.8 From 4df601df0a9570b2e4fb5ed28e070c32f5dbfcef Mon Sep 17 00:00:00 2001 From: Nihal Jain Date: Tue, 27 May 2025 23:26:49 +0530 Subject: [PATCH 3/4] Update to use RC1 jars --- pom.xml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 2a2c1d78f5f1..acf5abf478d2 100644 --- a/pom.xml +++ b/pom.xml @@ -674,7 +674,7 @@ databind] must be kept in sync with the version of jackson-jaxrs-json-provider shipped in hbase-thirdparty. --> - 4.1.11-SNAPSHOT + 4.1.11 0.8.8 @@ -1596,15 +1596,11 @@ test - - - true - always - - apache.snapshots - https://repository.apache.org/content/repositories/snapshots + staging + staging + https://repository.apache.org/content/repositories/orgapachehbase-1577 From ee54b904117f63f3554a0e86748e213013a4a747 Mon Sep 17 00:00:00 2001 From: Nihal Jain Date: Sat, 31 May 2025 12:44:19 +0530 Subject: [PATCH 4/4] Drop staging repo --- pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pom.xml b/pom.xml index acf5abf478d2..d756fc91a3f4 100644 --- a/pom.xml +++ b/pom.xml @@ -1596,13 +1596,6 @@ test - - - staging - staging - https://repository.apache.org/content/repositories/orgapachehbase-1577 - -