Skip to content

Commit f8bab2f

Browse files
authored
Merge pull request quarkusio#36311 from Sanne/ORM6.2.10
Upgrade: Hibernate ORM 6.2.11.Final and Reactive 2.0.6.Final
2 parents 5ff3aa5 + 0132cbd commit f8bab2f

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

bom/application/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@
9999
<classmate.version>1.5.1</classmate.version>
100100
<!-- When updating, align bytebuddy.version to Hibernate needs as well (just below),
101101
as well as hibernate-orm.version-for-documentation in docs/pom.xml -->
102-
<hibernate-orm.version>6.2.9.Final</hibernate-orm.version>
102+
<hibernate-orm.version>6.2.11.Final</hibernate-orm.version>
103103
<bytebuddy.version>1.14.7</bytebuddy.version> <!-- Version controlled by Hibernate ORM's needs -->
104104
<hibernate-commons-annotations.version>6.0.6.Final</hibernate-commons-annotations.version> <!-- version controlled by Hibernate ORM -->
105-
<hibernate-reactive.version>2.0.5.Final</hibernate-reactive.version>
105+
<hibernate-reactive.version>2.0.6.Final</hibernate-reactive.version>
106106
<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
107107
<!-- When updating, align hibernate-search.version-for-documentation in docs/pom.xml -->
108108
<hibernate-search.version>6.2.2.Final</hibernate-search.version>

extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateLogFilterBuildStep.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,13 @@ void setupLogFilters(BuildProducer<LogCleanupFilterBuildItem> filters) {
3232
"HHH90006001"));
3333
// https://hibernate.atlassian.net/browse/HHH-16546
3434
filters.produce(new LogCleanupFilterBuildItem("org.hibernate.tuple.entity.EntityMetamodel", "HHH000157"));
35+
36+
//This "deprecation" warning isn't practical for the specific Quarkus needs, as it reminds users they don't need
37+
//to set the 'hibernate.dialect' property, however it's being set by Quarkus buildsteps so they can't avoid it.
38+
//Ignore for now, perhaps remove it upstream however this may make sense for other Hibernate users.
39+
//Wondering if we should have the Quarkus build differentiate between an explicitly set vs an inferred Dialect
40+
//property (we have a custom DialectFactory already so this could be trivial), however even in this case ORM
41+
//can't guess things since there is no connection, so even if we did so, this message wouldn't be applicable.
42+
filters.produce(new LogCleanupFilterBuildItem("org.hibernate.orm.deprecation", "HHH90000025"));
3543
}
3644
}

extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateOrmTypesTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ private static void ignoreInternalAnnotations(Set<DotName> annotationSet) {
9090
annotationSet.removeIf(name -> name.toString().equals("org.hibernate.Incubating"));
9191
annotationSet.removeIf(name -> name.toString().equals("org.hibernate.Internal"));
9292
annotationSet.removeIf(name -> name.toString().equals("org.hibernate.Remove"));
93+
annotationSet.removeIf(name -> name.toString().equals("org.hibernate.service.JavaServiceLoadable"));
9394
}
9495

9596
@Test

0 commit comments

Comments
 (0)