HHH-19495 Remove the default "true" from optimistic-lock in the mapping xsd #10295
+484
−18
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mbellade
reviewed
Jun 9, 2025
There was a problem hiding this comment.
Hey @marko-bekhta, thanks! I'm guessing that just by having the OptimisticLock annotation we were triggering an additional version update statement, correct?
Have you also tried looking into the hasCascades behavior that was mentioned in the issue?
It would be great to have a test in ORM for this. Would you be able to isolate one from the issuer's reproducer?
marko-bekhta
force-pushed
the
fix/HHH-19495-remove-default-optisitc-locking-from-orm-mapping
branch
from
9aee5bb to
6eb6f5c
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Consumer.java
Dismissed
Show resolved
Hide resolved
|
there's an extra commit in there, @dreab8 and I discovered that XML version was ignored in 7 so added something to handle it. |
mbellade
reviewed
Jun 10, 2025
hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlAnnotationHelper.java
Outdated
Show resolved
Hide resolved
hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlAnnotationHelper.java
Outdated
Show resolved
Hide resolved
hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/ManagedTypeProcessor.java
Outdated
Show resolved
Hide resolved
so that no extra annotations are added unless explicitly defined.
marko-bekhta
force-pushed
the
fix/HHH-19495-remove-default-optisitc-locking-from-orm-mapping
branch
from
43fbd13 to
bba1503
Compare
yrodiere
approved these changes
Jun 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
so that no extra annotations are added unless explicitly defined.
[Please describe here what your change is about]
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.
https://hibernate.atlassian.net/browse/HHH-19528
https://hibernate.atlassian.net/browse/HHH-19495