From 0132cbdeb24a967d41929a68fc3821cbd108b4e0 Mon Sep 17 00:00:00 2001
From: Sanne Grinovero <sanne@hibernate.org>
Date: Thu, 5 Oct 2023 13:25:56 +0100
Subject: [PATCH] Upgrade: Hibernate ORM 6.2.11.Final and Reactive 2.0.6.Final

---
 bom/application/pom.xml                                   | 4 ++--
 .../orm/deployment/HibernateLogFilterBuildStep.java       | 8 ++++++++
 .../io/quarkus/hibernate/orm/HibernateOrmTypesTest.java   | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 72fa010268d4b..a44bc6f1b2ce7 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -99,10 +99,10 @@
         <classmate.version>1.5.1</classmate.version>
         <!-- When updating, align bytebuddy.version to Hibernate needs as well (just below),
              as well as hibernate-orm.version-for-documentation in docs/pom.xml -->
-        <hibernate-orm.version>6.2.9.Final</hibernate-orm.version>
+        <hibernate-orm.version>6.2.11.Final</hibernate-orm.version>
         <bytebuddy.version>1.14.7</bytebuddy.version> <!-- Version controlled by Hibernate ORM's needs -->
         <hibernate-commons-annotations.version>6.0.6.Final</hibernate-commons-annotations.version> <!-- version controlled by Hibernate ORM -->
-        <hibernate-reactive.version>2.0.5.Final</hibernate-reactive.version>
+        <hibernate-reactive.version>2.0.6.Final</hibernate-reactive.version>
         <hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
         <!-- When updating, align hibernate-search.version-for-documentation in docs/pom.xml -->
         <hibernate-search.version>6.2.2.Final</hibernate-search.version>
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateLogFilterBuildStep.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateLogFilterBuildStep.java
index 46a3844e672b8..25d5e14f47844 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateLogFilterBuildStep.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateLogFilterBuildStep.java
@@ -32,5 +32,13 @@ void setupLogFilters(BuildProducer<LogCleanupFilterBuildItem> filters) {
                 "HHH90006001"));
         // https://hibernate.atlassian.net/browse/HHH-16546
         filters.produce(new LogCleanupFilterBuildItem("org.hibernate.tuple.entity.EntityMetamodel", "HHH000157"));
+
+        //This "deprecation" warning isn't practical for the specific Quarkus needs, as it reminds users they don't need
+        //to set the 'hibernate.dialect' property, however it's being set by Quarkus buildsteps so they can't avoid it.
+        //Ignore for now, perhaps remove it upstream however this may make sense for other Hibernate users.
+        //Wondering if we should have the Quarkus build differentiate between an explicitly set vs an inferred Dialect
+        //property (we have a custom DialectFactory already so this could be trivial), however even in this case ORM
+        //can't guess things since there is no connection, so even if we did so, this message wouldn't be applicable.
+        filters.produce(new LogCleanupFilterBuildItem("org.hibernate.orm.deprecation", "HHH90000025"));
     }
 }
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateOrmTypesTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateOrmTypesTest.java
index 992cb3d7b33a2..e1584d06f2da2 100644
--- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateOrmTypesTest.java
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateOrmTypesTest.java
@@ -90,6 +90,7 @@ private static void ignoreInternalAnnotations(Set<DotName> annotationSet) {
         annotationSet.removeIf(name -> name.toString().equals("org.hibernate.Incubating"));
         annotationSet.removeIf(name -> name.toString().equals("org.hibernate.Internal"));
         annotationSet.removeIf(name -> name.toString().equals("org.hibernate.Remove"));
+        annotationSet.removeIf(name -> name.toString().equals("org.hibernate.service.JavaServiceLoadable"));
     }
 
     @Test