Remove MVCC from H2 DataSource URL

puneetbehl · puneetbehl · commit 91ddd0dc9cf1 · 2020-09-15T16:52:58.000+05:30
diff --git a/boot-plugin/src/test/groovy/org/grails/datastore/gorm/boot/autoconfigure/HibernateGormAutoConfigurationSpec.groovy b/boot-plugin/src/test/groovy/org/grails/datastore/gorm/boot/autoconfigure/HibernateGormAutoConfigurationSpec.groovy
@@ -29,7 +29,7 @@ class HibernateGormAutoConfigurationSpec extends Specification{
         AutoConfigurationPackages.register(context, "org.grails.datastore.gorm.boot.autoconfigure")
         this.context.getEnvironment().getPropertySources().addFirst(new MapPropertySource("foo", ['hibernate.hbm2ddl.auto':'create']))
         def beanFactory = this.context.defaultListableBeanFactory
-        beanFactory.registerSingleton("dataSource", new DriverManagerDataSource("jdbc:h2:mem:grailsDb1;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_DELAY=-1", 'sa', ''))
+        beanFactory.registerSingleton("dataSource", new DriverManagerDataSource("jdbc:h2:mem:grailsDb1;LOCK_TIMEOUT=10000;DB_CLOSE_DELAY=-1", 'sa', ''))
         this.context.register( TestConfiguration.class,
                 PropertyPlaceholderAutoConfiguration.class);
     }
diff --git a/examples/grails3-database-per-tenant/grails-app/conf/application.yml b/examples/grails3-database-per-tenant/grails-app/conf/application.yml
@@ -79,10 +79,10 @@ dataSource:
   jmxExport: true
   driverClassName: org.h2.Driver
   dbCreate: create-drop
-  url: jdbc:h2:mem:books;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+  url: jdbc:h2:mem:books;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
 
 dataSources:
     moreBooks:
-        url: jdbc:h2:mem:moreBooks;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+        url: jdbc:h2:mem:moreBooks;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
     evenMoreBooks:
-        url: jdbc:h2:mem:evenMoreBooks;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+        url: jdbc:h2:mem:evenMoreBooks;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
diff --git a/examples/grails3-hibernate5/grails-app/conf/application.yml b/examples/grails3-hibernate5/grails-app/conf/application.yml
@@ -90,15 +90,15 @@ environments:
     development:
         dataSource:
             dbCreate: create-drop
-            url: jdbc:h2:mem:devDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+            url: jdbc:h2:mem:devDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
     test:
         dataSource:
             dbCreate: update
-            url: jdbc:h2:mem:testDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+            url: jdbc:h2:mem:testDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
     production:
         dataSource:
             dbCreate: update
-            url: jdbc:h2:./prodDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+            url: jdbc:h2:./prodDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
             properties:
                 jmxEnabled: true
                 initialSize: 5
diff --git a/examples/grails3-multiple-datasources/grails-app/conf/application.yml b/examples/grails3-multiple-datasources/grails-app/conf/application.yml
@@ -75,10 +75,10 @@ dataSources:
       jmxExport: true
       driverClassName: org.h2.Driver
       dbCreate: create-drop
-      url: jdbc:h2:mem:devDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+      url: jdbc:h2:mem:devDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
     secondary:
         pooled: true
         jmxExport: true
         driverClassName: org.h2.Driver
         dbCreate: create-drop
-        url: jdbc:h2:mem:devDb2;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+        url: jdbc:h2:mem:devDb2;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
diff --git a/examples/grails3-partitioned-multi-tenancy/grails-app/conf/application.yml b/examples/grails3-partitioned-multi-tenancy/grails-app/conf/application.yml
@@ -79,4 +79,4 @@ dataSource:
   jmxExport: true
   driverClassName: org.h2.Driver
   dbCreate: create-drop
-  url: jdbc:h2:mem:books;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+  url: jdbc:h2:mem:books;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
diff --git a/examples/grails3-schema-per-tenant/grails-app/conf/application.yml b/examples/grails3-schema-per-tenant/grails-app/conf/application.yml
@@ -79,5 +79,5 @@ dataSource:
   jmxExport: true
   driverClassName: org.h2.Driver
   dbCreate: create-drop
-  url: jdbc:h2:mem:books;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+  url: jdbc:h2:mem:books;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
 
diff --git a/examples/spring-boot-hibernate5/src/main/resources/application.yml b/examples/spring-boot-hibernate5/src/main/resources/application.yml
@@ -9,4 +9,4 @@ dataSource:
     jmxExport: true
     driverClassName: org.h2.Driver
     dbCreate: create-drop
-    url: jdbc:h2:mem:devDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+    url: jdbc:h2:mem:devDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
diff --git a/examples/test-data-service/grails-app/conf/application.yml b/examples/test-data-service/grails-app/conf/application.yml
@@ -87,15 +87,15 @@ environments:
     development:
         dataSource:
             dbCreate: create-drop
-            url: jdbc:h2:mem:devDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+            url: jdbc:h2:mem:devDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
     test:
         dataSource:
             dbCreate: update
-            url: jdbc:h2:mem:testDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+            url: jdbc:h2:mem:testDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
     production:
         dataSource:
             dbCreate: none
-            url: jdbc:h2:./prodDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+            url: jdbc:h2:./prodDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
             properties:
                 jmxEnabled: true
                 initialSize: 5
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SchemaNameSpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SchemaNameSpec.groovy
@@ -15,7 +15,7 @@ import spock.lang.Specification
  */
 class SchemaNameSpec extends Specification {
 
-    @Shared @AutoCleanup HibernateDatastore datastore = new HibernateDatastore(['dataSource.url':'jdbc:h2:mem:grailsDB;MVCC=TRUE;LOCK_TIMEOUT=10000;INIT=create schema if not exists myschema', (Settings.SETTING_DB_CREATE):'create-drop'],CustomSchema)
+    @Shared @AutoCleanup HibernateDatastore datastore = new HibernateDatastore(['dataSource.url':'jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000;INIT=create schema if not exists myschema', (Settings.SETTING_DB_CREATE):'create-drop'],CustomSchema)
     @Shared PlatformTransactionManager transactionManager = datastore.getTransactionManager()
 
     @Rollback
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy
@@ -19,15 +19,15 @@ import spock.lang.Specification
 class UniqueWithMultipleDataSourcesSpec extends Specification {
 
     @Shared Map config = [
-            'dataSource.url':"jdbc:h2:mem:grailsDB;MVCC=TRUE;LOCK_TIMEOUT=10000",
+            'dataSource.url':"jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000",
             'dataSource.dbCreate': 'update',
             'dataSource.dialect': H2Dialect.name,
             'dataSource.formatSql': 'true',
             'hibernate.flush.mode': 'COMMIT',
             'hibernate.cache.queries': 'true',
             'hibernate.cache':['use_second_level_cache':true,'region.factory_class':'org.hibernate.cache.ehcache.EhCacheRegionFactory'],
             'hibernate.hbm2ddl.auto': 'create',
-            'dataSources.second':[url:"jdbc:h2:mem:second;MVCC=TRUE;LOCK_TIMEOUT=10000"],
+            'dataSources.second':[url:"jdbc:h2:mem:second;LOCK_TIMEOUT=10000"],
     ]
 
     @Shared @AutoCleanup HibernateDatastore hibernateDatastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config),Abc)
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy
@@ -19,7 +19,7 @@ import spock.lang.Specification
 class GlobalConstraintWithCompositeIdSpec extends Specification {
 
     @Shared Map config = [
-            'dataSource.url':"jdbc:h2:mem:grailsDB;MVCC=TRUE;LOCK_TIMEOUT=10000",
+            'dataSource.url':"jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000",
             'dataSource.dbCreate': 'update',
             'dataSource.dialect': H2Dialect.name,
             'dataSource.formatSql': 'true',
@@ -116,4 +116,4 @@ class DomainB {
         name nullable: false, blank: false, unique: "domainB"
         someOther nullable: false, blank: false, unique: true
     }
-}
+}
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy
@@ -24,7 +24,7 @@ class MultiTenancyBidirectionalManyToManySpec extends Specification {
     final Map config = [
             "grails.gorm.multiTenancy.mode":MultiTenancySettings.MultiTenancyMode.DISCRIMINATOR,
             "grails.gorm.multiTenancy.tenantResolverClass":SystemPropertyTenantResolver.name,
-            'dataSource.url':"jdbc:h2:mem:grailsDB;MVCC=TRUE;LOCK_TIMEOUT=10000",
+            'dataSource.url':"jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000",
             'dataSource.dialect': H2Dialect.name,
             'dataSource.formatSql': 'true',
             'hibernate.flush.mode': 'COMMIT',
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy
@@ -24,7 +24,7 @@ class MultiTenancyUnidirectionalOneToManySpec extends Specification {
         Map config = [
                 "grails.gorm.multiTenancy.mode":MultiTenancySettings.MultiTenancyMode.DISCRIMINATOR,
                 "grails.gorm.multiTenancy.tenantResolverClass":SystemPropertyTenantResolver.name,
-                'dataSource.url':"jdbc:h2:mem:grailsDB;MVCC=TRUE;LOCK_TIMEOUT=10000",
+                'dataSource.url':"jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000",
                 'dataSource.dialect': H2Dialect.name,
                 'dataSource.formatSql': 'true',
                 'hibernate.flush.mode': 'COMMIT',
@@ -109,4 +109,4 @@ class Vehicle implements MultiTenant<Vehicle> {
     static mapping = {
         tenantId name:'manufacturer'
     }
-}
+}
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/txs/TransactionPropagationSpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/txs/TransactionPropagationSpec.groovy
@@ -16,12 +16,9 @@
 package grails.gorm.tests.txs
 
 import grails.gorm.annotation.Entity
-import grails.gorm.tests.services.Attribute
-import grails.gorm.tests.services.Product
 import grails.gorm.transactions.ReadOnly
 import grails.gorm.transactions.Transactional
 import org.grails.orm.hibernate.HibernateDatastore
-import org.springframework.transaction.TransactionStatus
 import org.springframework.transaction.annotation.Propagation
 import spock.lang.AutoCleanup
 import spock.lang.Issue
@@ -87,4 +84,4 @@ class Book {
 
     static constraints = {
     }
-}
+}
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/DataSourceConnectionSourceFactorySpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/DataSourceConnectionSourceFactorySpec.groovy
@@ -16,7 +16,7 @@ class DataSourceConnectionSourceFactorySpec extends Specification {
         when:
         DataSourceConnectionSourceFactory factory = new DataSourceConnectionSourceFactory()
         Map config = [
-                'dataSource.url':"jdbc:h2:mem:grailsDB;MVCC=TRUE;LOCK_TIMEOUT=10000",
+                'dataSource.url':"jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000",
                 'dataSource.dbCreate': 'update',
                 'dataSource.dialect': Oracle8iDialect.name,
                 'dataSource.properties.dbProperties': [useSSL: false]
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactorySpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactorySpec.groovy
@@ -19,7 +19,7 @@ class HibernateConnectionSourceFactorySpec extends Specification {
 
         HibernateConnectionSourceFactory factory = new HibernateConnectionSourceFactory(Foo)
         Map config = [
-                'dataSource.url':"jdbc:h2:mem:grailsDB;MVCC=TRUE;LOCK_TIMEOUT=10000",
+                'dataSource.url':"jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000",
                 'dataSource.dbCreate': 'update',
                 'dataSource.dialect': H2Dialect.name,
                 'dataSource.formatSql': 'true',
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceConnectionsSpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceConnectionsSpec.groovy
@@ -16,15 +16,15 @@ import spock.lang.Specification
  */
 class MultipleDataSourceConnectionsSpec extends Specification {
     @Shared  Map config = [
-            'dataSource.url':"jdbc:h2:mem:grailsDB;MVCC=TRUE;LOCK_TIMEOUT=10000",
+            'dataSource.url':"jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000",
             'dataSource.dbCreate': 'create-drop',
             'dataSource.dialect': H2Dialect.name,
             'dataSource.formatSql': 'true',
             'hibernate.flush.mode': 'COMMIT',
             'hibernate.cache.queries': 'true',
             'hibernate.hbm2ddl.auto': 'create-drop',
-            'dataSources.books':[url:"jdbc:h2:mem:books;MVCC=TRUE;LOCK_TIMEOUT=10000"],
-            'dataSources.moreBooks.url':"jdbc:h2:mem:moreBooks;MVCC=TRUE;LOCK_TIMEOUT=10000",
+            'dataSources.books':[url:"jdbc:h2:mem:books;LOCK_TIMEOUT=10000"],
+            'dataSources.moreBooks.url':"jdbc:h2:mem:moreBooks;LOCK_TIMEOUT=10000",
             'dataSources.moreBooks.hibernate.default_schema':"schema2"
     ]
 
@@ -83,7 +83,7 @@ class MultipleDataSourceConnectionsSpec extends Specification {
                                                                        dbCreate       : "create-drop",
                                                                        logSql         : false,
                                                                        formatSql      : true,
-                                                                       url            : "jdbc:h2:mem:yetAnotherDB;MVCC=TRUE;LOCK_TIMEOUT=10000"])
+                                                                       url            : "jdbc:h2:mem:yetAnotherDB;LOCK_TIMEOUT=10000"])
 
         then:"The other data sources have not been touched"
         Author.withTransaction { Author.count() } == 1
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceMetadataSpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceMetadataSpec.groovy
@@ -12,8 +12,8 @@ class MultipleDataSourceMetadataSpec extends Specification {
 
     @Shared
     Map config = [
-            "dataSources.apples.url": "jdbc:h2:mem:apples;MVCC=TRUE;LOCK_TIMEOUT=10000",
-            "dataSources.oranges.url": "jdbc:h2:mem:oranges;MVCC=TRUE;LOCK_TIMEOUT=10000"
+            "dataSources.apples.url": "jdbc:h2:mem:apples;LOCK_TIMEOUT=10000",
+            "dataSources.oranges.url": "jdbc:h2:mem:oranges;LOCK_TIMEOUT=10000"
     ]
 
     @AutoCleanup
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy
@@ -14,16 +14,16 @@ class MultipleDataSourcesWithCachingSpec extends Specification {
     void "Test map to multiple data sources"() {
         given:"A configuration for multiple data sources"
         Map config = [
-                'dataSource.url':"jdbc:h2:mem:grailsDB;MVCC=TRUE;LOCK_TIMEOUT=10000",
+                'dataSource.url':"jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000",
                 'dataSource.dbCreate': 'update',
                 'dataSource.dialect': H2Dialect.name,
                 'dataSource.formatSql': 'true',
                 'hibernate.flush.mode': 'COMMIT',
                 'hibernate.cache.queries': 'true',
                 'hibernate.cache':['use_second_level_cache':true,'region.factory_class':'org.hibernate.cache.ehcache.EhCacheRegionFactory'],
                 'hibernate.hbm2ddl.auto': 'create',
-                'dataSources.books':[url:"jdbc:h2:mem:books;MVCC=TRUE;LOCK_TIMEOUT=10000"],
-                'dataSources.moreBooks':[url:"jdbc:h2:mem:moreBooks;MVCC=TRUE;LOCK_TIMEOUT=10000"]
+                'dataSources.books':[url:"jdbc:h2:mem:books;LOCK_TIMEOUT=10000"],
+                'dataSources.moreBooks':[url:"jdbc:h2:mem:moreBooks;LOCK_TIMEOUT=10000"]
         ]
 
         when:
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy
@@ -17,15 +17,15 @@ class MultipleDataSourcesWithEventsSpec extends Specification {
     void "Test multiple data sources register the correct events"() {
         given:"A configuration for multiple data sources"
         Map config = [
-                'dataSource.url':"jdbc:h2:mem:grailsDB;MVCC=TRUE;LOCK_TIMEOUT=10000",
+                'dataSource.url':"jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000",
                 'dataSource.dbCreate': 'update',
                 'dataSource.dialect': H2Dialect.name,
                 'dataSource.formatSql': 'true',
                 'hibernate.flush.mode': 'COMMIT',
                 'hibernate.cache.queries': 'true',
                 'hibernate.cache':['use_second_level_cache':true,'region.factory_class':'org.hibernate.cache.ehcache.EhCacheRegionFactory'],
                 'hibernate.hbm2ddl.auto': 'create',
-                'dataSources.books':[url:"jdbc:h2:mem:books;MVCC=TRUE;LOCK_TIMEOUT=10000"]
+                'dataSources.books':[url:"jdbc:h2:mem:books;LOCK_TIMEOUT=10000"]
         ]
 
         when:"A entity is saved with the default connection"
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy
@@ -34,7 +34,7 @@ class PartitionedMultiTenancySpec extends Specification {
         Map config = [
                 "grails.gorm.multiTenancy.mode":MultiTenancySettings.MultiTenancyMode.DISCRIMINATOR,
                 "grails.gorm.multiTenancy.tenantResolverClass":MyTenantResolver,
-                'dataSource.url':"jdbc:h2:mem:grailsDB;MVCC=TRUE;LOCK_TIMEOUT=10000",
+                'dataSource.url':"jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000",
                 'dataSource.dbCreate': 'update',
                 'dataSource.dialect': H2Dialect.name,
                 'dataSource.formatSql': 'true',
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy
@@ -27,7 +27,7 @@ class SchemaMultiTenantSpec extends Specification {
         Map config = [
                 "grails.gorm.multiTenancy.mode":"SCHEMA",
                 "grails.gorm.multiTenancy.tenantResolverClass":MyResolver,
-                'dataSource.url':"jdbc:h2:mem:grailsDB;MVCC=TRUE;LOCK_TIMEOUT=10000",
+                'dataSource.url':"jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000",
                 'dataSource.dbCreate': 'update',
                 'dataSource.dialect': H2Dialect.name,
                 'dataSource.formatSql': 'true',
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SecondLevelCacheSpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SecondLevelCacheSpec.groovy
@@ -13,7 +13,7 @@ class SecondLevelCacheSpec extends Specification {
     @Shared @AutoCleanup HibernateDatastore datastore
     void setupSpec() {
         Map config = [
-                'dataSource.url':"jdbc:h2:mem:grailsDB;MVCC=TRUE;LOCK_TIMEOUT=10000",
+                'dataSource.url':"jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000",
                 'dataSource.dbCreate': 'update',
                 'dataSource.dialect': H2Dialect.name,
                 'dataSource.formatSql': 'true',
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy
@@ -27,15 +27,15 @@ class SingleTenantSpec extends Specification {
         Map config = [
                 "grails.gorm.multiTenancy.mode":"DATABASE",
                 "grails.gorm.multiTenancy.tenantResolverClass":SystemPropertyTenantResolver,
-                'dataSource.url':"jdbc:h2:mem:grailsDB;MVCC=TRUE;LOCK_TIMEOUT=10000",
+                'dataSource.url':"jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000",
                 'dataSource.dbCreate': 'update',
                 'dataSource.dialect': H2Dialect.name,
                 'dataSource.formatSql': 'true',
                 'hibernate.flush.mode': 'COMMIT',
                 'hibernate.cache.queries': 'true',
                 'hibernate.hbm2ddl.auto': 'create',
-                'dataSources.books':[url:"jdbc:h2:mem:books;MVCC=TRUE;LOCK_TIMEOUT=10000"],
-                'dataSources.moreBooks':[url:"jdbc:h2:mem:moreBooks;MVCC=TRUE;LOCK_TIMEOUT=10000"]
+                'dataSources.books':[url:"jdbc:h2:mem:books;LOCK_TIMEOUT=10000"],
+                'dataSources.moreBooks':[url:"jdbc:h2:mem:moreBooks;LOCK_TIMEOUT=10000"]
         ]
 
         HibernateDatastore datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config),Book, SingleTenantAuthor )
diff --git a/grails-plugin/src/main/groovy/grails/orm/bootstrap/HibernateDatastoreSpringInitializer.groovy b/grails-plugin/src/main/groovy/grails/orm/bootstrap/HibernateDatastoreSpringInitializer.groovy
@@ -49,7 +49,7 @@ class HibernateDatastoreSpringInitializer extends AbstractDatastoreInitializer {
     public static final String SESSION_FACTORY_BEAN_NAME = "sessionFactory"
     public static final String DEFAULT_DATA_SOURCE_NAME = Settings.SETTING_DATASOURCE
     public static final String DATA_SOURCES = Settings.SETTING_DATASOURCES;
-    public static final String TEST_DB_URL = "jdbc:h2:mem:grailsDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_DELAY=-1"
+    public static final String TEST_DB_URL = "jdbc:h2:mem:grailsDb;LOCK_TIMEOUT=10000;DB_CLOSE_DELAY=-1"
 
     String defaultDataSourceBeanName = ConnectionSource.DEFAULT
     String defaultSessionFactoryBeanName = SESSION_FACTORY_BEAN_NAME
diff --git a/grails-plugin/src/test/groovy/grails/orm/bootstrap/HibernateDatastoreSpringInitializerSpec.groovy b/grails-plugin/src/test/groovy/grails/orm/bootstrap/HibernateDatastoreSpringInitializerSpec.groovy
@@ -15,14 +15,14 @@ class HibernateDatastoreSpringInitializerSpec extends Specification{
     void "Test configure multiple data sources"() {
         given:"An initializer instance"
         Map config = [
-                'dataSource.url':"jdbc:h2:mem:people;MVCC=TRUE;LOCK_TIMEOUT=10000",
+                'dataSource.url':"jdbc:h2:mem:people;LOCK_TIMEOUT=10000",
                 'dataSource.dialect': H2Dialect.name,
                 'dataSource.formatSql': 'true',
                 'hibernate.flush.mode': 'COMMIT',
                 'hibernate.cache.queries': 'true',
                 'hibernate.hbm2ddl.auto': 'create',
-                'dataSources.books.url':"jdbc:h2:mem:books;MVCC=TRUE;LOCK_TIMEOUT=10000",
-                'dataSources.moreBooks.url':"jdbc:h2:mem:moreBooks;MVCC=TRUE;LOCK_TIMEOUT=10000"
+                'dataSources.books.url':"jdbc:h2:mem:books;LOCK_TIMEOUT=10000",
+                'dataSources.moreBooks.url':"jdbc:h2:mem:moreBooks;LOCK_TIMEOUT=10000"
         ]
         def datastoreInitializer = new HibernateDatastoreSpringInitializer(config, Person, Book, Author)
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class HibernateGormAutoConfigurationSpec extends Specification{`
`29`	`29`	`AutoConfigurationPackages.register(context, "org.grails.datastore.gorm.boot.autoconfigure")`
`30`	`30`	`this.context.getEnvironment().getPropertySources().addFirst(new MapPropertySource("foo", ['hibernate.hbm2ddl.auto':'create']))`
`31`	`31`	`def beanFactory = this.context.defaultListableBeanFactory`
`32`		`- beanFactory.registerSingleton("dataSource", new DriverManagerDataSource("jdbc:h2:mem:grailsDb1;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_DELAY=-1", 'sa', ''))`
	`32`	`+ beanFactory.registerSingleton("dataSource", new DriverManagerDataSource("jdbc:h2:mem:grailsDb1;LOCK_TIMEOUT=10000;DB_CLOSE_DELAY=-1", 'sa', ''))`
`33`	`33`	`this.context.register( TestConfiguration.class,`
`34`	`34`	`PropertyPlaceholderAutoConfiguration.class);`
`35`	`35`	`}`