Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: 0def0abcac06309c7ce5dde349458624116727e0 https://github.com/hibernate/hibernate-orm/commit/0def0abcac06309c7ce5dde... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2015-01-05 (Mon, 05 Jan 2015) Changed paths: M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExportTask.java M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdateTask.java M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidatorTask.java A hibernate-core/src/test/java/org/hibernate/test/schematoolsnaming/Matrix.java A hibernate-core/src/test/java/org/hibernate/test/schematoolsnaming/StandaloneSchemaToolsNamingTest.java A hibernate-core/src/test/resources/org/hibernate/test/schematoolsnaming/hibernate.cfg.xml Log Message: ----------- HHH-9467 : Cannot enable NamingStrategyDelegator implementations using standalone schema tools (cherry picked from commit 4bf3b162ad00ee977d65c02ef0f6db6fe29bde85) Conflicts: hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExportTask.java hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdateTask.java hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidatorTask.java