(gravitino) branch branch-1.3 updated: [Cherry-pick to branch-1.3] [#11350] improvement(deps): Upgrade h2 database to 2.2.224 (#11351) (#11450)

[yuqi4733]

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

yuqi1129 pushed a commit to branch branch-1.3
in repository https://gitbox.apache.org/repos/asf/gravitino.git


The following commit(s) were added to refs/heads/branch-1.3 by this push:
     new 4495c6ebf5 [Cherry-pick to branch-1.3] [#11350] improvement(deps): 
Upgrade h2 database to 2.2.224 (#11351) (#11450)
4495c6ebf5 is described below

commit 4495c6ebf50ab030ed60ae1f222d53b69c376444
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Jun 5 16:24:49 2026 +0800

    [Cherry-pick to branch-1.3] [#11350] improvement(deps): Upgrade h2 database 
to 2.2.224 (#11351) (#11450)
    
    **Cherry-pick Information:**
    - Original commit: d8e65d749fe3ee31562e204d70a29378525b4ad8
    - Target branch: `branch-1.3`
    - Status: ✅ Clean cherry-pick (no conflicts)
    
    Co-authored-by: geyanggang <geyangg...@qq.com>
---
 .../mapper/provider/base/TagMetadataObjectRelBaseSQLProvider.java     | 4 ++--
 gradle/libs.versions.toml                                             | 2 +-
 maintenance/jobs/build.gradle.kts                                     | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/base/TagMetadataObjectRelBaseSQLProvider.java
 
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/base/TagMetadataObjectRelBaseSQLProvider.java
index ebfd6f734e..ed6aca6f11 100644
--- 
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/base/TagMetadataObjectRelBaseSQLProvider.java
+++ 
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/base/TagMetadataObjectRelBaseSQLProvider.java
@@ -83,9 +83,9 @@ public class TagMetadataObjectRelBaseSQLProvider {
         + TagMetadataObjectRelMapper.TAG_METADATA_OBJECT_RELATION_TABLE_NAME
         + " te JOIN "
         + TagMetaMapper.TAG_TABLE_NAME
-        + " tm JOIN "
+        + " tm ON te.tag_id = tm.tag_id JOIN "
         + MetalakeMetaMapper.TABLE_NAME
-        + " mm ON te.tag_id = tm.tag_id AND tm.metalake_id = mm.metalake_id"
+        + " mm ON tm.metalake_id = mm.metalake_id"
         + " WHERE mm.metalake_name = #{metalakeName} AND tm.tag_name = 
#{tagName}"
         + " AND te.deleted_at = 0 AND tm.deleted_at = 0 AND mm.deleted_at = 0";
   }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a28060485e..233da7623d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -96,7 +96,7 @@ immutables-value = "2.11.7"
 selenium = "4.33.0"
 rauschig = "1.2.0"
 mybatis = "3.5.6"
-h2db = "1.4.200"
+h2db = "2.2.224"
 kafka = "3.4.0"
 curator = "2.12.0"
 awaitility = "4.2.1"
diff --git a/maintenance/jobs/build.gradle.kts 
b/maintenance/jobs/build.gradle.kts
index 203494f128..5d44c3f637 100644
--- a/maintenance/jobs/build.gradle.kts
+++ b/maintenance/jobs/build.gradle.kts
@@ -91,6 +91,9 @@ tasks.withType(ShadowJar::class.java) {
   archiveClassifier.set("")
   mergeServiceFiles()
 
+  // Exclude Java 21 multi-release classes to avoid ASM compatibility issues 
with shadow plugin
+  exclude("META-INF/versions/21/**")
+
   dependencies {
     relocate("com.google", "org.apache.gravitino.shaded.com.google")
     relocate("org.apache.commons", 
"org.apache.gravitino.shaded.org.apache.commons")