c33fdae563
Conflicts: hibernate-core/src/main/java/org/hibernate/LockOptions.java hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCollectionCacheEntry.java hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredMapCacheEntry.java hibernate-core/src/main/java/org/hibernate/cache/spi/entry/UnstructuredCacheEntry.java hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java hibernate-core/src/main/java/org/hibernate/id/TableGenerator.java hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java hibernate-core/src/main/java/org/hibernate/metamodel/relational/Database.java hibernate-core/src/main/java/org/hibernate/metamodel/relational/Table.java hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/HibernateTypeResolver.java hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/Index.java hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/UniqueKey.java hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java hibernate-core/src/main/java/org/hibernate/type/ArrayType.java hibernate-core/src/main/java/org/hibernate/type/Type.java hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintTest.java hibernate-core/src/test/java/org/hibernate/test/component/basic2/ComponentJoinsTest.java hibernate-core/src/test/java/org/hibernate/test/criterion/CriterionTest.java hibernate-core/src/test/resources/org/hibernate/test/propertyref/inheritence/union/Person.hbm.xml hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java |
||
|---|---|---|
| .. | ||
| demo | ||
| main | ||
| test | ||