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.

Sign up for GitHub

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.4, Hibernate Search 7.0, Hibernate Reactive 2.2 #36978

Merged
merged 15 commits into from
Nov 28, 2023
Merged

Upgrade to Hibernate ORM 6.4, Hibernate Search 7.0, Hibernate Reactive 2.2 #36978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ffefc64
Fix invalid use of "!= null"
yrodiere Nov 6, 2023
b6d0891
Avoid reusing a non-empty persistence context across transaction in t…
yrodiere Nov 24, 2023
ed12780
Fix assertions in tests related to Hibernate ORM FormatMappers
yrodiere Nov 24, 2023
18a845d
Fix weird transaction in tests related to Hibernate ORM FormatMappers
yrodiere Nov 24, 2023
0ccf1c4
Upgrade to quarkus-local-cache 0.3.0
yrodiere Nov 8, 2023
5985241
Upgrade to Hibernate ORM 6.3.1.Final and Hibernate Reactive 2.1.0.Final
yrodiere Oct 26, 2023
e5f2eae
Upgrade to Hibernate ORM 6.4.0.Final and Hibernate Reactive 2.2.0.Final
yrodiere Oct 31, 2023
55c9e64
Remove unused class HibernateSearchOutboxPollingClasses
yrodiere Nov 6, 2023
0e5465c
Upgrade to Hibernate Search 7.0.0.CR2
yrodiere Nov 6, 2023
cdb4dda
Import the Hibernate Search BOM into the Quarkus BOM
yrodiere Nov 6, 2023
85341e0
Fix invalid links in Hibernate Search extension documentation
yrodiere Nov 6, 2023
eeaecac
Rename extension quarkus-hibernate-search-orm-coordination-outbox-pol…
yrodiere Nov 6, 2023
0d04f2e
Align Hibernate Search configuration defaults on Hibernate Search 7
yrodiere Nov 17, 2023
f65d708
Add SyntaxException to the NamedQueryMistake checks
DavideD Nov 27, 2023
4f49734
Add test for Panache ORM query exception
DavideD Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 21 additions & 25 deletions bom/application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,17 @@
<commons-lang3.version>3.13.0</commons-lang3.version>
<commons-codec.version>1.16.0</commons-codec.version>
<classmate.version>1.5.1</classmate.version>
<!-- When updating, align bytebuddy.version to Hibernate needs as well (just below),
as well as hibernate-orm.version-for-documentation in docs/pom.xml -->
<hibernate-orm.version>6.2.13.Final</hibernate-orm.version>
<!-- WARNING: When updating, also align other properties on this version:
bytebuddy.version (just below), hibernate-orm.version-for-documentation (in docs/pom.xml)
and antlr.version.version in build-parent/pom.xml
WARNING again for diffs that don't provide enough context: when updating, see above -->
<hibernate-orm.version>6.4.0.Final</hibernate-orm.version>
<bytebuddy.version>1.14.7</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.6.Final</hibernate-reactive.version>
<hibernate-reactive.version>2.2.0.Final</hibernate-reactive.version>
<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
<!-- When updating, align hibernate-search.version-for-documentation in docs/pom.xml -->
<hibernate-search.version>6.2.2.Final</hibernate-search.version>
<hibernate-search.version>7.0.0.CR2</hibernate-search.version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It goes without saying but we will need a Final before 3.7.0 is out (but I'm sure you already have that in mind).

<narayana.version>7.0.0.Final</narayana.version>
<agroal.version>2.1</agroal.version>
<jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
Expand Down Expand Up @@ -179,15 +181,15 @@
<javaparser.version>3.25.6</javaparser.version>
<okhttp.version>3.14.9</okhttp.version><!-- keep in sync with okio -->
<okio.version>1.17.6</okio.version><!-- keep in sync with okhttp -->
<hibernate-quarkus-local-cache.version>0.2.1</hibernate-quarkus-local-cache.version>
<hibernate-quarkus-local-cache.version>0.3.0</hibernate-quarkus-local-cache.version>
<flapdoodle.mongo.version>4.9.2</flapdoodle.mongo.version>
<quarkus-spring-api.version>5.2.SP7</quarkus-spring-api.version>
<quarkus-spring-data-api.version>2.1.SP2</quarkus-spring-data-api.version>
<quarkus-spring-security-api.version>5.4.Final</quarkus-spring-security-api.version>
<quarkus-spring-boot-api.version>2.1.SP1</quarkus-spring-boot-api.version>
<mockito.version>5.3.1</mockito.version>
<jna.version>5.8.0</jna.version><!-- should satisfy both testcontainers and mongodb -->
<antlr.version>4.10.1</antlr.version><!-- needs to align with same property in build-parent/pom.xml -->
<antlr.version>4.13.0</antlr.version><!-- needs to align with same property in build-parent/pom.xml -->
<quarkus-security.version>2.0.2.Final</quarkus-security.version>
<keycloak.version>23.0.0</keycloak.version>
<logstash-gelf.version>1.15.1</logstash-gelf.version>
Expand Down Expand Up @@ -407,6 +409,15 @@
<scope>import</scope>
</dependency>

<!-- Hibernate Search -->
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-bom</artifactId>
<version>${hibernate-search.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- Mutiny and Vert.x Mutiny Binding BOMs -->
<dependency>
<groupId>io.smallrye.reactive</groupId>
Expand Down Expand Up @@ -1195,12 +1206,12 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-hibernate-search-orm-coordination-outbox-polling</artifactId>
<artifactId>quarkus-hibernate-search-orm-outbox-polling</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-hibernate-search-orm-coordination-outbox-polling-deployment</artifactId>
<artifactId>quarkus-hibernate-search-orm-outbox-polling-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -5037,22 +5048,7 @@
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-backend-elasticsearch</artifactId>
<version>${hibernate-search.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-backend-elasticsearch-aws</artifactId>
<version>${hibernate-search.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-mapper-orm-coordination-outbox-polling-orm6</artifactId>
<version>${hibernate-search.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-mapper-orm-orm6</artifactId>
<artifactId>hibernate-search-mapper-orm</artifactId>
<version>${hibernate-search.version}</version>
<exclusions>
<!-- the right version will come with Hibernate ORM -->
Expand Down
2 changes: 1 addition & 1 deletion build-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<!-- MicroProfile TCK versions used to be defined here but have moved to the concrete tck modules -->

<!-- Antlr 4 is used by the PanacheQL parser but also needs to match the requirements of Hibernate ORM 6.x-->
<antlr.version>4.10.1</antlr.version>
<antlr.version>4.13.0</antlr.version>

<!-- SELinux access label, used when mounting local volumes into containers in tests -->
<volume.access.modifier>:Z</volume.access.modifier>
Expand Down
4 changes: 2 additions & 2 deletions devtools/bom-descriptor-json/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-hibernate-search-orm-coordination-outbox-polling</artifactId>
<artifactId>quarkus-hibernate-search-orm-elasticsearch</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
Expand All @@ -852,7 +852,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-hibernate-search-orm-elasticsearch</artifactId>
<artifactId>quarkus-hibernate-search-orm-outbox-polling</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
Expand Down
8 changes: 4 additions & 4 deletions docs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
<vale.image>docker.io/jdkato/vale:v2.15.5</vale.image>

<!-- Keep these in sync with the full versions in bom/application/pom.xml -->
<hibernate-orm.version-for-documentation>6.2</hibernate-orm.version-for-documentation>
<hibernate-search.version-for-documentation>6.2</hibernate-search.version-for-documentation>
<hibernate-orm.version-for-documentation>6.4</hibernate-orm.version-for-documentation>
<hibernate-search.version-for-documentation>7.0</hibernate-search.version-for-documentation>
</properties>

<name>Quarkus - Documentation</name>
Expand Down Expand Up @@ -855,7 +855,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-hibernate-search-orm-coordination-outbox-polling-deployment</artifactId>
<artifactId>quarkus-hibernate-search-orm-elasticsearch-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
Expand All @@ -868,7 +868,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-hibernate-search-orm-elasticsearch-deployment</artifactId>
<artifactId>quarkus-hibernate-search-orm-outbox-polling-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
Expand Down
24 changes: 12 additions & 12 deletions docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,10 +944,10 @@

To enable the `outbox-polling` coordination strategy, an additional extension is required:

:add-extension-extensions: hibernate-search-orm-coordination-outbox-polling
:add-extension-extensions: hibernate-search-orm-outbox-polling
include::{includes}/devtools/extension-add.adoc[]

Check failure on line 948 in docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc

View workflow job for this annotation

GitHub Actions / Linting with Vale 

[vale] reported by reviewdog 🐶
[Quarkus.TermsErrors] Use 'you' rather than 'i'.

Raw Output:
{"message": "[Quarkus.TermsErrors] Use 'you' rather than 'i'.", "location": {"path": "docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc", "range": {"start": {"line": 948, "column": 1}}}, "severity": "ERROR"}

Once the extension is there, you will need to explicitly select the `outbox-polling` strategy

Check warning on line 950 in docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc

View workflow job for this annotation

GitHub Actions / Linting with Vale 

[vale] reported by reviewdog 🐶
[Quarkus.Fluff] Depending on the context, consider using 'Rewrite the sentence, or use 'must', instead of' rather than 'need to'.

Raw Output:
{"message": "[Quarkus.Fluff] Depending on the context, consider using 'Rewrite the sentence, or use 'must', instead of' rather than 'need to'.", "location": {"path": "docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc", "range": {"start": {"line": 950, "column": 28}}}, "severity": "INFO"}
by setting link:#quarkus-hibernate-search-orm-elasticsearch_quarkus.hibernate-search-orm.coordination.strategy[`quarkus.hibernate-search-orm.coordination.strategy`]
to `outbox-polling`.

Expand All @@ -963,18 +963,18 @@
[NOTE]
====
The database schema Hibernate Search will expect for outbox-polling coordination
may be customized through the following configuration properties:

Check warning on line 966 in docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc

View workflow job for this annotation

GitHub Actions / Linting with Vale 

[vale] reported by reviewdog 🐶
[Quarkus.TermsWarnings] Consider using 'might (for possiblity)' or 'can (for ability)' rather than 'may' unless updating existing content that uses the term.

Raw Output:
{"message": "[Quarkus.TermsWarnings] Consider using 'might (for possiblity)' or 'can (for ability)' rather than 'may' unless updating existing content that uses the term.", "location": {"path": "docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc", "range": {"start": {"line": 966, "column": 1}}}, "severity": "WARNING"}

* link:#quarkus-hibernate-search-orm-coordination-outboxpolling_quarkus.hibernate-search-orm.coordination.entity.mapping.agent.catalog[`quarkus.hibernate-search-orm.coordination.entity.mapping.agent.catalog`]
* link:#quarkus-hibernate-search-orm-coordination-outboxpolling_quarkus.hibernate-search-orm.coordination.entity.mapping.agent.schema[`quarkus.hibernate-search-orm.coordination.entity.mapping.agent.schema`]
* link:#quarkus-hibernate-search-orm-coordination-outboxpolling_quarkus.hibernate-search-orm.coordination.entity.mapping.agent.table[`quarkus.hibernate-search-orm.coordination.entity.mapping.agent.table`]
* link:#quarkus-hibernate-search-orm-coordination-outboxpolling_quarkus.hibernate-search-orm.coordination.entity.mapping.agent.uuid-gen-strategy[`quarkus.hibernate-search-orm.coordination.entity.mapping.agent.uuid-gen-strategy`]
* link:#quarkus-hibernate-search-orm-coordination-outboxpolling_quarkus.hibernate-search-orm.coordination.entity.mapping.agent.uuid-type[`quarkus.hibernate-search-orm.coordination.entity.mapping.agent.uuid-type`]
* link:#quarkus-hibernate-search-orm-coordination-outboxpolling_quarkus.hibernate-search-orm.coordination.entity.mapping.outbox-event.catalog[`quarkus.hibernate-search-orm.coordination.entity.mapping.outbox-event.catalog`]
* link:#quarkus-hibernate-search-orm-coordination-outboxpolling_quarkus.hibernate-search-orm.coordination.entity.mapping.outbox-event.schema[`quarkus.hibernate-search-orm.coordination.entity.mapping.outbox-event.schema`]
* link:#quarkus-hibernate-search-orm-coordination-outboxpolling_quarkus.hibernate-search-orm.coordination.entity.mapping.outbox-event.table[`quarkus.hibernate-search-orm.coordination.entity.mapping.outbox-event.table`]
* link:#quarkus-hibernate-search-orm-coordination-outboxpolling_quarkus.hibernate-search-orm.coordination.entity.mapping.outbox-event.uuid-gen-strategy[`quarkus.hibernate-search-orm.coordination.entity.mapping.outbox-event.uuid-gen-strategy`]
* link:#quarkus-hibernate-search-orm-coordination-outboxpolling_quarkus.hibernate-search-orm.coordination.entity.mapping.outbox-event.uuid-type[`quarkus.hibernate-search-orm.coordination.entity.mapping.outbox-event.uuid-type`]
* link:#quarkus-hibernate-search-orm-outboxpolling_quarkus.hibernate-search-orm.coordination.entity-mapping.agent.catalog[`quarkus.hibernate-search-orm.coordination.entity-mapping.agent.catalog`]
* link:#quarkus-hibernate-search-orm-outboxpolling_quarkus.hibernate-search-orm.coordination.entity-mapping.agent.schema[`quarkus.hibernate-search-orm.coordination.entity-mapping.agent.schema`]
* link:#quarkus-hibernate-search-orm-outboxpolling_quarkus.hibernate-search-orm.coordination.entity-mapping.agent.table[`quarkus.hibernate-search-orm.coordination.entity-mapping.agent.table`]
* link:#quarkus-hibernate-search-orm-outboxpolling_quarkus.hibernate-search-orm.coordination.entity-mapping.agent.uuid-gen-strategy[`quarkus.hibernate-search-orm.coordination.entity-mapping.agent.uuid-gen-strategy`]
* link:#quarkus-hibernate-search-orm-outboxpolling_quarkus.hibernate-search-orm.coordination.entity-mapping.agent.uuid-type[`quarkus.hibernate-search-orm.coordination.entity-mapping.agent.uuid-type`]
* link:#quarkus-hibernate-search-orm-outboxpolling_quarkus.hibernate-search-orm.coordination.entity-mapping.outbox-event.catalog[`quarkus.hibernate-search-orm.coordination.entity-mapping.outbox-event.catalog`]
* link:#quarkus-hibernate-search-orm-outboxpolling_quarkus.hibernate-search-orm.coordination.entity-mapping.outbox-event.schema[`quarkus.hibernate-search-orm.coordination.entity-mapping.outbox-event.schema`]
* link:#quarkus-hibernate-search-orm-outboxpolling_quarkus.hibernate-search-orm.coordination.entity-mapping.outbox-event.table[`quarkus.hibernate-search-orm.coordination.entity-mapping.outbox-event.table`]
* link:#quarkus-hibernate-search-orm-outboxpolling_quarkus.hibernate-search-orm.coordination.entity-mapping.outbox-event.uuid-gen-strategy[`quarkus.hibernate-search-orm.coordination.entity-mapping.outbox-event.uuid-gen-strategy`]
* link:#quarkus-hibernate-search-orm-outboxpolling_quarkus.hibernate-search-orm.coordination.entity-mapping.outbox-event.uuid-type[`quarkus.hibernate-search-orm.coordination.entity-mapping.outbox-event.uuid-type`]

====

Expand Down Expand Up @@ -1071,4 +1071,4 @@

NOTE: These configuration properties require an additional extension. See <<coordination>>.

include::{generated-dir}/config/quarkus-hibernate-search-orm-coordination-outboxpolling.adoc[leveloffset=+1, opts=optional]
include::{generated-dir}/config/quarkus-hibernate-search-orm-outboxpolling.adoc[leveloffset=+1, opts=optional]
4 changes: 2 additions & 2 deletions ...m/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,9 @@ void registerHibernateOrmMetadataForCoreDialects(
producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.MSSQL,
"org.hibernate.dialect.SQLServerDialect", DialectVersions.Defaults.MSSQL));
producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.MYSQL,
"org.hibernate.dialect.MySQLDialect", DialectVersions.Defaults.MYSQL));
"org.hibernate.dialect.MySQLDialect"));
producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.ORACLE,
"org.hibernate.dialect.OracleDialect", DialectVersions.Defaults.ORACLE));
"org.hibernate.dialect.OracleDialect"));
producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.POSTGRESQL,
"org.hibernate.dialect.PostgreSQLDialect"));
}
Expand Down
Loading
Loading