Skip to content

Commit b8bb119

Browse files
marko-bekhtamarko-bekhta
committed
HSEARCH-5649 Update to Hibernate ORM 8.0.0.Beta1
1 parent 89f7a55 commit b8bb119

43 files changed

Lines changed: 587 additions & 208 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎bom/platform-common/pom.xml‎

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@
1818
<deploy.skip>true</deploy.skip>
1919

2020
<!-- These versions will be checked against the ones resolved by Maven for the project in the enforcer rule -->
21-
<version.bom.org.hibernate.orm>7.4.1.Final</version.bom.org.hibernate.orm>
21+
<version.bom.org.hibernate.orm>8.0.0.Beta1</version.bom.org.hibernate.orm>
2222
<version.bom.org.elasticsearch.client>9.4.2</version.bom.org.elasticsearch.client>
2323
<version.bom.org.elasticsearch.java.client>9.4.2</version.bom.org.elasticsearch.java.client>
2424
<version.bom.org.opensearch.client>3.7.0</version.bom.org.opensearch.client>
2525
<version.bom.software.amazon.awssdk>2.46.2</version.bom.software.amazon.awssdk>
26-
<version.bom.io.smallrye>3.3.2</version.bom.io.smallrye>
26+
<version.bom.io.smallrye>3.6.0</version.bom.io.smallrye>
2727
<version.bom.org.jboss.logging.processor>3.0.4.Final</version.bom.org.jboss.logging.processor>
2828
<version.bom.org.jboss.logging>3.6.3.Final</version.bom.org.jboss.logging>
29-
<version.bom.org.hibernate.models>1.1.1</version.bom.org.hibernate.models>
29+
<version.bom.org.hibernate.models>1.2.0</version.bom.org.hibernate.models>
3030
<version.bom.org.apache.avro>1.12.1</version.bom.org.apache.avro>
3131
<version.bom.com.carrotsearch>0.10.0</version.bom.com.carrotsearch>
3232
<version.bom.com.google.code.gson>2.14.0</version.bom.com.google.code.gson>
3333
<version.bom.jakarta.batch>2.1.1</version.bom.jakarta.batch>
3434
<version.bom.jakarta.enterprise>4.1.0</version.bom.jakarta.enterprise>
3535
<version.bom.jakarta.inject>2.0.1</version.bom.jakarta.inject>
36-
<version.bom.jakarta.persistence>3.2.0</version.bom.jakarta.persistence>
36+
<version.bom.jakarta.persistence>4.0.0-M5</version.bom.jakarta.persistence>
3737
<version.bom.jakarta.transaction>2.0.1</version.bom.jakarta.transaction>
38-
<version.bom.jakarta.xml.bind>4.0.4</version.bom.jakarta.xml.bind>
38+
<version.bom.jakarta.xml.bind>4.0.5</version.bom.jakarta.xml.bind>
3939
<version.bom.org.jberet>3.1.0.Final</version.bom.org.jberet>
4040
<version.bom.com.fasterxml.jackson>2.21.4</version.bom.com.fasterxml.jackson>
4141
<version.bom.org.apache.httpcomponents.client5>5.6.1</version.bom.org.apache.httpcomponents.client5>
@@ -244,6 +244,11 @@
244244
<artifactId>hibernate-reveng</artifactId>
245245
<version>${version.bom.org.hibernate.orm}</version>
246246
</dependency>
247+
<dependency>
248+
<groupId>org.hibernate.orm</groupId>
249+
<artifactId>hibernate-ucp</artifactId>
250+
<version>${version.bom.org.hibernate.orm}</version>
251+
</dependency>
247252

248253
<!-- Elasticsearch -->
249254
<dependency>
@@ -983,6 +988,26 @@
983988
<artifactId>jakarta.inject-tck</artifactId>
984989
<version>${version.bom.jakarta.inject}</version>
985990
</dependency>
991+
<dependency>
992+
<groupId>jakarta.persistence</groupId>
993+
<artifactId>persistence-tck-common</artifactId>
994+
<version>${version.bom.jakarta.persistence}</version>
995+
</dependency>
996+
<dependency>
997+
<groupId>jakarta.persistence</groupId>
998+
<artifactId>persistence-tck-dbprocedures</artifactId>
999+
<version>${version.bom.jakarta.persistence}</version>
1000+
</dependency>
1001+
<dependency>
1002+
<groupId>jakarta.persistence</groupId>
1003+
<artifactId>persistence-tck-dist</artifactId>
1004+
<version>${version.bom.jakarta.persistence}</version>
1005+
</dependency>
1006+
<dependency>
1007+
<groupId>jakarta.persistence</groupId>
1008+
<artifactId>persistence-tck-spec-tests</artifactId>
1009+
<version>${version.bom.jakarta.persistence}</version>
1010+
</dependency>
9861011
<dependency>
9871012
<groupId>jakarta.xml.bind</groupId>
9881013
<artifactId>jakarta.xml.bind-api-parent</artifactId>

‎build/config/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@
227227
<argument>^org\.hibernate\.query\.MutationQuery$</argument>
228228
<argument>^org\.hibernate\.query\.BindableType$</argument>
229229
<argument>^org\.hibernate\.query\.BindingContext$</argument>
230+
<argument>^org\.hibernate\.query\.spi\.QueryImplementor$</argument>
230231

231232
<argument>^org\.hibernate\.dialect\.lock\.spi\.LockingSupport$</argument>
232233

‎build/parents/build/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
NOTE: when Hibernate ORM updates Byte Buddy, make sure to check Jenkinsfile to see if
103103
`net.bytebuddy.experimental` property can be removed.
104104
-->
105-
<version.org.hibernate.orm>7.4.1.Final</version.org.hibernate.orm>
105+
<version.org.hibernate.orm>8.0.0.Beta1</version.org.hibernate.orm>
106106

107107
<javadoc.org.hibernate.orm.url>https://docs.hibernate.org/orm/${parsed-version.org.hibernate.orm.majorVersion}.${parsed-version.org.hibernate.orm.minorVersion}/javadocs/</javadoc.org.hibernate.orm.url>
108108
<documentation.org.hibernate.orm.url>https://docs.hibernate.org/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>
@@ -118,7 +118,7 @@
118118
Even though we are importing the Hibernate ORM BOM where Jakarta Persistence is managed, we don't have easy access
119119
to its version. We need a version to be able to display it in the docs. This property is exactly to address that need.
120120
-->
121-
<version.jakarta.persistence>3.2.0</version.jakarta.persistence>
121+
<version.jakarta.persistence>4.0.0-M5</version.jakarta.persistence>
122122

123123
<!-- >>> Jakarta Batch -->
124124
<version.jakarta.batch>2.1.1</version.jakarta.batch>

‎ci/dependency-update/rules-orm.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<ignoreVersion type="regex">.*\.(Alpha|Beta|CR).*</ignoreVersion>
88
<!-- Restrict allowed versions to a particular major/minor, because forbidding major/minor upgrades
99
in the version-maven-plugin configuration doesn't always work for some reason. -->
10-
<ignoreVersion type="regex">^([0-6]\.\d+|7\.[0-3]|8\.\d+)\..*</ignoreVersion>
10+
<ignoreVersion type="regex">^([0-6]\.\d+|7\.[0-4]|9\.\d+)\..*</ignoreVersion>
1111
</ignoreVersions>
1212
</ruleset>

‎documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/binding/dependencies/containers/fromotherentity/ScientificPapersReferencedByBinder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.util.List;
88

99
import org.hibernate.Session;
10-
import org.hibernate.query.Query;
10+
import org.hibernate.query.SelectionQuery;
1111
import org.hibernate.search.engine.backend.document.DocumentElement;
1212
import org.hibernate.search.engine.backend.document.IndexFieldReference;
1313
import org.hibernate.search.mapper.orm.HibernateOrmExtension;
@@ -50,7 +50,7 @@ public void write(DocumentElement target, ScientificPaper paper, TypeBridgeWrite
5050

5151
private List<String> findReferencingPaperTitles(TypeBridgeWriteContext context, ScientificPaper paper) {
5252
Session session = context.extension( HibernateOrmExtension.get() ).session();
53-
Query<String> query = session.createQuery(
53+
SelectionQuery<String> query = session.createQuery(
5454
"select p.title from ScientificPaper p where :this member of p.references",
5555
String.class );
5656
query.setParameter( "this", paper );

‎integrationtest/mapper/orm-jakarta-batch/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@
3434
</properties>
3535

3636
<dependencies>
37-
<!-- Need to have a dependency on scanner if we want to rely on automatic entity discovery in tests: -->
38-
<dependency>
39-
<groupId>org.hibernate.orm</groupId>
40-
<artifactId>hibernate-scan-jandex</artifactId>
41-
</dependency>
4237
<dependency>
4338
<groupId>org.hibernate.search</groupId>
4439
<artifactId>hibernate-search-mapper-orm-jakarta-batch-core</artifactId>

‎integrationtest/mapper/orm-jakarta-batch/src/test/resources/META-INF/persistence.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
version="3.0" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
88
<persistence-unit name="lucene_pu" transaction-type="RESOURCE_LOCAL">
99
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
10+
<class>org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.Company</class>
11+
<class>org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.CompanyGroup</class>
12+
<class>org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.Person</class>
13+
<class>org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.WhoAmI</class>
1014
<properties>
1115
<property name="hibernate.hbm2ddl.auto" value="create-drop" />
1216
<property name="hibernate.session_factory_name" value="primary_session_factory" />
@@ -19,6 +23,10 @@
1923
</persistence-unit>
2024
<persistence-unit name="elasticsearch_pu" transaction-type="RESOURCE_LOCAL">
2125
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
26+
<class>org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.Company</class>
27+
<class>org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.CompanyGroup</class>
28+
<class>org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.Person</class>
29+
<class>org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.WhoAmI</class>
2230
<properties>
2331
<property name="hibernate.hbm2ddl.auto" value="create-drop" />
2432
<property name="hibernate.session_factory_name" value="primary_session_factory" />
@@ -33,6 +41,10 @@
3341
</persistence-unit>
3442
<persistence-unit name="unused_pu" transaction-type="RESOURCE_LOCAL">
3543
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
44+
<class>org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.Company</class>
45+
<class>org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.CompanyGroup</class>
46+
<class>org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.Person</class>
47+
<class>org.hibernate.search.integrationtest.jakarta.batch.massindexing.entity.WhoAmI</class>
3648
<properties>
3749
<property name="hibernate.hbm2ddl.auto" value="create-drop" />
3850
<property name="hibernate.session_factory_name" value="unused_session_factory" />

‎integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/OutboxEventFilter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import org.hibernate.Session;
1919
import org.hibernate.SessionFactory;
20-
import org.hibernate.query.Query;
20+
import org.hibernate.query.SelectionQuery;
2121
import org.hibernate.search.mapper.orm.outboxpolling.event.impl.DefaultOutboxEventFinder;
2222
import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEvent;
2323
import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEventAndPredicate;
@@ -139,7 +139,7 @@ public String queryPart(String eventAlias) {
139139
}
140140

141141
@Override
142-
public void setParams(Query<?> query) {
142+
public void setParams(SelectionQuery<?> query) {
143143
// HSEARCH-4818: copy the values so that they don't change
144144
// between the binding and when the query actually executes.
145145
query.setParameter( "ids", new ArrayList<>( allowedIds ) );

‎integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/sync/OutOfSyncIndexIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ void search_skipDeletedEntitiesInHits() {
5757

5858
// Simulate an external delete that Hibernate Search will not be able to detect
5959
with( entityManagerFactory ).runInTransaction(
60-
entityManager -> entityManager.createQuery( "DELETE FROM book WHERE MOD(id, 2) = 0" )
61-
.executeUpdate()
60+
entityManager -> entityManager.createStatement( "DELETE FROM book WHERE MOD(id, 2) = 0" )
61+
.execute()
6262
);
6363

6464
// Check that document counts are off

‎integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/AbstractAutomaticIndexingAssociationBaseIT.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -422,21 +422,21 @@ void setup() {
422422
if ( DatabaseContainer.configuration().is( DatabaseContainer.SupportedDatabase.MARIADB,
423423
DatabaseContainer.SupportedDatabase.MYSQL ) ) {
424424
setupContext.dataClearing( config -> config.manualDatabaseCleanup( session -> {
425-
session.createMutationQuery( "update containing c set c.parent = null" ).executeUpdate();
425+
session.createMutationQuery( "update containing c set c.parent = null" ).execute();
426426
} ) );
427427
}
428428
if ( isAssociationOwnedByContainedSide() ) {
429429
setupContext.dataClearing( config -> config.manualDatabaseCleanup( session -> {
430-
session.createMutationQuery( "delete from contained" ).executeUpdate();
431-
session.createMutationQuery( "delete from containing" ).executeUpdate();
432-
session.createMutationQuery( "delete from indexed" ).executeUpdate();
430+
session.createMutationQuery( "delete from contained" ).execute();
431+
session.createMutationQuery( "delete from containing" ).execute();
432+
session.createMutationQuery( "delete from indexed" ).execute();
433433
} ) );
434434
}
435435
else {
436436
setupContext.dataClearing( config -> config.manualDatabaseCleanup( session -> {
437-
session.createMutationQuery( "delete from containing" ).executeUpdate();
438-
session.createMutationQuery( "delete from indexed" ).executeUpdate();
439-
session.createMutationQuery( "delete from contained" ).executeUpdate();
437+
session.createMutationQuery( "delete from containing" ).execute();
438+
session.createMutationQuery( "delete from indexed" ).execute();
439+
session.createMutationQuery( "delete from contained" ).execute();
440440
} ) );
441441
}
442442
sessionFactory = additionalSetup( setupContext ).setup();

0 commit comments

Comments
 (0)
⚡