[hibernate-commits] [hibernate/hibernate-orm] 7eb091: HHH-12858 + HHH-13432 Persistence.createEntityMana...

Andrea Boriero noreply at github.com
Tue Jan 7 17:06:44 EST 2020


  Branch: refs/heads/5.3
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: 7eb0911fd6c2634152cbf742422aef50d963f9b2
      https://github.com/hibernate/hibernate-orm/commit/7eb0911fd6c2634152cbf742422aef50d963f9b2
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M build.gradle
    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
    A hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/SchemaToolingAutoActionTests.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-core/src/test/java/org/hibernate/orm/test/bootstrap/package-info.java
    M hibernate-testing/src/main/java/org/hibernate/testing/env/ConnectionProviderBuilder.java
    A hibernate-testing/src/main/java/org/hibernate/testing/jdbc/DataSourceStub.java
    A hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/DelegatingPersistenceUnitInfo.java
    A hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/PersistenceUnitInfoAdapter.java
    A hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/PersistenceUnitInfoPropertiesWrapper.java
    M tooling/hibernate-gradle-plugin/src/main/groovy/org/hibernate/orm/tooling/gradle/HibernatePlugin.java

  Log Message:
  -----------
  HHH-12858 + HHH-13432 Persistence.createEntityManagerFactory(Map) should allow overwriting jta-data-source of persistence.xml

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


  Commit: cec3107e13cef9d04cb34c7f53864c0d63a767a4
      https://github.com/hibernate/hibernate-orm/commit/cec3107e13cef9d04cb34c7f53864c0d63a767a4
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitOverridesTests.java
    A hibernate-core/src/test/resources/org/hibernate/orm/test/bootstrap/jpa/hibernate.cfg.xml

  Log Message:
  -----------
  HHH-12858 - integration overrides during JPA bootstrap ought to override all logically related settings
HHH-13432 - Have EntityManagerFactory expose persistence.xml `jta-data-source` element as a `javax.persistence.nonJtaDataSource` property

(cherry picked from commit fd72e4f75f73703511b9b47fbcc15a0438a69c2d)


  Commit: 814a5ce6e209769b85b79f1d63bdbca5e486f6e5
      https://github.com/hibernate/hibernate-orm/commit/814a5ce6e209769b85b79f1d63bdbca5e486f6e5
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitOverridesTests.java
    M hibernate-core/src/test/resources/org/hibernate/orm/test/bootstrap/jpa/hibernate.cfg.xml

  Log Message:
  -----------
  HHH-12858 - integration overrides during JPA bootstrap ought to override all logically related settings
HHH-13432 - Have EntityManagerFactory expose persistence.xml `jta-data-source` element as a `javax.persistence.nonJtaDataSource` property

(cherry picked from commit ab508d2afacd3aa564d2a71ad067b2e11adebba7)


  Commit: f0ffae019874941863e71fe4f43d7df6025b99f6
      https://github.com/hibernate/hibernate-orm/commit/f0ffae019874941863e71fe4f43d7df6025b99f6
  Author: Andrea Boriero <andrea at hibernate.org>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitOverridesTests.java

  Log Message:
  -----------
  HHH-12858 HHH-13432 fix Oracle failing tests

(cherry picked from commit 1c840f9dd17c75f1e01667fe26b71753f97c7168)


Compare: https://github.com/hibernate/hibernate-orm/compare/3e1663a66ecd...f0ffae019874


More information about the hibernate-commits mailing list