[hibernate-commits] [hibernate/hibernate-orm] b35059: HHH-12858 - integration overrides during JPA boots...
Branch: refs/heads/master
Home: https://github.com/hibernate/hibernate-orm
Commit: b350599442f8ff7e4da7aeb99f43cd9453e30fc0
https://github.com/hibernate/hibernate-orm/commit/b350599442f8ff7e4da7aeb...
Author: Steve Ebersole <steve(a)hibernate.org>
Date: 2019-10-03 (Thu, 03 Oct 2019)
Changed paths:
M hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/LoadedConfig.java
M
hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterSourceImpl.java
M
hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/Helper.java
M
hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java
A hibernate-core/src/main/java/org/hibernate/internal/util/NullnessHelper.java
M
hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
M
hibernate-core/src/test/java/org/hibernate/internal/MaskSensitiveInformationTest.java
M
hibernate-core/src/test/java/org/hibernate/jpa/test/connection/DataSourceInjectionTest.java
M
hibernate-core/src/test/java/org/hibernate/jpa/test/connection/PersistenceUnitInfoImpl.java
R hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/DataSourceStub.java
R
hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/PersistenceUnitInfoTests.java
R
hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/PersistenceUnitOverridesTests.java
A
hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitInfoTests.java
A
hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitOverridesTests.java
A hibernate-testing/src/main/java/org/hibernate/testing/jdbc/DataSourceStub.java
Log Message:
-----------
HHH-12858 - integration overrides during JPA bootstrap ought to override all logically
related settings
- e.g. a datasource passed in the integration overrides map ought to effectively
override JDBC-connection settings in `persistence.xml` (and vice-versa)
HHH-13432 - Have EntityManagerFactory expose persistence.xml `jta-data-source` element as
a `javax.persistence.nonJtaDataSource` property