Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Hibernate ORM 6.2.1.Final #32687

Merged
merged 1 commit into from
Apr 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion bom/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
<commons-lang3.version>3.12.0</commons-lang3.version>
<commons-codec.version>1.15</commons-codec.version>
<classmate.version>1.5.1</classmate.version>
<hibernate-orm.version>6.2.0.Final</hibernate-orm.version> <!-- When updating, align bytebuddy.version to Hibernate needs as well (just below): -->
<hibernate-orm.version>6.2.1.Final</hibernate-orm.version> <!-- When updating, align bytebuddy.version to Hibernate needs as well (just below): -->
<bytebuddy.version>1.12.18</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.0.Beta2</hibernate-reactive.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.hibernate.engine.jdbc.cursor.internal.RefCursorSupportInitiator;
import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator;
import org.hibernate.engine.jdbc.internal.JdbcServicesInitiator;
import org.hibernate.engine.jdbc.internal.SqlStatementLoggerInitiator;
import org.hibernate.event.internal.EntityCopyObserverFactoryInitiator;
import org.hibernate.integrator.spi.Integrator;
import org.hibernate.persister.internal.PersisterClassResolverInitiator;
Expand Down Expand Up @@ -234,6 +235,9 @@ private static List<StandardServiceInitiator<?>> buildQuarkusServiceInitiatorLis
// Default implementation
serviceInitiators.add(ParameterMarkerStrategyInitiator.INSTANCE);

// Default implementation
serviceInitiators.add(SqlStatementLoggerInitiator.INSTANCE);

serviceInitiators.trimToSize();
return serviceInitiators;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.hibernate.engine.jdbc.dialect.internal.DialectResolverInitiator;
import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator;
import org.hibernate.engine.jdbc.internal.JdbcServicesInitiator;
import org.hibernate.engine.jdbc.internal.SqlStatementLoggerInitiator;
import org.hibernate.event.internal.EntityCopyObserverFactoryInitiator;
import org.hibernate.persister.internal.PersisterClassResolverInitiator;
import org.hibernate.persister.internal.PersisterFactoryInitiator;
Expand All @@ -34,7 +35,8 @@
* Hibernate ORM when running on Quarkus.
* WARNING: this is a customized list: we started from a copy of ORM's standard
* list, then changes have evolved.
* Also: Hibernate Reactive uses a different list.
* Also: Hibernate Reactive uses a different list, and there's an additional definition of
* services in PreconfiguredServiceRegistryBuilder.
*/
public final class StandardHibernateORMInitiatorListProvider implements InitialInitiatorListProvider {

Expand Down Expand Up @@ -104,6 +106,9 @@ public List<StandardServiceInitiator<?>> initialInitiatorList() {
// Default implementation
serviceInitiators.add(ParameterMarkerStrategyInitiator.INSTANCE);

// Default implementation
serviceInitiators.add(SqlStatementLoggerInitiator.INSTANCE);

serviceInitiators.trimToSize();

return serviceInitiators;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.hibernate.engine.jdbc.connections.internal.MultiTenantConnectionProviderInitiator;
import org.hibernate.engine.jdbc.cursor.internal.RefCursorSupportInitiator;
import org.hibernate.engine.jdbc.internal.JdbcServicesInitiator;
import org.hibernate.engine.jdbc.internal.SqlStatementLoggerInitiator;
import org.hibernate.event.internal.EntityCopyObserverFactoryInitiator;
import org.hibernate.integrator.spi.Integrator;
import org.hibernate.persister.internal.PersisterFactoryInitiator;
Expand Down Expand Up @@ -241,6 +242,9 @@ private static List<StandardServiceInitiator<?>> buildQuarkusServiceInitiatorLis
// Custom for Hibernate Reactive: ParameterMarkerStrategy
serviceInitiators.add(NativeParametersHandling.INSTANCE);

// Default implementation
serviceInitiators.add(SqlStatementLoggerInitiator.INSTANCE);

serviceInitiators.trimToSize();
return serviceInitiators;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.hibernate.engine.jdbc.dialect.internal.DialectResolverInitiator;
import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator;
import org.hibernate.engine.jdbc.internal.JdbcServicesInitiator;
import org.hibernate.engine.jdbc.internal.SqlStatementLoggerInitiator;
import org.hibernate.event.internal.EntityCopyObserverFactoryInitiator;
import org.hibernate.persister.internal.PersisterFactoryInitiator;
import org.hibernate.property.access.internal.PropertyAccessStrategyResolverInitiator;
Expand Down Expand Up @@ -123,6 +124,9 @@ public List<StandardServiceInitiator<?>> initialInitiatorList() {
// Custom for Hibernate Reactive: ParameterMarkerStrategy
serviceInitiators.add(NativeParametersHandling.INSTANCE);

// Default implementation
serviceInitiators.add(SqlStatementLoggerInitiator.INSTANCE);

serviceInitiators.trimToSize();
return serviceInitiators;
}
Expand Down