diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 526c85c5710cf..fdfe6a525ee02 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -97,9 +97,11 @@ 3.12.0 1.16.0 1.5.1 - - 6.2.13.Final + + 6.3.1.Final 1.14.7 6.0.6.Final 2.0.6.Final diff --git a/docs/pom.xml b/docs/pom.xml index ab9fe672999ad..0c47702635c76 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -39,7 +39,7 @@ docker.io/jdkato/vale:v2.15.5 - 6.2 + 6.3 6.2 diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmTypes.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmTypes.java index 3b8a7f8e9e0ab..9cf8734dfa33e 100644 --- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmTypes.java +++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmTypes.java @@ -141,6 +141,7 @@ private HibernateOrmTypes() { DotName.createSimple("org.hibernate.annotations.AnyKeyJavaType"), DotName.createSimple("org.hibernate.annotations.AnyKeyJdbcType"), DotName.createSimple("org.hibernate.annotations.AnyKeyJdbcTypeCode"), + DotName.createSimple("org.hibernate.annotations.Array"), DotName.createSimple("org.hibernate.annotations.AttributeAccessor"), DotName.createSimple("org.hibernate.annotations.AttributeBinderType"), DotName.createSimple("org.hibernate.annotations.Bag"), @@ -149,6 +150,7 @@ private HibernateOrmTypes() { DotName.createSimple("org.hibernate.annotations.Cascade"), DotName.createSimple("org.hibernate.annotations.Check"), DotName.createSimple("org.hibernate.annotations.Checks"), + DotName.createSimple("org.hibernate.annotations.Collate"), DotName.createSimple("org.hibernate.annotations.CollectionId"), DotName.createSimple("org.hibernate.annotations.CollectionIdJavaType"), DotName.createSimple("org.hibernate.annotations.CollectionIdJdbcType"), @@ -190,6 +192,20 @@ private HibernateOrmTypes() { DotName.createSimple("org.hibernate.annotations.DialectOverride$OrderBy"), DotName.createSimple("org.hibernate.annotations.DialectOverride$OrderBys"), DotName.createSimple("org.hibernate.annotations.DialectOverride$OverridesAnnotation"), + DotName.createSimple("org.hibernate.annotations.DialectOverride$SQLDelete"), + DotName.createSimple("org.hibernate.annotations.DialectOverride$SQLDeleteAll"), + DotName.createSimple("org.hibernate.annotations.DialectOverride$SQLDeleteAlls"), + DotName.createSimple("org.hibernate.annotations.DialectOverride$SQLDeletes"), + DotName.createSimple("org.hibernate.annotations.DialectOverride$SQLInsert"), + DotName.createSimple("org.hibernate.annotations.DialectOverride$SQLInserts"), + DotName.createSimple("org.hibernate.annotations.DialectOverride$SQLOrder"), + DotName.createSimple("org.hibernate.annotations.DialectOverride$SQLOrders"), + DotName.createSimple("org.hibernate.annotations.DialectOverride$SQLRestriction"), + DotName.createSimple("org.hibernate.annotations.DialectOverride$SQLRestrictions"), + DotName.createSimple("org.hibernate.annotations.DialectOverride$SQLSelect"), + DotName.createSimple("org.hibernate.annotations.DialectOverride$SQLSelects"), + DotName.createSimple("org.hibernate.annotations.DialectOverride$SQLUpdate"), + DotName.createSimple("org.hibernate.annotations.DialectOverride$SQLUpdates"), DotName.createSimple("org.hibernate.annotations.DialectOverride$Version"), DotName.createSimple("org.hibernate.annotations.DialectOverride$Where"), DotName.createSimple("org.hibernate.annotations.DialectOverride$Wheres"), @@ -203,6 +219,8 @@ private HibernateOrmTypes() { DotName.createSimple("org.hibernate.annotations.Fetch"), DotName.createSimple("org.hibernate.annotations.FetchProfile"), DotName.createSimple("org.hibernate.annotations.FetchProfile$FetchOverride"), + DotName.createSimple("org.hibernate.annotations.FetchProfileOverride"), + DotName.createSimple("org.hibernate.annotations.FetchProfileOverrides"), DotName.createSimple("org.hibernate.annotations.FetchProfiles"), DotName.createSimple("org.hibernate.annotations.Filter"), DotName.createSimple("org.hibernate.annotations.FilterDef"), @@ -274,6 +292,9 @@ private HibernateOrmTypes() { DotName.createSimple("org.hibernate.annotations.SQLDeletes"), DotName.createSimple("org.hibernate.annotations.SQLInsert"), DotName.createSimple("org.hibernate.annotations.SQLInserts"), + DotName.createSimple("org.hibernate.annotations.SQLJoinTableRestriction"), + DotName.createSimple("org.hibernate.annotations.SQLOrder"), + DotName.createSimple("org.hibernate.annotations.SQLRestriction"), DotName.createSimple("org.hibernate.annotations.SQLSelect"), DotName.createSimple("org.hibernate.annotations.SQLUpdate"), DotName.createSimple("org.hibernate.annotations.SQLUpdates"), @@ -300,6 +321,7 @@ private HibernateOrmTypes() { DotName.createSimple("org.hibernate.annotations.UpdateTimestamp"), DotName.createSimple("org.hibernate.annotations.UuidGenerator"), DotName.createSimple("org.hibernate.annotations.ValueGenerationType"), + DotName.createSimple("org.hibernate.annotations.View"), DotName.createSimple("org.hibernate.annotations.Where"), DotName.createSimple("org.hibernate.annotations.WhereJoinTable")); @@ -352,5 +374,6 @@ private HibernateOrmTypes() { DotName.createSimple("java.util.Locale"), DotName.createSimple("java.util.Map$Entry"), DotName.createSimple("java.util.TimeZone"), - DotName.createSimple("java.util.UUID")); + DotName.createSimple("java.util.UUID"), + DotName.createSimple("java.lang.Void")); } diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/dev/HibernateOrmDevInfoServiceTestResource.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/dev/HibernateOrmDevInfoServiceTestResource.java index 52de3788b7fc8..77c79cc7fc0d5 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/dev/HibernateOrmDevInfoServiceTestResource.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/dev/HibernateOrmDevInfoServiceTestResource.java @@ -88,7 +88,7 @@ public String checkPuInfoWithFailingDDLGeneration() { + TypeWithUnsupportedSqlCode.UNSUPPORTED_SQL_CODE + "))"); // Drop script generation doesn't involve column types, so it didn't fail assertThat(pu.getDropDDL()) - .contains("drop table MyEntityTable if exists"); + .contains("drop table if exists MyEntityTable"); return "OK"; } diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/ProviderUtil.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/ProviderUtil.java index 357883ed67fe6..8d5b8eaf237ae 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/ProviderUtil.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/ProviderUtil.java @@ -20,6 +20,6 @@ public LoadState isLoadedWithReference(Object proxy, String property) { @Override public LoadState isLoaded(Object o) { - return PersistenceUtilHelper.isLoaded(o); + return PersistenceUtilHelper.getLoadState(o); } } diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/StatelessSessionLazyDelegator.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/StatelessSessionLazyDelegator.java index d9ccac4fec5a6..41f7ab0f52489 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/StatelessSessionLazyDelegator.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/StatelessSessionLazyDelegator.java @@ -1,15 +1,20 @@ package io.quarkus.hibernate.orm.runtime; +import java.util.List; import java.util.function.Supplier; +import jakarta.persistence.EntityGraph; import jakarta.persistence.criteria.CriteriaDelete; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.CriteriaUpdate; import org.hibernate.HibernateException; import org.hibernate.LockMode; +import org.hibernate.SessionFactory; import org.hibernate.StatelessSession; import org.hibernate.Transaction; +import org.hibernate.graph.GraphSemantic; +import org.hibernate.graph.RootGraph; import org.hibernate.jdbc.ReturningWork; import org.hibernate.jdbc.Work; import org.hibernate.procedure.ProcedureCall; @@ -349,4 +354,54 @@ public NativeQuery getNamedNativeQuery(String name) { public NativeQuery getNamedNativeQuery(String name, String resultSetMapping) { return delegate.get().getNamedNativeQuery(name, resultSetMapping); } + + @Override + public RootGraph createEntityGraph(Class rootType) { + return delegate.get().createEntityGraph(rootType); + } + + @Override + public RootGraph createEntityGraph(String graphName) { + return delegate.get().createEntityGraph(graphName); + } + + @Override + public RootGraph createEntityGraph(Class rootType, String graphName) { + return delegate.get().createEntityGraph(rootType, graphName); + } + + @Override + public RootGraph getEntityGraph(String graphName) { + return delegate.get().getEntityGraph(graphName); + } + + @Override + public List> getEntityGraphs(Class entityClass) { + return delegate.get().getEntityGraphs(entityClass); + } + + @Override + public SessionFactory getFactory() { + return delegate.get().getFactory(); + } + + @Override + public void upsert(Object entity) { + delegate.get().upsert(entity); + } + + @Override + public void upsert(String entityName, Object entity) { + delegate.get().upsert(entityName, entity); + } + + @Override + public T get(EntityGraph graph, GraphSemantic graphSemantic, Object id) { + return delegate.get().get(graph, graphSemantic, id); + } + + @Override + public T get(EntityGraph graph, GraphSemantic graphSemantic, Object id, LockMode lockMode) { + return delegate.get().get(graph, graphSemantic, id, lockMode); + } } diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/RuntimePersistenceUnitDescriptor.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/RuntimePersistenceUnitDescriptor.java index d8895698bfe27..a6845708ccf4e 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/RuntimePersistenceUnitDescriptor.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/RuntimePersistenceUnitDescriptor.java @@ -11,6 +11,7 @@ import jakarta.persistence.spi.PersistenceUnitTransactionType; import org.hibernate.bytecode.enhance.spi.EnhancementContext; +import org.hibernate.bytecode.spi.ClassTransformer; import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; import io.quarkus.runtime.annotations.RecordableConstructor; @@ -193,4 +194,10 @@ public String toString() { + ", validationMode=" + validationMode + ", sharedCachemode=" + sharedCacheMode + ", managedClassNames=" + managedClassNames + ", properties=" + properties + '}'; } + + @Override + public ClassTransformer getClassTransformer() { + // We transform classes during the build, not on bootstrap. + return null; + } } diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/customized/QuarkusJtaPlatform.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/customized/QuarkusJtaPlatform.java index 0a5a419a8ee34..44c71e5e260bd 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/customized/QuarkusJtaPlatform.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/customized/QuarkusJtaPlatform.java @@ -6,17 +6,15 @@ import jakarta.transaction.TransactionManager; import jakarta.transaction.UserTransaction; -import org.hibernate.engine.transaction.jta.platform.internal.JtaSynchronizationStrategy; +import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; import org.hibernate.engine.transaction.jta.platform.internal.TransactionManagerAccess; -import org.hibernate.engine.transaction.jta.platform.internal.TransactionManagerBasedSynchronizationStrategy; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform; +import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; public final class QuarkusJtaPlatform implements JtaPlatform, TransactionManagerAccess { public static final QuarkusJtaPlatform INSTANCE = new QuarkusJtaPlatform(); - private final JtaSynchronizationStrategy tmSynchronizationStrategy = new TransactionManagerBasedSynchronizationStrategy( - this); private volatile TransactionManager transactionManager; private volatile UserTransaction userTransaction; @@ -42,7 +40,7 @@ public TransactionManager getTransactionManager() { @Override public UserTransaction retrieveUserTransaction() { UserTransaction userTransaction = this.userTransaction; - if (this.userTransaction == null) { + if (userTransaction == null) { userTransaction = com.arjuna.ats.jta.UserTransaction.userTransaction(); this.userTransaction = userTransaction; } @@ -56,12 +54,16 @@ public Object getTransactionIdentifier(final Transaction transaction) { @Override public void registerSynchronization(Synchronization synchronization) { - this.tmSynchronizationStrategy.registerSynchronization(synchronization); + try { + getTransactionManager().getTransaction().registerSynchronization(synchronization); + } catch (Exception e) { + throw new JtaPlatformException("Could not access JTA Transaction to register synchronization", e); + } } @Override public boolean canRegisterSynchronization() { - return this.tmSynchronizationStrategy.canRegisterSynchronization(); + return JtaStatusHelper.isActive(QuarkusJtaPlatform.this.getTransactionManager()); } @Override diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/observers/SessionFactoryObserverForNamedQueryValidation.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/observers/SessionFactoryObserverForNamedQueryValidation.java index 2ba26bd5f14c6..129ce3126c14d 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/observers/SessionFactoryObserverForNamedQueryValidation.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/observers/SessionFactoryObserverForNamedQueryValidation.java @@ -22,7 +22,7 @@ public SessionFactoryObserverForNamedQueryValidation(MetadataImplementor metadat public void sessionFactoryCreated(SessionFactory factory) { SessionFactoryImplementor sessionFactory = (SessionFactoryImplementor) factory; final QueryEngine queryEngine = sessionFactory.getQueryEngine(); - queryEngine.prepare(sessionFactory, metadata); + queryEngine.getNamedObjectRepository().prepare(sessionFactory, metadata); if (sessionFactory.getSessionFactoryOptions().isNamedQueryStartupCheckingEnabled()) { queryEngine.validateNamedQueries(); } diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/recording/RecordableBootstrap.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/recording/RecordableBootstrap.java index 589018fa48c79..63bf1af0762fd 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/recording/RecordableBootstrap.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/recording/RecordableBootstrap.java @@ -216,7 +216,7 @@ public StandardServiceRegistry build() { settingsCopy.putAll(settings); settingsCopy.put(org.hibernate.boot.cfgxml.spi.CfgXmlAccessService.LOADED_CONFIG_KEY, aggregatedCfgXml); - return new StandardServiceRegistryImpl(autoCloseRegistry, bootstrapServiceRegistry, initiators, + return StandardServiceRegistryImpl.create(autoCloseRegistry, bootstrapServiceRegistry, initiators, providedServices, settingsCopy); } diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedSession.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedSession.java index 93155248f8f71..d526ce46b059e 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedSession.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedSession.java @@ -1386,4 +1386,44 @@ public void close() { } } } + + @Override + public RootGraph createEntityGraph(Class rootType, String graphName) { + try (SessionResult emr = acquireSession()) { + return emr.session.createEntityGraph(rootType, graphName); + } + } + + @Override + public SessionFactory getFactory() { + return sessionFactory; + } + + @Override + public int getFetchBatchSize() { + try (SessionResult emr = acquireSession()) { + return emr.session.getFetchBatchSize(); + } + } + + @Override + public void setFetchBatchSize(int batchSize) { + try (SessionResult emr = acquireSession()) { + emr.session.setFetchBatchSize(batchSize); + } + } + + @Override + public boolean isSubselectFetchingEnabled() { + try (SessionResult emr = acquireSession()) { + return emr.session.isSubselectFetchingEnabled(); + } + } + + @Override + public void setSubselectFetchingEnabled(boolean enabled) { + try (SessionResult emr = acquireSession()) { + emr.session.setSubselectFetchingEnabled(enabled); + } + } } diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedStatelessSession.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedStatelessSession.java index 00ba865a6f07e..7ae85355ffeb8 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedStatelessSession.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedStatelessSession.java @@ -1,7 +1,10 @@ package io.quarkus.hibernate.orm.runtime.session; +import java.util.List; + import jakarta.enterprise.context.ContextNotActiveException; import jakarta.enterprise.inject.Instance; +import jakarta.persistence.EntityGraph; import jakarta.persistence.TransactionRequiredException; import jakarta.persistence.criteria.CriteriaDelete; import jakarta.persistence.criteria.CriteriaQuery; @@ -15,6 +18,8 @@ import org.hibernate.SessionFactory; import org.hibernate.StatelessSession; import org.hibernate.Transaction; +import org.hibernate.graph.GraphSemantic; +import org.hibernate.graph.RootGraph; import org.hibernate.jdbc.ReturningWork; import org.hibernate.jdbc.Work; import org.hibernate.procedure.ProcedureCall; @@ -624,4 +629,84 @@ public void close() { } } } + + @Override + public RootGraph createEntityGraph(Class rootType) { + checkBlocking(); + try (SessionResult emr = acquireSession()) { + return emr.statelessSession.createEntityGraph(rootType); + } + } + + @Override + public RootGraph createEntityGraph(String graphName) { + checkBlocking(); + try (SessionResult emr = acquireSession()) { + return emr.statelessSession.createEntityGraph(graphName); + } + } + + @Override + public RootGraph createEntityGraph(Class rootType, String graphName) { + checkBlocking(); + try (SessionResult emr = acquireSession()) { + return emr.statelessSession.createEntityGraph(rootType, graphName); + } + } + + @Override + public RootGraph getEntityGraph(String graphName) { + checkBlocking(); + try (SessionResult emr = acquireSession()) { + return emr.statelessSession.getEntityGraph(graphName); + } + } + + @Override + public List> getEntityGraphs(Class entityClass) { + checkBlocking(); + try (SessionResult emr = acquireSession()) { + return emr.statelessSession.getEntityGraphs(entityClass); + } + } + + @Override + public SessionFactory getFactory() { + checkBlocking(); + try (SessionResult emr = acquireSession()) { + return emr.statelessSession.getFactory(); + } + } + + @Override + public void upsert(Object entity) { + checkBlocking(); + try (SessionResult emr = acquireSession()) { + emr.statelessSession.upsert(entity); + } + } + + @Override + public void upsert(String entityName, Object entity) { + checkBlocking(); + try (SessionResult emr = acquireSession()) { + emr.statelessSession.upsert(entityName, entity); + } + } + + @Override + public T get(EntityGraph graph, GraphSemantic graphSemantic, Object id) { + checkBlocking(); + try (SessionResult emr = acquireSession()) { + return emr.statelessSession.get(graph, graphSemantic, id); + } + } + + @Override + public T get(EntityGraph graph, GraphSemantic graphSemantic, Object id, LockMode lockMode) { + checkBlocking(); + try (SessionResult emr = acquireSession()) { + return emr.statelessSession.get(graph, graphSemantic, id, lockMode); + } + } } diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml b/extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml index 46b1e19bde994..75c05bc707704 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml +++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml @@ -78,17 +78,12 @@ org.hibernate.orm hibernate-jpamodelgen provided - - - - javax.xml.bind - jaxb-api - - - javax.activation - javax.activation-api - - + + + + org.antlr + antlr4-runtime + provided diff --git a/extensions/panache/hibernate-orm-panache/runtime/pom.xml b/extensions/panache/hibernate-orm-panache/runtime/pom.xml index 2520949da5759..b69c541d5d39a 100644 --- a/extensions/panache/hibernate-orm-panache/runtime/pom.xml +++ b/extensions/panache/hibernate-orm-panache/runtime/pom.xml @@ -53,17 +53,12 @@ org.hibernate.orm hibernate-jpamodelgen provided - - - - javax.xml.bind - jaxb-api - - - javax.activation - javax.activation-api - - + + + + org.antlr + antlr4-runtime + provided diff --git a/extensions/panache/hibernate-reactive-panache-kotlin/runtime/pom.xml b/extensions/panache/hibernate-reactive-panache-kotlin/runtime/pom.xml index 759631b16e091..338f88fd06799 100644 --- a/extensions/panache/hibernate-reactive-panache-kotlin/runtime/pom.xml +++ b/extensions/panache/hibernate-reactive-panache-kotlin/runtime/pom.xml @@ -73,21 +73,12 @@ org.hibernate.orm hibernate-jpamodelgen provided - - - - jakarta.xml.bind - jakarta.xml.bind-api - - - javax.xml.bind - jaxb-api - - - javax.activation - javax.activation-api - - + + + + org.antlr + antlr4-runtime + provided io.quarkus diff --git a/extensions/panache/hibernate-reactive-panache/runtime/pom.xml b/extensions/panache/hibernate-reactive-panache/runtime/pom.xml index 2071edb9247e8..8d1e8551e59f2 100644 --- a/extensions/panache/hibernate-reactive-panache/runtime/pom.xml +++ b/extensions/panache/hibernate-reactive-panache/runtime/pom.xml @@ -57,21 +57,12 @@ org.hibernate.orm hibernate-jpamodelgen provided - - - - jakarta.xml.bind - jakarta.xml.bind-api - - - javax.xml.bind - jaxb-api - - - javax.activation - javax.activation-api - - + + + + org.antlr + antlr4-runtime + provided diff --git a/integration-tests/main/pom.xml b/integration-tests/main/pom.xml index 0086d9f353c81..ad14c0fceb17b 100644 --- a/integration-tests/main/pom.xml +++ b/integration-tests/main/pom.xml @@ -538,7 +538,7 @@ hibernate_orm_test hibernate_orm_test - org.hibernate.dialect.PostgreSQL10Dialect + org.hibernate.dialect.PostgreSQLDialect