HHH-9956 - Enable derby database profile

hibernate · Jul 21, 2015 · 6af8944 · 6af8944
1 parent 805600d
commit 6af8944
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -137,8 +137,6 @@ subprojects { subProject ->
 		testRuntime( libraries.h2 )
 		testRuntime( libraries.woodstox )
 
-		testRuntime( 'org.apache.derby:derby:10.10.2.0' )
-
 		// 6.6 gave me some NPE problems from within checkstyle...
 		checkstyle 'com.puppycrawl.tools:checkstyle:6.5'
 	}

diff --git a/databases/derby/resources/hibernate.properties b/databases/derby/resources/hibernate.properties
@@ -7,7 +7,7 @@
 
 hibernate.dialect org.hibernate.dialect.DerbyTenSevenDialect
 hibernate.connection.driver_class org.apache.derby.jdbc.EmbeddedDriver
-hibernate.connection.url jdbc:derby:hibernate_orm_test
+hibernate.connection.url jdbc:derby:target/tmp/derby/hibernate_orm_test;databaseName=hibernate_orm_test;create=true
 hibernate.connection.username hibernate_orm_test
 hibernate.connection.password hibernate_orm_test
 

diff --git a/hibernate-core/src/test/resources/hibernate.properties b/hibernate-core/src/test/resources/hibernate.properties
@@ -5,18 +5,11 @@
 # See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
 #
 
-#hibernate.dialect org.hibernate.dialect.H2Dialect
-#hibernate.connection.driver_class org.h2.Driver
-##hibernate.connection.url jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE
-#hibernate.connection.url jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1
-#hibernate.connection.username sa
-
-
-hibernate.dialect org.hibernate.dialect.DerbyTenSevenDialect
-hibernate.connection.driver_class org.apache.derby.jdbc.EmbeddedDriver
-hibernate.connection.url jdbc:derby:hibernate_orm_test;create=true
-hibernate.connection.username hibernate_orm_test
-hibernate.connection.password hibernate_orm_test
+hibernate.dialect org.hibernate.dialect.H2Dialect
+hibernate.connection.driver_class org.h2.Driver
+#hibernate.connection.url jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE
+hibernate.connection.url jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1
+hibernate.connection.username sa
 
 hibernate.connection.pool_size 5