[hibernate-commits] [hibernate/hibernate-orm] db47b5: HHH-17634 Add test for issue

Branch: refs/heads/6.4 Home: https://github.com/hibernate/hibernate-orm Commit: db47b51a308df9f40cbdf06c137ab6450e33b801 https://github.com/hibernate/hibernate-orm/commit/db47b51a308df9f40cbdf06... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2024-01-22 (Mon, 22 Jan 2024) Changed paths: A hibernate-core/src/test/java/org/hibernate/orm/test/merge/CompositeIdWithAssociationsAndGeneratedValuesMerge2Test.java A hibernate-core/src/test/java/org/hibernate/orm/test/merge/SimpleMergeTest.java Log Message: ----------- HHH-17634 Add test for issue Commit: 529d4915ba6e52942dfccb79200c48e367066be7 https://github.com/hibernate/hibernate-orm/commit/529d4915ba6e52942dfccb7... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2024-01-22 (Mon, 22 Jan 2024) Changed paths: M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java Log Message: ----------- HHH-17634 Merging a new entity having a @GeneratedValue id should not set the generated id of the original entity Commit: e5a2b3ec0b81f5604ef5e2d3b98ca6590e842772 https://github.com/hibernate/hibernate-orm/commit/e5a2b3ec0b81f5604ef5e2d... Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com&gt; Date: 2024-01-22 (Mon, 22 Jan 2024) Changed paths: M .github/workflows/atlas.yml M .github/workflows/contributor-build.yml Log Message: ----------- Bump actions/cache from 3 to 4 Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support(a)github.com&gt; Compare: https://github.com/hibernate/hibernate-orm/compare/ba5101d40b2d...e5a2b3e...