diff --git a/hbase-build-configuration/pom.xml b/hbase-build-configuration/pom.xml index 4bfe31242364..6201c71af68c 100644 --- a/hbase-build-configuration/pom.xml +++ b/hbase-build-configuration/pom.xml @@ -92,6 +92,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-examples/pom.xml b/hbase-examples/pom.xml index 20c3e05b473c..e33203e74d09 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -34,7 +34,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 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 3ed84918a77f..c1e43ea506c6 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 1099e2e0776c..e82c49b757f5 100644 --- a/pom.xml +++ b/pom.xml @@ -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. --> - 4.1.119.Final + 4.1.121.Final 0.15.0 0.15.0 @@ -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. --> - 2.17.2 - 2.17.2 + 2.19.0 + 2.19.0 2.3.1 3.1.0 2.1.1 @@ -879,7 +879,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 @@ -907,7 +907,7 @@ --> 8.29 3.1.0 - 2.28.0 + 2.38.0 2.4.2 1.0.0 1.8 @@ -941,7 +941,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