Skip to content

Commit 1ee41b9

Browse files
authored
Merge pull request quarkusio#51055 from yrodiere/orm-7-1-8
Upgrade from Hibernate ORM 7.1.6.Final to 7.1.10.Final and from Hibernate Reactive 3.1.8.Final to 3.1.9.Final
2 parents 3f428b9 + fae5575 commit 1ee41b9

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@
6363
import org.jboss.logging.Logger;
6464
import org.jboss.logmanager.Level;
6565

66+
import com.fasterxml.jackson.databind.Module;
67+
6668
import io.quarkus.agroal.spi.JdbcDataSourceBuildItem;
6769
import io.quarkus.agroal.spi.JdbcDataSourceSchemaReadyBuildItem;
6870
import io.quarkus.arc.deployment.BeanContainerBuildItem;
@@ -320,6 +322,19 @@ public ImpliedBlockingPersistenceUnitTypeBuildItem defineTypeOfImpliedPU(
320322
}
321323
}
322324

325+
@BuildStep
326+
public void allowJacksonModuleDiscovery(Capabilities capabilities,
327+
List<PersistenceUnitDescriptorBuildItem> persistenceUnits,
328+
BuildProducer<ServiceProviderBuildItem> serviceProviders) {
329+
if (capabilities.isMissing(Capability.JACKSON) || persistenceUnits.isEmpty()) {
330+
// We won't be using Hibernate's default FormatMapper relying on Jackson for sure
331+
return;
332+
}
333+
// Hibernate's default FormatMapper relying on Jackson requires
334+
// service loading to discover modules in the classpath.
335+
serviceProviders.produce(ServiceProviderBuildItem.allProvidersFromClassPath(Module.class.getName()));
336+
}
337+
323338
@BuildStep
324339
@Record(RUNTIME_INIT)
325340
public void configurationDescriptorBuilding(

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@
7171
<jacoco.version>0.8.14</jacoco.version>
7272
<kubernetes-client.version>7.4.0</kubernetes-client.version> <!-- Please check with Java Operator SDK team before updating -->
7373
<rest-assured.version>5.5.6</rest-assured.version>
74-
<hibernate-orm.version>7.1.6.Final</hibernate-orm.version> <!-- WARNING when updating, also align the versions below -->
74+
<hibernate-orm.version>7.1.10.Final</hibernate-orm.version> <!-- WARNING when updating, also align the versions below -->
7575
<jakarta.persistence-api.version>3.2.0</jakarta.persistence-api.version> <!-- version controlled by Hibernate ORM's needs -->
7676
<antlr.version>4.13.2</antlr.version> <!-- version controlled by Hibernate ORM's needs -->
7777
<bytebuddy.version>1.17.6</bytebuddy.version> <!-- version controlled by Hibernate ORM's needs -->
7878
<hibernate-models.version>1.0.1</hibernate-models.version> <!-- version controlled by Hibernate ORM's needs -->
79-
<hibernate-reactive.version>3.1.8.Final</hibernate-reactive.version> <!-- highly sensitive to Hibernate ORM upgrades -->
79+
<hibernate-reactive.version>3.1.9.Final</hibernate-reactive.version> <!-- highly sensitive to Hibernate ORM upgrades -->
8080
<hibernate-validator.version>9.1.0.Final</hibernate-validator.version>
8181
<hibernate-search.version>8.1.2.Final</hibernate-search.version>
8282
<hibernate-tools.version>7.1.6.Final</hibernate-tools.version>

0 commit comments

Comments
 (0)