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

Merged
merged 15 commits into from
Nov 28, 2023

Conversation

yrodiere
Copy link
Member

@yrodiere yrodiere commented Nov 9, 2023

Creating as draft for now, because:

  • We need an ORM 6.4.0.CR2/Final. => Done
  • We still need a HR release and need to upgrade to that, because the current version doesn't work with ORM 6.4. => Done
  • We may need a Hibernate Search 7.0.0.CR2/Final, but just for good measure as it seems to work as is. => Done

Fixes #37184
Fixes #36363
Fixes #35310
Fixes #33895
Fixes #32532
Fixes #33740

@quarkus-bot quarkus-bot bot added area/dependencies Pull requests that update a dependency file area/devtools Issues/PR related to maven, gradle, platform and cli tooling/plugins area/documentation area/hibernate-orm Hibernate ORM area/hibernate-search Hibernate Search area/panache area/persistence OBSOLETE, DO NOT USE area/spring Issues relating to the Spring integration labels Nov 9, 2023
Copy link

quarkus-bot bot commented Nov 9, 2023

/cc @Sanne (hibernate-orm), @gsmet (hibernate-orm,hibernate-search)

Copy link

github-actions bot commented Nov 9, 2023

🙈 The PR is closed and the preview is expired.

@FroMage
Copy link
Member

FroMage commented Nov 9, 2023

Excellent!

@FroMage
Copy link
Member

FroMage commented Nov 20, 2023

The 6.4.0-SNAPSHOT branch (after CR1) wants one extra method in CustomMetadataBuilderContributor.HardcodedSuffixFunction

@yrodiere
Copy link
Member Author

@beikov this change seems to introduce a backwards-incompatible API change for implementations of AbstractSqmSelfRenderingFunctionDescriptor: there is no default implementation for render(SqlAppender sqlAppender, List<? extends SqlAstNode> sqlAstArguments, ReturnableType<?> returnType, SqlAstTranslator<?> walker). Should we fix this in ORM?

@yrodiere
Copy link
Member Author

Ah, all things SQM are considered incubating apparently:

https://docs.jboss.org/hibernate/orm/6.4/incubating/incubating.txt

org.hibernate.query.sqm.*

So... breaking changes are fair, please ignore me.

@yrodiere yrodiere force-pushed the search7.0 branch 3 times, most recently from 83ab95c to ab4459f Compare November 24, 2023 11:27
@yrodiere yrodiere changed the title Upgrade to Hibernate ORM 6.4, Hibernate Search 7.0, Hibernate Reactive next Upgrade to Hibernate ORM 6.4, Hibernate Search 7.0, Hibernate Reactive 2.2.0.Final Nov 24, 2023
@yrodiere yrodiere changed the title Upgrade to Hibernate ORM 6.4, Hibernate Search 7.0, Hibernate Reactive 2.2.0.Final Upgrade to Hibernate ORM 6.4, Hibernate Search 7.0, Hibernate Reactive 2.2 Nov 24, 2023
@yrodiere yrodiere marked this pull request as ready for review November 24, 2023 11:28
@yrodiere
Copy link
Member Author

yrodiere commented Nov 24, 2023

I added the upgrade to Hibernate ORM 6.4.0.Final, Hibernate Reactive 2.2.0.Final and Hibernate Search 7.0.0.CR2.

The tests should pass now, though I can't run them locally right now, so I marked as ready for review and will see what CI has to say about it (in particular about Hibernate Reactive).

@yrodiere
Copy link
Member Author

Not sure what's going on, but CI skipped almost all jobs... I rebased and force-pushed, let's see how it goes.

@yrodiere yrodiere marked this pull request as draft November 24, 2023 16:56

This comment has been minimized.

@yrodiere
Copy link
Member Author

I tried to fix what I noticed in the previous CI run, let's try again...

@marko-bekhta you might be interested by commits 2, 3 and 4. Turns out the tests you added for FormatMappers were more complex than I thought when I reviewed them xD

yrodiere and others added 5 commits November 28, 2023 11:57
…ling to quarkus-hibernate-search-orm-outbox-polling

To align on Hibernate Search renaming the module
hibernate-search-orm-coordination-outbox-polling to hibernate-search-orm-outbox-polling
Copy link

quarkus-bot bot commented Nov 28, 2023

✔️ The latest workflow run for the pull request has completed successfully.

It should be safe to merge provided you have a look at the other checks in the summary.

@yrodiere
Copy link
Member Author

Alright, the build finally passed! 🥳

Could I get an approval to get this merged, @gsmet?
Or @Sanne, but I think he's busy these days.

@yrodiere yrodiere requested review from gsmet and Sanne November 28, 2023 13:02
Copy link
Member

@gsmet gsmet left a comment

Choose a reason for hiding this comment

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

We will need a note in the migration guide about:

Rename extension quarkus-hibernate-search-orm-coordination-outbox-polling to quarkus-hibernate-search-orm-outbox-polling

And if it's an extension that can be consumed by users, we should:

  • keep it defined in the BOM for a while
  • have redirections in place in the relocations/ module. They should be short given only the artifact changes.

This can be done once the PR is merged, I will merge it.

<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).

Copy link
Member

@gsmet gsmet left a comment

Choose a reason for hiding this comment

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

Ah, I wanted to post an Approval review, and apparently clicked on the wrong checkbox.

As said, what I wrote above is not blocking, will merge!

@gsmet gsmet merged commit 68324e2 into quarkusio:main Nov 28, 2023
52 checks passed
@quarkus-bot quarkus-bot bot added this to the 3.7 - main milestone Nov 28, 2023
@gsmet
Copy link
Member

gsmet commented Nov 28, 2023

Thanks everyone, nice to have the latest ORM in Quarkus!

@yrodiere
Copy link
Member Author

We will need a note in the migration guide about:

I added relevant notes for both ORM and Search to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.7

And if it's an extension that can be consumed by users, we should:

keep it defined in the BOM for a while
have redirections in place in the relocations/ module. They should be short given only the artifact changes.

I kept it in the BOM. Will submit a PR for relocations.

@FroMage
Copy link
Member

FroMage commented Dec 1, 2023

Great news!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment