You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by bo...@apache.org on 2026/04/17 17:16:11 UTC

(grails-core) branch 8.0.x-hibernate7 updated: fixed OOM

This is an automated email from the ASF dual-hosted git repository.

borinquenkid pushed a commit to branch 8.0.x-hibernate7
in repository https://gitbox.apache.org/repos/asf/grails-core.git


The following commit(s) were added to refs/heads/8.0.x-hibernate7 by this push:
     new 61818f00f7 fixed OOM
61818f00f7 is described below

commit 61818f00f7763ba1d7c8f0e22708653f702d018d
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Fri Apr 17 12:16:05 2026 -0500

    fixed OOM
---
 .gitignore                                            |  1 +
 .../CompositeIdWithDeepOneToManyMappingSpec.groovy    |  4 +---
 .../GlobalConstraintWithCompositeIdSpec.groovy        |  4 +---
 .../MultiTenancyBidirectionalManyToManySpec.groovy    |  7 +++++--
 .../MultiTenancyUnidirectionalOneToManySpec.groovy    | 19 ++++++++++++++-----
 .../orm/hibernate/HibernateDatastoreSpec.groovy       |  6 +++++-
 .../MultipleDataSourcesWithCachingSpec.groovy         | 11 ++++++++---
 .../MultipleDataSourcesWithEventsSpec.groovy          |  6 +++++-
 .../connections/PartitionedMultiTenancySpec.groovy    |  2 ++
 .../connections/SchemaMultiTenantSpec.groovy          | 13 ++++++++++---
 .../orm/hibernate/connections/SingleTenantSpec.groovy | 14 +++++++++++---
 .../MultiTenancyBidirectionalManyToManySpec.groovy    |  5 ++++-
 .../MultiTenancyUnidirectionalOneToManySpec.groovy    | 10 +++++++---
 .../orm/hibernate/HibernateDatastoreSpec.groovy       | 14 ++++++++++++++
 .../MultipleDataSourcesWithCachingSpec.groovy         |  6 +++++-
 .../connections/SchemaMultiTenantSpec.groovy          |  9 ++++++++-
 .../orm/hibernate/connections/SingleTenantSpec.groovy |  9 ++++++++-
 .../HibernateDatastoreSpringInitializerSpec.groovy    |  7 ++++++-
 18 files changed, 115 insertions(+), 32 deletions(-)

diff --git a/.gitignore b/.gitignore
index 951e120356..686da6c755 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,4 @@ STATE_SNAPSHOT.xml
 *VIOLATIONS.md
 /TEST_FAILURES.md
 local-tasks.gradle
+local-init.gradle
diff --git a/grails-data-hibernate5/core/src/test/groovy/grails/gorm/specs/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/specs/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy
index 3441549e5d..9cbfb8a7d2 100644
--- a/grails-data-hibernate5/core/src/test/groovy/grails/gorm/specs/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy
+++ b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/specs/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy
@@ -34,9 +34,7 @@ import spock.lang.Specification
  */
 class CompositeIdWithDeepOneToManyMappingSpec extends Specification {
 
-    @AutoCleanup
-    @Shared
-    HibernateDatastore datastore = new HibernateDatastore(GrandParent, Parent, Child)
+    @Shared @AutoCleanup HibernateDatastore datastore = new HibernateDatastore(GrandParent, Parent, Child)
     @Shared
     PlatformTransactionManager transactionManager = datastore.transactionManager
 
diff --git a/grails-data-hibernate5/core/src/test/groovy/grails/gorm/specs/compositeid/GlobalConstraintWithCompositeIdSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/specs/compositeid/GlobalConstraintWithCompositeIdSpec.groovy
index 5e0eb5b231..17ed205891 100644
--- a/grails-data-hibernate5/core/src/test/groovy/grails/gorm/specs/compositeid/GlobalConstraintWithCompositeIdSpec.groovy
+++ b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/specs/compositeid/GlobalConstraintWithCompositeIdSpec.groovy
@@ -48,9 +48,7 @@ class GlobalConstraintWithCompositeIdSpec extends Specification {
             }
     ]
 
-    @Shared
-    @AutoCleanup
-    HibernateDatastore hibernateDatastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config), ParentB, ChildB, DomainB)
+    @Shared @AutoCleanup HibernateDatastore hibernateDatastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config), ParentB, ChildB, DomainB)
     @Shared
     PlatformTransactionManager transactionManager = hibernateDatastore.transactionManager
 
diff --git a/grails-data-hibernate5/core/src/test/groovy/grails/gorm/specs/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/specs/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy
index 9c5bd4661b..acd1c547f7 100644
--- a/grails-data-hibernate5/core/src/test/groovy/grails/gorm/specs/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy
+++ b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/specs/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy
@@ -57,14 +57,17 @@ class MultiTenancyBidirectionalManyToManySpec extends Specification {
 
     @Shared @AutoCleanup HibernateDatastore datastore
 
-
-    void setup() {
+    void setupSpec() {
         System.setProperty(SystemPropertyTenantResolver.PROPERTY_NAME, "oci")
         datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config), getClass().getPackage() )
         departmentService = datastore.getService(DepartmentService)
         userService = datastore.getService(UserService)
     }
 
+    void setup() {
+        System.setProperty(SystemPropertyTenantResolver.PROPERTY_NAME, "oci")
+    }
+
     @Rollback
     @Issue("https://github.com/grails/grails-data-hibernate5/issues/58")
     void "test hasMany and 'in' query with multi-tenancy" () {
diff --git a/grails-data-hibernate5/core/src/test/groovy/grails/gorm/specs/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/specs/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy
index e6660eebc9..9a7ef95562 100644
--- a/grails-data-hibernate5/core/src/test/groovy/grails/gorm/specs/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy
+++ b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/specs/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy
@@ -25,18 +25,21 @@ import org.grails.datastore.mapping.multitenancy.resolvers.SystemPropertyTenantR
 import grails.gorm.MultiTenant
 import org.grails.orm.hibernate.HibernateDatastore
 import org.hibernate.dialect.H2Dialect
+import spock.lang.AutoCleanup
 import spock.lang.Issue
+import spock.lang.Shared
 import spock.lang.Specification
+import spock.util.environment.RestoreSystemProperties
 
 /**
  * Created by graemerocher on 16/06/2017.
  */
+@RestoreSystemProperties
 class MultiTenancyUnidirectionalOneToManySpec extends Specification {
 
-    @Issue('https://github.com/apache/grails-data-mapping/issues/954')
-    void "test multi-tenancy with unidirectional one-to-many"() {
-        given: "A configuration for schema based multi-tenancy"
-        System.setProperty(SystemPropertyTenantResolver.PROPERTY_NAME, "")
+    @Shared @AutoCleanup HibernateDatastore datastore
+
+    void setupSpec() {
         Map config = [
                 "grails.gorm.multiTenancy.mode"               : MultiTenancySettings.MultiTenancyMode.DISCRIMINATOR,
                 "grails.gorm.multiTenancy.tenantResolverClass": SystemPropertyTenantResolver.name,
@@ -48,7 +51,13 @@ class MultiTenancyUnidirectionalOneToManySpec extends Specification {
                 'hibernate.hbm2ddl.auto'                      : 'create',
         ]
 
-        HibernateDatastore datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config), getClass().getPackage())
+        datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config), getClass().getPackage())
+    }
+
+    @Issue('https://github.com/apache/grails-data-mapping/issues/954')
+    void "test multi-tenancy with unidirectional one-to-many"() {
+        given: "A configuration for schema based multi-tenancy"
+        System.setProperty(SystemPropertyTenantResolver.PROPERTY_NAME, "")
 
         when:
         System.setProperty(SystemPropertyTenantResolver.PROPERTY_NAME, "ford")
diff --git a/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy
index 6b320da48a..249a5d902b 100644
--- a/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy
+++ b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy
@@ -19,6 +19,8 @@
 package org.grails.orm.hibernate
 
 import org.grails.orm.hibernate.cfg.Settings
+import spock.lang.AutoCleanup
+import spock.lang.Shared
 import spock.lang.Specification
 
 /**
@@ -26,10 +28,12 @@ import spock.lang.Specification
  */
 class HibernateDatastoreSpec extends Specification {
 
+    @Shared @AutoCleanup HibernateDatastore datastore
+
     void "test configure via map"() {
         when:"The map constructor is used"
         def config = Collections.singletonMap(Settings.SETTING_DB_CREATE,  "create-drop")
-        HibernateDatastore datastore = new HibernateDatastore(config, Book)
+        datastore = new HibernateDatastore(config, Book)
 
         then:"GORM is configured correctly"
         Book.withNewSession {
diff --git a/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy
index 6c83cc0b50..31d9a41c57 100644
--- a/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy
+++ b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy
@@ -22,6 +22,8 @@ import grails.gorm.annotation.Entity
 import org.grails.datastore.mapping.core.DatastoreUtils
 import org.grails.orm.hibernate.HibernateDatastore
 import org.hibernate.dialect.H2Dialect
+import spock.lang.AutoCleanup
+import spock.lang.Shared
 import spock.lang.Specification
 
 /**
@@ -29,8 +31,9 @@ import spock.lang.Specification
  */
 class MultipleDataSourcesWithCachingSpec extends Specification {
 
-    void "Test map to multiple data sources"() {
-        given:"A configuration for multiple data sources"
+    @Shared @AutoCleanup HibernateDatastore datastore
+
+    void setupSpec() {
         Map config = [
                 'dataSource.url':"jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000",
                 'dataSource.dbCreate': 'update',
@@ -43,9 +46,11 @@ class MultipleDataSourcesWithCachingSpec extends Specification {
                 'dataSources.books':[url:"jdbc:h2:mem:books;LOCK_TIMEOUT=10000"],
                 'dataSources.moreBooks':[url:"jdbc:h2:mem:moreBooks;LOCK_TIMEOUT=10000"]
         ]
+        datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config),CachingBook )
+    }
 
+    void "Test map to multiple data sources"() {
         when:
-        HibernateDatastore datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config),CachingBook )
         CachingBook book = CachingBook.withTransaction {
             new CachingBook(name:"The Stand").save(flush:true)
             CachingBook.get( CachingBook.first().id )
diff --git a/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy
index 2ff65b7a65..203f7786e7 100644
--- a/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy
+++ b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy
@@ -24,6 +24,8 @@ import org.grails.datastore.mapping.core.connections.ConnectionSource
 import org.grails.orm.hibernate.HibernateDatastore
 import org.hibernate.dialect.H2Dialect
 import spock.lang.Issue
+import spock.lang.AutoCleanup
+import spock.lang.Shared
 import spock.lang.Specification
 
 /**
@@ -31,6 +33,8 @@ import spock.lang.Specification
  */
 class MultipleDataSourcesWithEventsSpec extends Specification {
 
+    @Shared @AutoCleanup HibernateDatastore datastore
+
     @Issue('https://github.com/apache/grails-core/issues/10451')
     void "Test multiple data sources register the correct events"() {
         given:"A configuration for multiple data sources"
@@ -47,7 +51,7 @@ class MultipleDataSourcesWithEventsSpec extends Specification {
         ]
 
         when:"A entity is saved with the default connection"
-        HibernateDatastore datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config),EventsBook, SecondaryBook )
+        datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config),EventsBook, SecondaryBook )
         EventsBook book = new EventsBook(name:"test")
         EventsBook.withTransaction {
             book.save(flush:true)
diff --git a/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy
index fd364002fe..e8a601253e 100644
--- a/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy
+++ b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy
@@ -38,11 +38,13 @@ import org.hibernate.dialect.H2Dialect
 import spock.lang.AutoCleanup
 import spock.lang.Shared
 import spock.lang.Specification
+import spock.util.environment.RestoreSystemProperties
 
 /**
  * Created by graemerocher on 11/07/2016.
  */
 @Rollback
+@RestoreSystemProperties
 class PartitionedMultiTenancySpec extends Specification {
 
     @Shared @AutoCleanup HibernateDatastore datastore
diff --git a/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy
index 599181c7fa..b5de2f78a9 100644
--- a/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy
+++ b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy
@@ -42,8 +42,9 @@ import java.sql.Connection
 @RestoreSystemProperties
 class SchemaMultiTenantSpec extends Specification {
 
-    void "Test a database per tenant multi tenancy"() {
-        given:"A configuration for multiple data sources"
+    @Shared @AutoCleanup HibernateDatastore datastore
+
+    void setupSpec() {
         System.setProperty(SystemPropertyTenantResolver.PROPERTY_NAME, "")
         Map config = [
                 "grails.gorm.multiTenancy.mode":"SCHEMA",
@@ -57,7 +58,13 @@ class SchemaMultiTenantSpec extends Specification {
                 'hibernate.hbm2ddl.auto': 'create',
         ]
 
-        HibernateDatastore datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config), SingleTenantAuthor )
+        datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config), SingleTenantAuthor )
+    }
+
+    void "Test a database per tenant multi tenancy"() {
+        given:"A configuration for multiple data sources"
+        System.setProperty(SystemPropertyTenantResolver.PROPERTY_NAME, "")
+
         HibernateConnectionSource connectionSource = datastore.getConnectionSources().defaultConnectionSource
         def connection = connectionSource.dataSource.getConnection()
         connection.close()
diff --git a/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy
index 5c32e23af2..e16b98b648 100644
--- a/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy
+++ b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy
@@ -32,6 +32,8 @@ import org.hibernate.Session
 import org.hibernate.dialect.H2Dialect
 import org.hibernate.resource.jdbc.spi.JdbcSessionOwner
 import spock.util.environment.RestoreSystemProperties
+import spock.lang.AutoCleanup
+import spock.lang.Shared
 import spock.lang.Specification
 
 import java.sql.Connection
@@ -42,8 +44,9 @@ import java.sql.Connection
 @RestoreSystemProperties
 class SingleTenantSpec extends Specification {
 
-    void "Test a database per tenant multi tenancy"() {
-        given:"A configuration for multiple data sources"
+    @Shared @AutoCleanup HibernateDatastore datastore
+
+    void setupSpec() {
         System.setProperty(SystemPropertyTenantResolver.PROPERTY_NAME, "")
         Map config = [
                 "grails.gorm.multiTenancy.mode":"DATABASE",
@@ -59,7 +62,12 @@ class SingleTenantSpec extends Specification {
                 'dataSources.moreBooks':[url:"jdbc:h2:mem:moreBooks;LOCK_TIMEOUT=10000"]
         ]
 
-        HibernateDatastore datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config),Book, SingleTenantAuthor )
+        datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config),Book, SingleTenantAuthor )
+    }
+
+    void "Test a database per tenant multi tenancy"() {
+        given:"A configuration for multiple data sources"
+        System.setProperty(SystemPropertyTenantResolver.PROPERTY_NAME, "")
 
         when:"no tenant id is present"
         SingleTenantAuthor.list()
diff --git a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy
index 5140b7c04d..2dadc2beaa 100644
--- a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy
@@ -33,6 +33,7 @@ import spock.lang.AutoCleanup
 import spock.lang.Issue
 import spock.lang.Shared
 import spock.lang.Specification
+import spock.util.environment.RestoreSystemProperties
 
 /**
  * Created by puneetbehl on 21/03/2018.
@@ -53,8 +54,10 @@ import spock.lang.Specification
  *   providing a more robust way to query associations in a multi-tenant context.
  */
 //TODO Multitenancy not working
+@RestoreSystemProperties
 class MultiTenancyBidirectionalManyToManySpec extends Specification {
 
+    @Shared
     final Map config = [
             "grails.gorm.multiTenancy.mode":MultiTenancySettings.MultiTenancyMode.DISCRIMINATOR,
             "grails.gorm.multiTenancy.tenantResolverClass":SystemPropertyTenantResolver.name,
@@ -72,7 +75,7 @@ class MultiTenancyBidirectionalManyToManySpec extends Specification {
     @Shared @AutoCleanup HibernateDatastore datastore
 
 
-    void setup() {
+    void setupSpec() {
         System.setProperty(SystemPropertyTenantResolver.PROPERTY_NAME, "oci")
         datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config), getClass().getPackage() )
         departmentService = datastore.getService(DepartmentService)
diff --git a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy
index ce6ebbb956..41775d134c 100644
--- a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy
@@ -25,15 +25,21 @@ import org.grails.datastore.mapping.multitenancy.resolvers.SystemPropertyTenantR
 import grails.gorm.MultiTenant
 import org.grails.orm.hibernate.HibernateDatastore
 import org.hibernate.dialect.H2Dialect
+import spock.lang.AutoCleanup
 import spock.lang.Issue
+import spock.lang.Shared
 import spock.lang.Specification
+import spock.util.environment.RestoreSystemProperties
 
 /**
  * Created by graemerocher on 16/06/2017.
  */
 //TODO Multitenancy not working
+@RestoreSystemProperties
 class MultiTenancyUnidirectionalOneToManySpec extends Specification {
 
+    @Shared @AutoCleanup HibernateDatastore datastore
+
     @Issue('https://github.com/grails/grails-data-mapping/issues/954')
     void "test multi-tenancy with unidirectional one-to-many"() {
         given: "A configuration for schema based multi-tenancy"
@@ -51,7 +57,7 @@ class MultiTenancyUnidirectionalOneToManySpec extends Specification {
                 'hibernate.hbm2ddl.auto'                      : 'create',
         ]
 
-        HibernateDatastore datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config), getClass().getPackage())
+        datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config), getClass().getPackage())
 
         when:
         System.setProperty(SystemPropertyTenantResolver.PROPERTY_NAME, "ford")
@@ -82,8 +88,6 @@ class MultiTenancyUnidirectionalOneToManySpec extends Specification {
 
         cleanup:
         System.setProperty(SystemPropertyTenantResolver.PROPERTY_NAME, "")
-        // ensure datastore resources are released between tests
-        datastore?.close()
     }
 }
 
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy
index 9a2a9302bd..85f8b96aa8 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy
@@ -193,6 +193,9 @@ class HibernateDatastoreSpec extends HibernateGormDatastoreSpec {
 
         then:
         noExceptionThrown()
+
+        cleanup:
+        ds.close()
     }
 
     void "test destroy logs error when closeConnectionSources throws IOException"() {
@@ -210,6 +213,9 @@ class HibernateDatastoreSpec extends HibernateGormDatastoreSpec {
 
         then:
         noExceptionThrown()
+
+        cleanup:
+        ds.close()
     }
 
     void "test destroy logs error when closeGormEnhancer throws IOException"() {
@@ -227,6 +233,9 @@ class HibernateDatastoreSpec extends HibernateGormDatastoreSpec {
 
         then:
         noExceptionThrown()
+
+        cleanup:
+        ds.close()
     }
 
     void "test isAutoFlush reflects defaultFlushMode"() {
@@ -286,6 +295,9 @@ class HibernateDatastoreSpec extends HibernateGormDatastoreSpec {
 
         then:
         noExceptionThrown()
+
+        cleanup:
+        ds.close()
     }
     
     void "test constructors"() {
@@ -337,11 +349,13 @@ class HibernateDatastoreSpec extends HibernateGormDatastoreSpec {
         def ds7 = new HibernateDatastore(datastore.mappingContext, datastore.sessionFactory, propertyResolver, datastore.applicationContext, "default")
         then:
         ds7 != null
+        ds7.close()
         
         when: "Constructor with MappingContext, SessionFactory, PropertyResolver"
         def ds8 = new HibernateDatastore(datastore.mappingContext, datastore.sessionFactory, propertyResolver)
         then:
         ds8 != null
+        ds8.close()
     }
 
     void "test setMessageSource"() {
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy
index 8c004daed8..d9d677c6e2 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy
@@ -22,6 +22,8 @@ import grails.gorm.annotation.Entity
 import org.grails.datastore.mapping.core.DatastoreUtils
 import org.grails.orm.hibernate.HibernateDatastore
 import org.hibernate.dialect.H2Dialect
+import spock.lang.AutoCleanup
+import spock.lang.Shared
 import spock.lang.Specification
 
 /**
@@ -29,6 +31,8 @@ import spock.lang.Specification
  */
 class MultipleDataSourcesWithCachingSpec extends Specification {
 
+    @Shared @AutoCleanup HibernateDatastore datastore
+
     void "Test map to multiple data sources"() {
         given:"A configuration for multiple data sources"
         Map config = [
@@ -45,7 +49,7 @@ class MultipleDataSourcesWithCachingSpec extends Specification {
         ]
 
         when:
-        HibernateDatastore datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config),CachingBook )
+        datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config),CachingBook )
         CachingBook book = CachingBook.withTransaction {
             new CachingBook(name:"The Stand").save(flush:true)
             CachingBook.get( CachingBook.first().id )
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy
index b9d8288a39..8278d2fbc0 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy
@@ -27,12 +27,19 @@ import org.grails.orm.hibernate.HibernateDatastore
 import org.hibernate.Session
 import org.hibernate.dialect.H2Dialect
 import org.hibernate.resource.jdbc.spi.JdbcSessionOwner
+import spock.lang.AutoCleanup
+import spock.lang.Shared
 import spock.lang.Specification
+import spock.util.environment.RestoreSystemProperties
 
 /**
  * Created by graemerocher on 20/07/2016.
  */
+@RestoreSystemProperties
 class SchemaMultiTenantSpec extends Specification {
+
+    @Shared @AutoCleanup HibernateDatastore datastore
+
     void "Test a database per tenant multi tenancy"() {
         given:"A configuration for multiple data sources"
         System.setProperty(SystemPropertyTenantResolver.PROPERTY_NAME, "")
@@ -48,7 +55,7 @@ class SchemaMultiTenantSpec extends Specification {
                 'hibernate.hbm2ddl.auto': 'create',
         ]
 
-        HibernateDatastore datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config), SingleTenantAuthor )
+        datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config), SingleTenantAuthor )
         HibernateConnectionSource connectionSource = datastore.getConnectionSources().defaultConnectionSource
         def connection = connectionSource.dataSource.getConnection()
         connection.close()
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy
index 9413157efa..fe45a4c413 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy
@@ -31,12 +31,19 @@ import org.grails.orm.hibernate.HibernateDatastore
 import org.hibernate.Session
 import org.hibernate.dialect.H2Dialect
 import org.hibernate.resource.jdbc.spi.JdbcSessionOwner
+import spock.lang.AutoCleanup
+import spock.lang.Shared
 import spock.lang.Specification
+import spock.util.environment.RestoreSystemProperties
 
 /**
  * Created by graemerocher on 07/07/2016.
  */
+@RestoreSystemProperties
 class SingleTenantSpec extends Specification {
+
+    @Shared @AutoCleanup HibernateDatastore datastore
+
     void "Test a database per tenant multi tenancy"() {
         given:"A configuration for multiple data sources"
         System.setProperty(SystemPropertyTenantResolver.PROPERTY_NAME, "")
@@ -54,7 +61,7 @@ class SingleTenantSpec extends Specification {
                 'dataSources.moreBooks':[url:"jdbc:h2:mem:moreBooks;LOCK_TIMEOUT=10000"]
         ]
 
-        HibernateDatastore datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config),Book, SingleTenantAuthor )
+        datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config),Book, SingleTenantAuthor )
 
         when:"no tenant id is present"
         SingleTenantAuthor.list()
diff --git a/grails-data-hibernate7/grails-plugin/src/test/groovy/grails/orm/bootstrap/HibernateDatastoreSpringInitializerSpec.groovy b/grails-data-hibernate7/grails-plugin/src/test/groovy/grails/orm/bootstrap/HibernateDatastoreSpringInitializerSpec.groovy
index 85d4f8cfbb..9bd18a296e 100644
--- a/grails-data-hibernate7/grails-plugin/src/test/groovy/grails/orm/bootstrap/HibernateDatastoreSpringInitializerSpec.groovy
+++ b/grails-data-hibernate7/grails-plugin/src/test/groovy/grails/orm/bootstrap/HibernateDatastoreSpringInitializerSpec.groovy
@@ -23,7 +23,9 @@ import org.grails.orm.hibernate.HibernateDatastore
 import org.hibernate.Session
 import org.hibernate.SessionFactory
 import org.hibernate.dialect.H2Dialect
+import org.springframework.context.ConfigurableApplicationContext
 import org.springframework.transaction.PlatformTransactionManager
+import spock.lang.AutoCleanup
 import spock.lang.Specification
 
 /**
@@ -31,6 +33,9 @@ import spock.lang.Specification
  */
 class HibernateDatastoreSpringInitializerSpec extends Specification{
 
+    @AutoCleanup
+    ConfigurableApplicationContext applicationContext
+
     void "Test configure multiple data sources"() {
         given:"An initializer instance"
         Map config = [
@@ -46,7 +51,7 @@ class HibernateDatastoreSpringInitializerSpec extends Specification{
         def datastoreInitializer = new HibernateDatastoreSpringInitializer(config, Person, Book, Author)
 
         when:"the application is configured"
-        def applicationContext = datastoreInitializer.configure()
+        applicationContext = (ConfigurableApplicationContext) datastoreInitializer.configure()
         println applicationContext.getBeanDefinitionNames()
 
         then:"Each session factory has the correct number of persistent entities"