Branch: refs/heads/wip/6.0
Home:
https://github.com/hibernate/hibernate-orm
Commit: 170821c135ccd3b572b8208340f464d66fba7f3f
https://github.com/hibernate/hibernate-orm/commit/170821c135ccd3b572b8208...
Author: Yoann Rodière <yoann(a)hibernate.org>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
A
hibernate-core/src/test/java/org/hibernate/jpa/test/xml/XmlAndAnnotationAttributeOverrideTest.java
M hibernate-core/src/test/java/org/hibernate/test/util/SchemaUtil.java
A hibernate-core/src/test/resources/org/hibernate/jpa/test/xml/orm-empty.xml
Log Message:
-----------
HHH-14827 Test using @AttributeOverride and also an orm.xml file
Commit: 70d7ac6ecdb8373002f88ff2824fbe22d253a244
https://github.com/hibernate/hibernate-orm/commit/70d7ac6ecdb8373002f88ff...
Author: Yoann Rodière <yoann(a)hibernate.org>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
M
hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/JPAXMLOverriddenAnnotationReader.java
Log Message:
-----------
HHH-14827 Fix @AttributeOverride at type level being ignored when also using orm.xml
Commit: 86ad83f0b5b582bcf705d934d51921818cdc6b44
https://github.com/hibernate/hibernate-orm/commit/86ad83f0b5b582bcf705d93...
Author: Yoann Rodière <yoann(a)hibernate.org>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
M
hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/JPAXMLOverriddenAnnotationReader.java
Log Message:
-----------
HHH-14827 Fix @AssociationOverride/@PrimaryKeyJoinColumn at type level being ignored
when also using orm.xml
Commit: 7b6ee23f1903c4ea32da84406e95df6a52d460b5
https://github.com/hibernate/hibernate-orm/commit/7b6ee23f1903c4ea32da844...
Author: Andrea Boriero <andrea(a)hibernate.org>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
M
hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/JPAXMLOverriddenAnnotationReader.java
A
hibernate-core/src/test/java/org/hibernate/jpa/test/xml/XmlAndAnnotationAttributeOverrideTest.java
M hibernate-core/src/test/java/org/hibernate/orm/test/util/SchemaUtil.java
A hibernate-core/src/test/resources/org/hibernate/jpa/test/xml/orm-empty.xml
Log Message:
-----------
Merge remote-tracking branch 'upstream/main' into wip/6.0
Commit: 83e5ba04502509e0e0e4c6bf41e743bf734f70cc
https://github.com/hibernate/hibernate-orm/commit/83e5ba04502509e0e0e4c6b...
Author: Andrea Boriero <andrea(a)hibernate.org>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
R
hibernate-core/src/test/java/org/hibernate/jpa/test/xml/XmlAndAnnotationAttributeOverrideTest.java
A
hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlAndAnnotationAttributeOverrideTest.java
Log Message:
-----------
Re-enabled additional test
Compare:
https://github.com/hibernate/hibernate-orm/compare/793c8096ac2e...83e5ba0...