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.5.1 and configure Hibernate ORM/Reactive with database product names instead of dialect names for core dialects #40474

Merged
merged 5 commits into from
May 16, 2024

Conversation

yrodiere
Copy link
Member

@yrodiere yrodiere commented May 6, 2024

Mainly to avoid Hibernate ORM logging warnings on startup.

Fixes #37575

Opening as draft, because this won't work until https://hibernate.atlassian.net/browse/HHH-18079 gets fixed. => Done

... and actually we'll need https://hibernate.atlassian.net/browse/HHH-18112 to get rid of some more warnings on PostgreSQL.

@yrodiere yrodiere changed the title Configure Hibernate ORM/Reactive with database product names instead … Configure Hibernate ORM/Reactive with database product names instead of dialect names for core dialects May 6, 2024
@quarkus-bot
Copy link

quarkus-bot bot commented May 6, 2024

/cc @gsmet (hibernate-orm)

@quarkus-bot
Copy link

quarkus-bot bot commented May 6, 2024

Thanks for your pull request!

The title of your pull request does not follow our editorial rules. Could you have a look?

  • title should not end up with ellipsis (make sure the title is complete)

This message is automatically generated by a bot.

@yrodiere
Copy link
Member Author

yrodiere commented May 7, 2024

This will likely require hibernate/hibernate-orm#8332 to get merged and a new 6.5 release.

@quarkus-bot quarkus-bot bot added the area/dependencies Pull requests that update a dependency file label May 14, 2024
@yrodiere yrodiere changed the title Configure Hibernate ORM/Reactive with database product names instead of dialect names for core dialects Upgrade to Hibernate ORM 6.5.1 and configure Hibernate ORM/Reactive with database product names instead of dialect names for core dialects May 14, 2024
@yrodiere yrodiere marked this pull request as ready for review May 14, 2024 05:01
@yrodiere yrodiere requested a review from gsmet May 14, 2024 05:01
@quarkus-bot

This comment has been minimized.

@yrodiere yrodiere force-pushed the i37575-dialect-warning branch 2 times, most recently from 4c23592 to 0e4d681 Compare May 14, 2024 13:20
@quarkus-bot

This comment has been minimized.

@quarkus-bot

This comment has been minimized.

@yrodiere
Copy link
Member Author

The remaining failures are not (exactly) related; we'll need #40652 to get merged first.

@yrodiere
Copy link
Member Author

The remaining failures are not (exactly) related; we'll need #40652 to get merged first.

Done. I rebased on main. Let's wait for CI 🤞

@quarkus-bot

This comment has been minimized.

@Sanne
Copy link
Member

Sanne commented May 15, 2024

It appears that the failing test in integration-tests/reactive-messaging-kafka is new or at least not flaky.. however that module doesn't seem to depend on Hibernate ORM.

What do we do? I'll try it locally, but later as I can't work now.

In the meantime, I'll have it run again :/

dependabot bot and others added 2 commits May 15, 2024 20:22
Bumps `hibernate-orm.version` from 6.5.0.Final to 6.5.1.Final.

Updates `org.hibernate.orm:hibernate-core` from 6.5.0.Final to 6.5.1.Final
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/6.5.1/changelog.txt)
- [Commits](hibernate/hibernate-orm@6.5.0...6.5.1)

Updates `org.hibernate.orm:hibernate-graalvm` from 6.5.0.Final to 6.5.1.Final
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/6.5.1/changelog.txt)
- [Commits](hibernate/hibernate-orm@6.5.0...6.5.1)

Updates `org.hibernate.orm:hibernate-envers` from 6.5.0.Final to 6.5.1.Final
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/6.5.1/changelog.txt)
- [Commits](hibernate/hibernate-orm@6.5.0...6.5.1)

Updates `org.hibernate.orm:hibernate-jpamodelgen` from 6.5.0.Final to 6.5.1.Final
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/6.5.1/changelog.txt)
- [Commits](hibernate/hibernate-orm@6.5.0...6.5.1)

Updates `org.hibernate:hibernate-jpamodelgen` from 6.5.0.Final to 6.5.1.Final
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/6.5.1/changelog.txt)
- [Commits](hibernate/hibernate-orm@6.5.0...6.5.1)

Updates `org.hibernate.orm:hibernate-community-dialects` from 6.5.0.Final to 6.5.1.Final
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/6.5.1/changelog.txt)
- [Commits](hibernate/hibernate-orm@6.5.0...6.5.1)

---
updated-dependencies:
- dependency-name: org.hibernate.orm:hibernate-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.hibernate.orm:hibernate-graalvm
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.hibernate.orm:hibernate-envers
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.hibernate.orm:hibernate-jpamodelgen
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.hibernate:hibernate-jpamodelgen
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.hibernate.orm:hibernate-community-dialects
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@quarkus-bot
Copy link

quarkus-bot bot commented May 16, 2024

Status for workflow Quarkus CI

This is the status report for running Quarkus CI on commit 0addc19.

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

You can consult the Develocity build scans.


Flaky tests - Develocity

⚙️ JVM Tests - JDK 17

📦 extensions/smallrye-reactive-messaging/deployment

io.quarkus.smallrye.reactivemessaging.hotreload.ConnectorChangeTest.testUpdatingConnector - History

  • Expecting actual: ["-6","-8","-9","-10","-11","-12","-13","-14"] to start with: ["-6", "-7", "-8", "-9"] - java.lang.AssertionError
java.lang.AssertionError: 

Expecting actual:
  ["-6","-8","-9","-10","-11","-12","-13","-14"]
to start with:
  ["-6", "-7", "-8", "-9"]

	at io.quarkus.smallrye.reactivemessaging.hotreload.ConnectorChangeTest.testUpdatingConnector(ConnectorChangeTest.java:41)
  • Expecting actual: ["-6","-8","-9","-10","-11","-12","-13","-14"] to start with: ["-6", "-7", "-8", "-9"] - java.lang.AssertionError
java.lang.AssertionError: 

Expecting actual:
  ["-6","-8","-9","-10","-11","-12","-13","-14"]
to start with:
  ["-6", "-7", "-8", "-9"]

	at io.quarkus.smallrye.reactivemessaging.hotreload.ConnectorChangeTest.testUpdatingConnector(ConnectorChangeTest.java:41)

⚙️ JVM Tests - JDK 21

📦 extensions/smallrye-reactive-messaging-kafka/deployment

io.quarkus.smallrye.reactivemessaging.kafka.deployment.dev.KafkaDevServicesDevModeTestCase.sseStream - History

  • Assertion condition defined as a Lambda expression in io.quarkus.smallrye.reactivemessaging.kafka.deployment.dev.KafkaDevServicesDevModeTestCase Expecting size of: [] to be greater than or equal to 2 but was 0 within 10 seconds. - org.awaitility.core.ConditionTimeoutException
org.awaitility.core.ConditionTimeoutException: 
Assertion condition defined as a Lambda expression in io.quarkus.smallrye.reactivemessaging.kafka.deployment.dev.KafkaDevServicesDevModeTestCase 
Expecting size of:
  []
to be greater than or equal to 2 but was 0 within 10 seconds.
	at org.awaitility.core.ConditionAwaiter.await(ConditionAwaiter.java:167)
	at org.awaitility.core.AssertionCondition.await(AssertionCondition.java:119)
	at org.awaitility.core.AssertionCondition.await(AssertionCondition.java:31)
  • io.quarkus.builder.BuildException: Build failure: Build failed due to errors [error]: Build step io.quarkus.apicurio.registry.devservice.DevServicesApicurioRegistryProcessor#startApicurioRegistryDevService threw an exception: java.lang.RuntimeException: org.testcontainers.containers.ContainerLaunchException: Container startup failed for image quay.io/apicurio/apicurio-registry-mem:2.4.2.Final at io.quarkus.apicurio.registry.devservice.DevServicesApicurioRegistryProcessor.startApicurioRegistryDevService(DevServicesApicurioRegistryProcessor.java:89) at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103) at java.base/java.lang.reflect.Method.invoke(Method.java:580) - java.lang.RuntimeException
java.lang.RuntimeException: 
io.quarkus.builder.BuildException: Build failure: Build failed due to errors
	[error]: Build step io.quarkus.apicurio.registry.devservice.DevServicesApicurioRegistryProcessor#startApicurioRegistryDevService threw an exception: java.lang.RuntimeException: org.testcontainers.containers.ContainerLaunchException: Container startup failed for image quay.io/apicurio/apicurio-registry-mem:2.4.2.Final
	at io.quarkus.apicurio.registry.devservice.DevServicesApicurioRegistryProcessor.startApicurioRegistryDevService(DevServicesApicurioRegistryProcessor.java:89)
	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
	at io.quarkus.deployment.ExtensionLoader$3.execute(ExtensionLoader.java:849)
	at io.quarkus.builder.BuildContext.run(BuildContext.java:256)

@yrodiere
Copy link
Member Author

It appears that the failing test in integration-tests/reactive-messaging-kafka is new or at least not flaky.. however that module doesn't seem to depend on Hibernate ORM.

What do we do? I'll try it locally, but later as I can't work now.

In the meantime, I'll have it run again :/

Thanks @Sanne , this did the trick: tests pass, so this was probably just a flake. Which seems confirmed by the fact it was a timeout.

I have approvals and passing tests, so I'll merge! Thank you all.

I'll reignite the discussion on Zulip to see if we should backport this (+ the impending upgrade to ORM 6.5.2) to branch 3.11.

@yrodiere yrodiere merged commit 670b1ad into quarkusio:main May 16, 2024
51 checks passed
@quarkus-bot quarkus-bot bot added this to the 3.12 - main milestone May 16, 2024
@Sanne
Copy link
Member

Sanne commented May 16, 2024

Awesome! great job

@gsmet
Copy link
Member

gsmet commented May 16, 2024

@ozangunalp could you have a look at the flaky test ConnectorChangeTest.testUpdatingConnector above?

@Sanne
Copy link
Member

Sanne commented May 16, 2024

I confirm ConnectorChangeTest.testUpdatingConnector fails locally for me as well - not consistently but very often

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants