Skip to content

Commit eeba63a

Browse files
committed
HSEARCH-4987 Upgrade to Hibernate ORM 6.2.11.Final
1 parent 64b2c0e commit eeba63a

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@
261261
<version.net.bytebuddy>${version.net.bytebuddy.orm6}</version.net.bytebuddy>
262262

263263
<!-- >>> ORM 6 with Jakarta Persistence -->
264-
<version.org.hibernate.orm>6.2.9.Final</version.org.hibernate.orm>
264+
<version.org.hibernate.orm>6.2.11.Final</version.org.hibernate.orm>
265265
<javadoc.org.hibernate.orm.url>https://docs.jboss.org/hibernate/orm/${parsed-version.org.hibernate.orm.majorVersion}.${parsed-version.org.hibernate.orm.minorVersion}/javadocs/</javadoc.org.hibernate.orm.url>
266266
<documentation.org.hibernate.orm.url>https://docs.jboss.org/hibernate/orm/${parsed-version.org.hibernate.orm.majorVersion}.${parsed-version.org.hibernate.orm.minorVersion}/userguide/html_single/Hibernate_User_Guide.html</documentation.org.hibernate.orm.url>
267267
<!-- These version must be kept in sync with the version of the dependency in Hibernate ORM 6.

util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/multitenancy/impl/MultitenancyTestHelper.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
import static org.junit.Assume.assumeTrue;
1010

1111
import org.hibernate.cfg.AvailableSettings;
12-
import org.hibernate.dialect.Dialect;
1312
import org.hibernate.dialect.H2Dialect;
1413
import org.hibernate.search.util.impl.integrationtest.mapper.orm.SimpleSessionFactoryBuilder;
1514

15+
import org.hibernate.testing.orm.junit.DialectContext;
16+
1617
/**
1718
* Utility to help setting up a test SessionFactory which uses multi-tenancy based
1819
* on multiple databases.
@@ -34,6 +35,9 @@ private MultitenancyTestHelper(String[] tenantIds) {
3435
}
3536

3637
private void attachTo(SimpleSessionFactoryBuilder builder) {
38+
assumeTrue( "This test relies on multi-tenancy, which can currently only be set up with H2",
39+
DialectContext.getDialect() instanceof H2Dialect );
40+
3741
// Force our own schema management tool which creates the schema for all tenants.
3842
builder.onServiceRegistryBuilder( srb -> srb.addInitiator(
3943
new MultitenancyTestHelperSchemaManagementTool.Initiator( tenantIds ) ) );
@@ -42,12 +46,6 @@ private void attachTo(SimpleSessionFactoryBuilder builder) {
4246
new H2LazyMultiTenantConnectionProvider( tenantIds ) );
4347
// any required backend-multi-tenancy property (e.g.:*.backend.multi_tenancy.strategy = discriminator)
4448
// should be set by the client test
45-
46-
builder.onMetadata( metadataImplementor -> {
47-
Dialect dialect = metadataImplementor.getDatabase().getDialect();
48-
assumeTrue( "This test relies on multi-tenancy, which can currently only be set up with H2",
49-
dialect instanceof H2Dialect );
50-
} );
5149
}
5250

5351
}

0 commit comments

Comments
 (0)