(tomee) branch main updated: Bump version.hibernate.orm from 6.4.3.Final to 7.1.10.Final (#2299)

[rzo1]

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

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/main by this push:
     new b96860b8d4 Bump version.hibernate.orm from 6.4.3.Final to 7.1.10.Final 
(#2299)
b96860b8d4 is described below

commit b96860b8d405dd092e42370461aef07e9da06755
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Wed Dec 3 21:19:45 2025 +0100

    Bump version.hibernate.orm from 6.4.3.Final to 7.1.10.Final (#2299)
    
    * Bump version.hibernate.orm from 6.4.3.Final to 7.1.10.Final
    
    Bumps `version.hibernate.orm` from 6.4.3.Final to 7.1.10.Final.
    
    Updates `org.hibernate.orm:hibernate-core` from 6.4.3.Final to 7.1.10.Final
    - [Release notes](https://github.com/hibernate/hibernate-orm/releases)
    - 
[Changelog](https://github.com/hibernate/hibernate-orm/blob/7.1.10/changelog.txt)
    - 
[Commits](https://github.com/hibernate/hibernate-orm/compare/6.4.3...7.1.10)
    
    Updates `org.hibernate.orm:hibernate-jcache` from 6.4.3.Final to 
7.1.10.Final
    - [Release notes](https://github.com/hibernate/hibernate-orm/releases)
    - 
[Changelog](https://github.com/hibernate/hibernate-orm/blob/7.1.10/changelog.txt)
    - 
[Commits](https://github.com/hibernate/hibernate-orm/compare/6.4.3...7.1.10)
    
    ---
    updated-dependencies:
    - dependency-name: org.hibernate.orm:hibernate-core
      dependency-version: 7.1.10.Final
      dependency-type: direct:production
      update-type: version-update:semver-major
    - dependency-name: org.hibernate.orm:hibernate-jcache
      dependency-version: 7.1.10.Final
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <supp...@github.com>
    
    * Fix removed naming strategy in hibernate 7
    
    ---------
    
    Signed-off-by: dependabot[bot] <supp...@github.com>
    Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
    Co-authored-by: Richard Zowalla <r...@apache.org>
---
 .../hibernate/PrefixNamingStrategy.java            | 49 ++++++++++++++++------
 pom.xml                                            |  2 +-
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git 
a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/hibernate/PrefixNamingStrategy.java
 
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/hibernate/PrefixNamingStrategy.java
index 34fe23c8a1..b3643462b6 100644
--- 
a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/hibernate/PrefixNamingStrategy.java
+++ 
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/hibernate/PrefixNamingStrategy.java
@@ -17,23 +17,15 @@
 package org.apache.openejb.jpa.integration.hibernate;
 
 import org.apache.openejb.jpa.integration.JPAThreadContext;
-import org.hibernate.cfg.ImprovedNamingStrategy;
+import org.hibernate.boot.model.naming.Identifier;
+import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
 
 import java.util.Properties;
 
-public class PrefixNamingStrategy extends ImprovedNamingStrategy {
+public class PrefixNamingStrategy implements PhysicalNamingStrategy {
     private String prefix;
 
-    @Override
-    public String tableName(final String tableName) {
-        return getPrefix() + super.tableName(tableName);
-    }
-
-    @Override
-    public String classToTableName(final String className) {
-        return getPrefix() + super.classToTableName(className);
-    }
-
     public String getPrefix() {
         if (prefix == null) {
             if (JPAThreadContext.infos.containsKey("properties")) {
@@ -45,4 +37,37 @@ public class PrefixNamingStrategy extends 
ImprovedNamingStrategy {
         }
         return prefix;
     }
+
+    private Identifier addPrefix(Identifier name, JdbcEnvironment context) {
+        if (name == null) {
+            return null;
+        }
+        return Identifier.toIdentifier(getPrefix() + name.getText());
+    }
+
+    @Override
+    public Identifier toPhysicalCatalogName(Identifier identifier, 
JdbcEnvironment jdbcEnvironment) {
+        return identifier;
+    }
+
+    @Override
+    public Identifier toPhysicalSchemaName(Identifier identifier, 
JdbcEnvironment jdbcEnvironment) {
+        return identifier;
+    }
+
+    @Override
+    public Identifier toPhysicalTableName(Identifier name, JdbcEnvironment 
context) {
+        return addPrefix(name, context);
+    }
+
+    @Override
+    public Identifier toPhysicalSequenceName(Identifier identifier, 
JdbcEnvironment jdbcEnvironment) {
+        return identifier;
+    }
+
+    @Override
+    public Identifier toPhysicalColumnName(Identifier identifier, 
JdbcEnvironment jdbcEnvironment) {
+        return identifier;
+    }
+
 }
diff --git a/pom.xml b/pom.xml
index 2c2c4379ef..b0b90494a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -226,7 +226,7 @@
     <!-- org.glassfish -->
     <version.mojarra>4.0.12</version.mojarra>
     <!-- org.hibernate -->
-    <version.hibernate.orm>6.4.3.Final</version.hibernate.orm>
+    <version.hibernate.orm>7.1.11.Final</version.hibernate.orm>
     <version.hibernate.validator>9.1.0.Final</version.hibernate.validator>
 
     <!-- Other API and Impl. not in Jakarta EE -->