Branch: refs/heads/wip/6.0 Home: https://github.com/hibernate/hibernate-orm Commit: 7620e0e3959714dad4e9534051a2db0cdd3b4085 https://github.com/hibernate/hibernate-orm/commit/7620e0e3959714dad4e9534... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2021-04-19 (Mon, 19 Apr 2021) Changed paths: A hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java A hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java Log Message: ----------- HHH-14549 Add test for issue Commit: 6f75d96a99f2c17edbace5eaedbd95340099dac6 https://github.com/hibernate/hibernate-orm/commit/6f75d96a99f2c17edbace5e... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2021-04-19 (Mon, 19 Apr 2021) Changed paths: M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java M hibernate-core/src/main/java/org/hibernate/event/internal/FlushVisitor.java M hibernate-core/src/main/java/org/hibernate/event/internal/WrapVisitor.java Log Message: ----------- HHH-14549 Collection with default field initializer will always be empty Commit: 6723ed4626db0fa1b04aac66abd4894e018d11e9 https://github.com/hibernate/hibernate-orm/commit/6723ed4626db0fa1b04aac6... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2021-04-19 (Mon, 19 Apr 2021) Changed paths: M hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/JPAXMLOverriddenAnnotationReader.java Log Message: ----------- HHH-14529 Fix incorrect attribute name for @NamedEntityGraph in JPAXMLOverriddenAnnotationReader Commit: 5b830f3f5edbb9295fcec4dc8c5a51232f3feb2b https://github.com/hibernate/hibernate-orm/commit/5b830f3f5edbb9295fcec4d... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2021-04-19 (Mon, 19 Apr 2021) Changed paths: M hibernate-core/src/test/resources/org/hibernate/jpa/test/graphs/named/subgraph/orm.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/embeddables/collection/orm.xml Log Message: ----------- HHH-14529 Fix invalid order of elements in orm.xml files used for tests Surprisingly, the XSD does mandate a specific order for some elements, including "entity", "embeddable" and the children of "attributes". It turns out we were allowing a wrong order with the dom4j implementation, but we no longer do with the jaxb implementation. Commit: 4f7bb75ec7c7006836ce95c99e195b44c6ef0e62 https://github.com/hibernate/hibernate-orm/commit/4f7bb75ec7c7006836ce95c... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2021-04-19 (Mon, 19 Apr 2021) Changed paths: M hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/XMLContext.java Log Message: ----------- HHH-14529 Fix access type being ignored when defined at the entity level in orm.xml That's a bug I introduced when I migrated code from dom4j to jaxb. Commit: 194e53a0fb2b90a14e34e8e3a825f671218a55cc https://github.com/hibernate/hibernate-orm/commit/194e53a0fb2b90a14e34e8e... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2021-04-19 (Mon, 19 Apr 2021) Changed paths: R hibernate-core/src/test/java/org/hibernate/internal/util/xml/XMLHelper.java R hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/LegacyElementCollectionConverterTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/LegacyJPAOverriddenAnnotationReaderTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/LegacyXMLContextTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyEjb3XmlElementCollectionTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyEjb3XmlManyToManyTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyEjb3XmlManyToOneTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyEjb3XmlOneToManyTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyEjb3XmlOneToOneTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyEjb3XmlTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyEjb3XmlTestCase.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyNonExistentOrmVersionTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyOrmVersion1SupportedTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyPreParsedOrmXmlTest.java Log Message: ----------- HHH-14563 Remove legacy tests for DOM4J-based XML mapping Commit: 6f5f6b32c3a158633309c187b7172dab0a744767 https://github.com/hibernate/hibernate-orm/commit/6f5f6b32c3a158633309c18... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2021-04-19 (Mon, 19 Apr 2021) Changed paths: M hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java M hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java M hibernate-core/src/main/java/org/hibernate/boot/jaxb/spi/XmlMappingOptions.java M hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java M hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java M hibernate-core/src/main/java/org/hibernate/boot/spi/XmlMappingBinderAccess.java R hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAMetadataProvider.java R hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverriddenAnnotationReader.java R hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/XMLContext.java M hibernate-core/src/test/java/org/hibernate/internal/util/xml/XMLMappingHelper.java R hibernate-core/src/test/java/org/hibernate/internal/util/xml/XmlMappingOptionsStrategyRegistrationProvider.java M hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/ElementCollectionConverterTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/PreParsedOrmXmlTest.java R hibernate-core/src/test/resources/META-INF/services/org.hibernate.boot.registry.selector.StrategyRegistrationProvider Log Message: ----------- HHH-14563 Remove DOM4J-based XML mapping Use JAXB-based XML mapping everywhere. Commit: b076216e841d00470281e198bef1fccc35be34a9 https://github.com/hibernate/hibernate-orm/commit/b076216e841d00470281e19... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2021-04-19 (Mon, 19 Apr 2021) Changed paths: M hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java R hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/DefaultXmlMappingOptions.java M hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java R hibernate-core/src/main/java/org/hibernate/boot/jaxb/spi/XmlMappingOptions.java M hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java M hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java M hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java M hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java M hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java M hibernate-core/src/main/java/org/hibernate/boot/spi/XmlMappingBinderAccess.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/JPAXMLOverriddenMetadataProvider.java M hibernate-core/src/test/java/org/hibernate/internal/util/xml/XMLMappingHelper.java M hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/AdditionalJaxbMappingProducerImpl.java Log Message: ----------- HHH-14563 Remove XmlMappingOptions We don't need that anymore: XML mapping is either enabled or disabled, there are no other options. So a boolean will do. Commit: 87a3e0a5d825e9bfeb36b9db32ac73719564be82 https://github.com/hibernate/hibernate-orm/commit/87a3e0a5d825e9bfeb36b9d... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2021-04-19 (Mon, 19 Apr 2021) Changed paths: M hibernate-core/src/main/java/org/hibernate/annotations/Tuplizer.java M hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributeSource.java M hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java M hibernate-core/src/main/java/org/hibernate/tuple/Tuplizer.java M hibernate-core/src/main/java/org/hibernate/type/CollectionType.java Log Message: ----------- HHH-14563 Remove a few obsolete references to DOM4J entity-mode This mode was removed literally a decade ago. Commit: 4264bc55ac96d41d7baed796edc2e48fdad05162 https://github.com/hibernate/hibernate-orm/commit/4264bc55ac96d41d7baed79... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2021-04-19 (Mon, 19 Apr 2021) Changed paths: M hibernate-core/hibernate-core.gradle M hibernate-entitymanager/hibernate-entitymanager.gradle M hibernate-envers/hibernate-envers.gradle M hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/AdditionalJaxbMappingProducerImpl.java M hibernate-osgi/hibernate-osgi.gradle Log Message: ----------- HHH-14563 Remove the DOM4J dependency from hibernate-core Commit: d7e85a3c3cbbdf82db21741466acb52a12c36b84 https://github.com/hibernate/hibernate-orm/commit/d7e85a3c3cbbdf82db21741... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2021-04-19 (Mon, 19 Apr 2021) Changed paths: M hibernate-spatial/hibernate-spatial.gradle Log Message: ----------- HHH-14563 Clarify that hibernate-spatial only needs dom4j for tests For org.hibernate.spatial.testing.TestDataReader, to be precise. Commit: b0abe9f37e100d6ab225a86fd37dbc530e0c4589 https://github.com/hibernate/hibernate-orm/commit/b0abe9f37e100d6ab225a86... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2021-04-19 (Mon, 19 Apr 2021) Changed paths: M tooling/hibernate-enhance-maven-plugin/hibernate-enhance-maven-plugin.gradle Log Message: ----------- HHH-14563 Remove the DOM4J dependency from hibernate-enhance-maven-plugin As far as I can tell, this was only necessary as a transitive dependency of Hibernate ORM. Commit: 3bac846de210fe01e66cded2768d4ff214f2e657 https://github.com/hibernate/hibernate-orm/commit/3bac846de210fe01e66cded... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2021-04-19 (Mon, 19 Apr 2021) Changed paths: M hibernate-core/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java M hibernate-core/src/test/java/org/hibernate/test/filter/Salesperson.java Log Message: ----------- HHH-14567 Test enabling filters after query creation but before query execution Commit: 8389b1a7a2aaba0f57c677b77bd4dbb07a22c75c https://github.com/hibernate/hibernate-orm/commit/8389b1a7a2aaba0f57c677b... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2021-04-19 (Mon, 19 Apr 2021) Changed paths: M hibernate-core/src/main/java/org/hibernate/query/internal/QueryImpl.java Log Message: ----------- HHH-14567 Do not reuse query plans after session filters changed Commit: c48606a5aa5f5d992291ee2ec9f2e3880963642e https://github.com/hibernate/hibernate-orm/commit/c48606a5aa5f5d992291ee2... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2021-04-20 (Tue, 20 Apr 2021) Changed paths: M hibernate-core/hibernate-core.gradle M hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java M hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java R hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/DefaultXmlMappingOptions.java M hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java R hibernate-core/src/main/java/org/hibernate/boot/jaxb/spi/XmlMappingOptions.java M hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java M hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java M hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributeSource.java M hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java M hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java M hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java M hibernate-core/src/main/java/org/hibernate/boot/spi/XmlMappingBinderAccess.java R hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAMetadataProvider.java R hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverriddenAnnotationReader.java R hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/JPAXMLOverriddenAnnotationReader.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/JPAXMLOverriddenMetadataProvider.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/XMLContext.java M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java M hibernate-core/src/main/java/org/hibernate/event/internal/FlushVisitor.java M hibernate-core/src/main/java/org/hibernate/event/internal/WrapVisitor.java M hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java M hibernate-core/src/main/java/org/hibernate/tuple/Tuplizer.java M hibernate-core/src/main/java/org/hibernate/type/CollectionType.java R hibernate-core/src/test/java/org/hibernate/internal/util/xml/XMLHelper.java M hibernate-core/src/test/java/org/hibernate/internal/util/xml/XMLMappingHelper.java R hibernate-core/src/test/java/org/hibernate/internal/util/xml/XmlMappingOptionsStrategyRegistrationProvider.java M hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/orm.xml M hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java M hibernate-core/src/test/java/org/hibernate/orm/test/filter/Salesperson.java M hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/ElementCollectionConverterTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/LegacyElementCollectionConverterTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/LegacyJPAOverriddenAnnotationReaderTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/LegacyXMLContextTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyEjb3XmlElementCollectionTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyEjb3XmlManyToManyTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyEjb3XmlManyToOneTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyEjb3XmlOneToManyTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyEjb3XmlOneToOneTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyEjb3XmlTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyEjb3XmlTestCase.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyNonExistentOrmVersionTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyOrmVersion1SupportedTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyPreParsedOrmXmlTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/PreParsedOrmXmlTest.java A hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java A hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java R hibernate-core/src/test/resources/META-INF/services/org.hibernate.boot.registry.selector.StrategyRegistrationProvider M hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/embeddables/collection/orm.xml M hibernate-entitymanager/hibernate-entitymanager.gradle M hibernate-envers/hibernate-envers.gradle M hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/AdditionalJaxbMappingProducerImpl.java M hibernate-osgi/hibernate-osgi.gradle M hibernate-spatial/hibernate-spatial.gradle M tooling/hibernate-enhance-maven-plugin/hibernate-enhance-maven-plugin.gradle Log Message: ----------- Merge remote-tracking branch 'upstream/main' into wip/6.0_merge_1 Commit: 8d981a82bb4321f1cf8d13e7744566a95205abd5 https://github.com/hibernate/hibernate-orm/commit/8d981a82bb4321f1cf8d13e... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2021-04-20 (Tue, 20 Apr 2021) Changed paths: M hibernate-core/hibernate-core.gradle M hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java M hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java R hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/DefaultXmlMappingOptions.java M hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java R hibernate-core/src/main/java/org/hibernate/boot/jaxb/spi/XmlMappingOptions.java M hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java M hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java M hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributeSource.java M hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java M hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java M hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java M hibernate-core/src/main/java/org/hibernate/boot/spi/XmlMappingBinderAccess.java R hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAMetadataProvider.java R hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverriddenAnnotationReader.java R hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/JPAXMLOverriddenAnnotationReader.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/JPAXMLOverriddenMetadataProvider.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/XMLContext.java M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java M hibernate-core/src/main/java/org/hibernate/event/internal/FlushVisitor.java M hibernate-core/src/main/java/org/hibernate/event/internal/WrapVisitor.java M hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java M hibernate-core/src/main/java/org/hibernate/tuple/Tuplizer.java M hibernate-core/src/main/java/org/hibernate/type/CollectionType.java R hibernate-core/src/test/java/org/hibernate/internal/util/xml/XMLHelper.java M hibernate-core/src/test/java/org/hibernate/internal/util/xml/XMLMappingHelper.java R hibernate-core/src/test/java/org/hibernate/internal/util/xml/XmlMappingOptionsStrategyRegistrationProvider.java M hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/orm.xml M hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java M hibernate-core/src/test/java/org/hibernate/orm/test/filter/Salesperson.java M hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/ElementCollectionConverterTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/LegacyElementCollectionConverterTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/LegacyJPAOverriddenAnnotationReaderTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/LegacyXMLContextTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyEjb3XmlElementCollectionTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyEjb3XmlManyToManyTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyEjb3XmlManyToOneTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyEjb3XmlOneToManyTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyEjb3XmlOneToOneTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyEjb3XmlTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyEjb3XmlTestCase.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyNonExistentOrmVersionTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyOrmVersion1SupportedTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/LegacyPreParsedOrmXmlTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/PreParsedOrmXmlTest.java A hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java A hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java R hibernate-core/src/test/resources/META-INF/services/org.hibernate.boot.registry.selector.StrategyRegistrationProvider M hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/embeddables/collection/orm.xml M hibernate-entitymanager/hibernate-entitymanager.gradle M hibernate-envers/hibernate-envers.gradle M hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/AdditionalJaxbMappingProducerImpl.java M hibernate-osgi/hibernate-osgi.gradle M hibernate-spatial/hibernate-spatial.gradle M tooling/hibernate-enhance-maven-plugin/hibernate-enhance-maven-plugin.gradle Log Message: ----------- Merge branch 'wip/6.0_merge_1' into wip/6.0_merge_3 Compare: https://github.com/hibernate/hibernate-orm/compare/4330d7345bc6...8d981a8...