ee44d9be7f
Conflicts: hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java hibernate-core/src/main/java/org/hibernate/boot/registry/internal/StandardServiceRegistryImpl.java hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java |
||
---|---|---|
.. | ||
src/main/java/org/hibernate/testing | ||
hibernate-testing.gradle |