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

Fix hbm.xml builds with CompositeAttributes #22701

Merged
merged 3 commits into from
Jan 7, 2022
Merged

Conversation

digsb
Copy link
Contributor

@digsb digsb commented Jan 6, 2022

@quarkus-bot quarkus-bot bot added area/hibernate-orm Hibernate ORM area/persistence OBSOLETE, DO NOT USE labels Jan 6, 2022
@quarkus-bot

This comment has been minimized.

@gastaldi
Copy link
Contributor

gastaldi commented Jan 6, 2022

Can you squash the commits in your PR?

@digsb
Copy link
Contributor Author

digsb commented Jan 6, 2022

@gastaldi Yes will squash commits.

@digsb
Copy link
Contributor Author

digsb commented Jan 6, 2022

@gastaldi Done

@gastaldi gastaldi added the triage/waiting-for-ci Ready to merge when CI successfully finishes label Jan 6, 2022
@gsmet gsmet requested a review from yrodiere January 6, 2022 19:25
@gsmet
Copy link
Member

gsmet commented Jan 6, 2022

@yrodiere could you please review this one? Thanks!

@gastaldi
Copy link
Contributor

gastaldi commented Jan 6, 2022

@gsmet he already did in #22685 (comment), that's why I approved 😉

@gsmet
Copy link
Member

gsmet commented Jan 6, 2022

Yes, I just want him to also have a look at the tests.

@quarkus-bot

This comment has been minimized.

@digsb
Copy link
Contributor Author

digsb commented Jan 7, 2022

@gastaldi - There is a CI Build that has failed. I am not sure if this is related to my change, can you guide me on how to resolve this?

@gastaldi
Copy link
Contributor

gastaldi commented Jan 7, 2022

@digsb try rebasing your branch with the latest main. Also as a good practice always create a separate branch when creating PRs (don't use main).

@gsmet
Copy link
Member

gsmet commented Jan 7, 2022

No really, it was not related, there was no need to rebase. I see a merge commit now, I will try to do a proper rebase.

@gsmet
Copy link
Member

gsmet commented Jan 7, 2022

I force pushed a rebase.

…onentTest)

"Complex" could mean anything; at least "Component" tells us we're
testing the "component" feature of hbm.xml.

Also, yes, I agree "simple" in "hbm-simple.xml" is not great either.
I just used this to mean "there's nothing special about it, we simply
want to test the basics of HBM file support".
Copy link
Member

@yrodiere yrodiere left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks a lot @digsb .

I pushed a few trivial changes to improve the tests; nothing critical.

Let's merge once CI is green.

@gsmet gsmet merged commit 2accb73 into quarkusio:main Jan 7, 2022
@quarkus-bot quarkus-bot bot added this to the 2.7 - main milestone Jan 7, 2022
@gsmet
Copy link
Member

gsmet commented Jan 7, 2022

Nice team work, thanks everyone!

@quarkus-bot quarkus-bot bot removed the triage/waiting-for-ci Ready to merge when CI successfully finishes label Jan 7, 2022
@gsmet
Copy link
Member

gsmet commented Jan 7, 2022

@digsb FYI, I plan to backport this to 2.6.2.Final that I will release on Monday.

@digsb
Copy link
Contributor Author

digsb commented Jan 7, 2022

Thanks @gastaldi @gsmet @yrodiere

@gsmet gsmet modified the milestones: 2.7 - main, 2.6.2.Final Jan 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/hibernate-orm Hibernate ORM area/persistence OBSOLETE, DO NOT USE
Projects
None yet
Development

Successfully merging this pull request may close these issues.

java.lang.StackOverflowError during build when using hibernate-orm with CompositeAttribute within hbm.xml
4 participants