mirror of
https://github.com/hibernate/hibernate-orm
synced 2025-02-17 00:24:57 +00:00
(cherry picked from commit 36576046b8df859a672c90182522048dd18e1e74) Conflicts: hibernate-core/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java hibernate-core/src/main/java/org/hibernate/cfg/HbmBinder.java hibernate-core/src/main/java/org/hibernate/cfg/Mappings.java hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java hibernate-core/src/main/java/org/hibernate/cfg/annotations/TableBinder.java hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/IdentifierGeneratorResolver.java hibernate-entitymanager/src/main/java/org/hibernate/ejb/AvailableSettings.java hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java