Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:hibernate/hibernate-core 

Conflicts:
	build.gradle
This commit is contained in:
Steve Ebersole 2010-10-12 15:49:09 -05:00
parent 39749511e2 ee6bde2957
commit 0b9888e0e5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@ -75,7 +75,7 @@ libraries = [
subprojects { subProject ->
apply plugin: 'idea'
apply plugin: 'maven'
apply plugin: 'eclipse'
defaultTasks 'build'
@ -159,6 +159,9 @@ subprojects { subProject ->
module.dependencies*.exported = true
}
}
eclipseClasspath {
plusConfigurations.add( configurations.provided )
}
// elements used to customize the generated POM used during upload
def pomConfig = {

2
hibernate-core/src/test/java/org/hibernate/TestingDatabaseInfo.java
View File

@ -33,7 +33,7 @@ import org.hibernate.dialect.H2Dialect;
*/
public class TestingDatabaseInfo {
public static volatile String DRIVER = "org.h2.Driver";
public static volatile String URL = "jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1";
public static volatile String URL = "jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE";
public static volatile String USER = "sa";
public static volatile String PASS = "";