(hbase) branch branch-3 updated: HBASE-30338 Restore the shaded jar content check (#8561)

[junegunn]

This is an automated email from the ASF dual-hosted git repository.

junegunn pushed a commit to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-3 by this push:
     new f0094ff6d02 HBASE-30338 Restore the shaded jar content check (#8561)
f0094ff6d02 is described below

commit f0094ff6d02a308220290ca629e8949fc722529d
Author: Junegunn Choi <juneg...@apache.org>
AuthorDate: Mon Aug 24 16:34:00 2026 +0900

    HBASE-30338 Restore the shaded jar content check (#8561)
    
    Signed-off-by: Nihal Jain <nihalj...@apache.org>
---
 .../src/test/resources/ensure-jars-have-correct-contents.sh           | 4 ++--
 .../src/test/resources/ensure-jars-have-correct-contents.sh           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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 8b63889f195..47bd5e02d2e 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
@@ -98,8 +98,8 @@ 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$"
-# Required by jetty 12 on ee8
-allowed_expr="(|^javax/$)"
+# Servlet API for jetty 12 on ee8, shipped unrelocated in 
hbase-shaded-mapreduce
+allowed_expr+="|^javax/$|^javax/servlet/"
 
 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 8b63889f195..47bd5e02d2e 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
@@ -98,8 +98,8 @@ 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$"
-# Required by jetty 12 on ee8
-allowed_expr="(|^javax/$)"
+# Servlet API for jetty 12 on ee8, shipped unrelocated in 
hbase-shaded-mapreduce
+allowed_expr+="|^javax/$|^javax/servlet/"
 
 if [ -n "${allow_hadoop}" ]; then
   #   * classes in packages that start with org.apache.hadoop, which by