HHH-10907 - Fix connection leak problem in hibernate-core tests

(cherry picked from commit f5e10c29eb)

documentation/src/test/java/org/hibernate/userguide/multitenancy/AbstractMultiTenancyTest.java

@@ -29,11 +29,13 @@ import org.hibernate.cfg.Environment;
 import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
+import org.hibernate.service.spi.Stoppable;
 import org.hibernate.tool.schema.internal.HibernateSchemaManagementTool;
 import org.hibernate.tool.schema.internal.SchemaCreatorImpl;
 import org.hibernate.tool.schema.internal.SchemaDropperImpl;
 import org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase;
 
+import org.hibernate.testing.AfterClassOnce;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.hibernate.test.util.DdlTransactionIsolatorTestingImpl;
 import org.junit.Test;
@@ -69,6 +71,16 @@ public abstract class AbstractMultiTenancyTest extends BaseUnitTestCase {
     }
     //end::multitenacy-hibernate-MultiTenantConnectionProvider-example[]
 
+    @AfterClassOnce
+    public void destroy() {
+        sessionFactory.close();
+        for ( ConnectionProvider connectionProvider : connectionProviderMap.values() ) {
+            if ( connectionProvider instanceof Stoppable ) {
+                ( (Stoppable) connectionProvider ).stop();
+            }
+        }
+    }
+
     //tag::multitenacy-hibernate-MultiTenantConnectionProvider-example[]
 
     protected void registerConnectionProvider(String tenantIdentifier) {

documentation/src/test/java/org/hibernate/userguide/transactions/TransactionsTest.java

@@ -74,6 +74,7 @@ public class TransactionsTest extends BaseEntityManagerFunctionalTestCase {
 		}
 		finally {
 			session.close();
+			sessionFactory.close();
 		}
 		//end::transactions-api-jdbc-example[]
 	}
@@ -123,6 +124,7 @@ public class TransactionsTest extends BaseEntityManagerFunctionalTestCase {
 		}
 		finally {
 			session.close();
+			sessionFactory.close();
 		}
 		//end::transactions-api-cmt-example[]
 	}
@@ -176,6 +178,7 @@ public class TransactionsTest extends BaseEntityManagerFunctionalTestCase {
 		}
 		finally {
 			session.close();
+			sessionFactory.close();
 		}
 		//end::transactions-api-bmt-example[]
 	}

hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0ConnectionProviderTest.java

@@ -30,6 +30,17 @@ import static org.junit.Assert.assertTrue;
  */
 public class C3P0ConnectionProviderTest extends BaseCoreFunctionalTestCase {
 
+	@Override
+	protected void releaseSessionFactory() {
+		super.releaseSessionFactory();
+		try {
+			//c3p0 does not close physical connections right away, so without this hack a connection leak false alarm is triggered.
+			Thread.sleep( 100 );
+		}
+		catch ( InterruptedException e ) {
+		}
+	}
+
 	@Test
 	public void testC3P0isDefaultWhenThereIsC3P0Properties() {
 		JdbcServices jdbcServices = serviceRegistry().getService( JdbcServices.class );
@@ -39,7 +50,6 @@ public class C3P0ConnectionProviderTest extends BaseCoreFunctionalTestCase {
 				jdbcServices.getBootstrapJdbcConnectionAccess()
 			);
 		assertTrue( connectionAccess.getConnectionProvider() instanceof C3P0ConnectionProvider );
-
 	}
 
 	@Test
@@ -82,9 +92,14 @@ public class C3P0ConnectionProviderTest extends BaseCoreFunctionalTestCase {
 
 	@Test @TestForIssue(jiraKey="HHH-9498")
 	public void testIsolationPropertyCouldBeEmpty() {
+		C3P0ConnectionProvider provider = new C3P0ConnectionProvider();
+		try {
 			Properties configuration = new Properties();
 			configuration.setProperty( Environment.ISOLATION, "" );
-        C3P0ConnectionProvider provider = new C3P0ConnectionProvider();
 			provider.configure( configuration );
 		}
+		finally {
+			provider.stop();
+		}
+	}
 }

hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java

@@ -214,6 +214,15 @@ public class BootstrapServiceRegistryImpl
 		destroy( classLoaderServiceBinding );
 		destroy( strategySelectorBinding );
 		destroy( integratorServiceBinding );
+
+		if ( childRegistries != null ) {
+			for(ServiceRegistry serviceRegistry : childRegistries) {
+				if(serviceRegistry instanceof ServiceRegistryImplementor) {
+					ServiceRegistryImplementor serviceRegistryImplementor = (ServiceRegistryImplementor) serviceRegistry;
+					serviceRegistryImplementor.destroy();
+				}
+			}
+		}
 	}
 	
 	private void destroy(ServiceBinding serviceBinding) {

hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java

@@ -273,6 +273,8 @@ public final class SessionFactoryImpl implements SessionFactoryImplementor {
 		}
 		final IntegratorObserver integratorObserver = new IntegratorObserver();
 		this.observer.addObserver( integratorObserver );
+
+		try {
 			for ( Integrator integrator : serviceRegistry.getService( IntegratorService.class ).getIntegrators() ) {
 				integrator.integrate( metadata, this, this.serviceRegistry );
 				integratorObserver.integrators.add( integrator );
@@ -313,7 +315,9 @@ public final class SessionFactoryImpl implements SessionFactoryImplementor {
 			};
 
 			final RegionFactory regionFactory = cacheAccess.getRegionFactory();
-		final String cacheRegionPrefix = settings.getCacheRegionPrefix() == null ? "" : settings.getCacheRegionPrefix() + ".";
+			final String cacheRegionPrefix = settings.getCacheRegionPrefix() == null ?
+					"" :
+					settings.getCacheRegionPrefix() + ".";
 			final PersisterFactory persisterFactory = serviceRegistry.getService( PersisterFactory.class );
 
 			// todo : consider removing this silliness and just have EntityPersister directly implement ClassMetadata
@@ -362,10 +366,17 @@ public final class SessionFactoryImpl implements SessionFactoryImplementor {
 						// this part handles an odd case in the Hibernate test suite where we map an interface
 						// as the class and the proxy.  I cannot think of a real life use case for that
 						// specific test, but..
-					LOG.debugf( "Entity [%s] mapped same interface [%s] as class and proxy", cp.getEntityName(), cp.getMappedClass() );
+						LOG.debugf(
+								"Entity [%s] mapped same interface [%s] as class and proxy",
+								cp.getEntityName(),
+								cp.getMappedClass()
+						);
 					}
 					else {
-					final String old = entityProxyInterfaceMap.put( cp.getConcreteProxyClass(), cp.getEntityName() );
+						final String old = entityProxyInterfaceMap.put(
+								cp.getConcreteProxyClass(),
+								cp.getEntityName()
+						);
 						if ( old != null ) {
 							throw new HibernateException(
 									String.format(
@@ -391,7 +402,8 @@ public final class SessionFactoryImpl implements SessionFactoryImplementor {
 						regionFactory,
 						cacheAccessStrategiesMap,
 						model,
-					cacheRegionName);
+						cacheRegionName
+				);
 
 				final CollectionPersister persister = persisterFactory.createCollectionPersister(
 						model,
@@ -528,6 +540,20 @@ public final class SessionFactoryImpl implements SessionFactoryImplementor {
 					serviceRegistry.getService( JndiService.class )
 			);
 		}
+		catch (Exception e) {
+			for ( Integrator integrator : serviceRegistry.getService( IntegratorService.class ).getIntegrators() ) {
+				integrator.disintegrate( this, serviceRegistry );
+				integratorObserver.integrators.remove( integrator );
+			}
+			serviceRegistry.destroy();
+			if ( RuntimeException.class.isInstance( e ) ) {
+				throw (RuntimeException) e;
+			}
+			else {
+				throw new HibernateException( e );
+			}
+		}
+	}
 
 	private void applyCfgXmlValues(LoadedConfig aggregatedConfig, SessionFactoryServiceRegistry serviceRegistry) {
 		final JaccService jaccService = serviceRegistry.getService( JaccService.class );

hibernate-core/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java

@@ -13,6 +13,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.Set;
+import javax.persistence.OptimisticLockException;
 
 import org.hibernate.AnnotationException;
 import org.hibernate.Hibernate;
@@ -21,6 +22,7 @@ import org.hibernate.Query;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.dialect.TeradataDialect;
 
@@ -642,17 +644,24 @@ public class BasicHibernateAnnotationsTest extends BaseCoreFunctionalTestCase {
 	@Test
 	public void testTypeDefWithoutNameAndDefaultForTypeAttributes() {
 		SessionFactory sf = null;
+		StandardServiceRegistryImpl ssr = null;
 		try {
 			Configuration config = new Configuration();
 			config.addAnnotatedClass( LocalContactDetails.class );
-			sf = config.buildSessionFactory( ServiceRegistryBuilder.buildServiceRegistry( config.getProperties() ) );
+			ssr = ServiceRegistryBuilder.buildServiceRegistry( config.getProperties() );
+			sf = config.buildSessionFactory( ssr );
 			fail( "Did not throw expected exception" );
 		}
 		catch ( AnnotationException ex ) {
 			assertEquals(
 					"Either name or defaultForType (or both) attribute should be set in TypeDef having typeClass org.hibernate.test.annotations.entity.PhoneNumberType",
-					ex.getMessage());
+					ex.getMessage()
-		} finally {
+			);
+		}
+		finally {
+			if ( ssr != null ) {
+				ssr.destroy();
+			}
 			if ( sf != null ) {
 				sf.close();
 			}

hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java

@@ -10,6 +10,8 @@ import java.io.InputStream;
 
 import org.hibernate.MappingException;
 import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.BootstrapServiceRegistry;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -85,6 +87,12 @@ public class FetchProfileTest extends BaseUnitTestCase {
 		catch ( MappingException e ) {
             log.trace("success");
 		}
+		finally {
+			ServiceRegistry metaServiceRegistry = metadataSources.getServiceRegistry();
+			if(metaServiceRegistry instanceof BootstrapServiceRegistry) {
+				BootstrapServiceRegistryBuilder.destroy( metaServiceRegistry );
+			}
+		}
 	}
 
 	@Test
@@ -101,6 +109,12 @@ public class FetchProfileTest extends BaseUnitTestCase {
 		catch ( MappingException e ) {
             log.trace("success");
 		}
+		finally {
+			ServiceRegistry metaServiceRegistry = metadataSources.getServiceRegistry();
+			if(metaServiceRegistry instanceof BootstrapServiceRegistry) {
+				BootstrapServiceRegistryBuilder.destroy( metaServiceRegistry );
+			}
+		}
 	}
 
 	@Test
@@ -117,6 +131,12 @@ public class FetchProfileTest extends BaseUnitTestCase {
 		catch ( MappingException e ) {
             log.trace("success");
 		}
+		finally {
+			ServiceRegistry metaServiceRegistry = metadataSources.getServiceRegistry();
+			if(metaServiceRegistry instanceof BootstrapServiceRegistry) {
+				BootstrapServiceRegistryBuilder.destroy( metaServiceRegistry );
+			}
+		}
 	}
 
 	@Test
@@ -152,6 +172,12 @@ public class FetchProfileTest extends BaseUnitTestCase {
 		catch ( MappingException e ) {
 			log.trace("success");
 		}
+		finally {
+			ServiceRegistry metaServiceRegistry = metadataSources.getServiceRegistry();
+			if(metaServiceRegistry instanceof BootstrapServiceRegistry) {
+				BootstrapServiceRegistryBuilder.destroy( metaServiceRegistry );
+			}
+		}
 	}
 
 	@Test

hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java

@@ -9,38 +9,53 @@
 package org.hibernate.test.annotations.fkcircularity;
 
 import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.BootstrapServiceRegistry;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
+import org.hibernate.service.ServiceRegistry;
 
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.junit.Test;
 
-import org.jboss.logging.Logger;
-
 /**
  * Test case for ANN-722 and ANN-730.
  *
  * @author Hardy Ferentschik
  */
 public class FkCircularityTest extends BaseUnitTestCase {
-	private static final Logger log = Logger.getLogger( FkCircularityTest.class );
-
 
     @Test
 	public void testJoinedSublcassesInPK() {
-		new MetadataSources()
+		MetadataSources metadataSources = new MetadataSources()
 			.addAnnotatedClass(A.class)
 			.addAnnotatedClass(B.class)
 			.addAnnotatedClass(C.class)
-				.addAnnotatedClass(D.class)
+			.addAnnotatedClass(D.class);
-				.buildMetadata();
+		try {
+			metadataSources.buildMetadata();
+		}
+		finally {
+			ServiceRegistry metaServiceRegistry = metadataSources.getServiceRegistry();
+			if(metaServiceRegistry instanceof BootstrapServiceRegistry ) {
+				BootstrapServiceRegistryBuilder.destroy( metaServiceRegistry );
+			}
+		}
 	}
 
     @Test
 	public void testDeepJoinedSuclassesHierachy() {
-		new MetadataSources()
+		MetadataSources metadataSources = new MetadataSources()
 				.addAnnotatedClass(ClassA.class)
 				.addAnnotatedClass(ClassB.class)
 				.addAnnotatedClass(ClassC.class)
-				.addAnnotatedClass(ClassD.class)
+				.addAnnotatedClass(ClassD.class);
-				.buildMetadata();
+		try {
+			metadataSources.buildMetadata();
+		}
+		finally {
+			ServiceRegistry metaServiceRegistry = metadataSources.getServiceRegistry();
+			if(metaServiceRegistry instanceof BootstrapServiceRegistry ) {
+				BootstrapServiceRegistryBuilder.destroy( metaServiceRegistry );
+			}
+		}
 	}
 }

hibernate-core/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java

@@ -8,12 +8,16 @@ package org.hibernate.test.annotations.immutable;
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.persistence.PersistenceException;
 
 import org.hibernate.AnnotationException;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.BootstrapServiceRegistry;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
+import org.hibernate.service.ServiceRegistry;
 
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Test;
@@ -136,12 +140,19 @@ public class ImmutableTest extends BaseCoreFunctionalTestCase {
 
 	@Test
 	public void testMisplacedImmutableAnnotation() {
+		MetadataSources metadataSources = new MetadataSources().addAnnotatedClass( Foobar.class );
 		try {
-			new MetadataSources().addAnnotatedClass( Foobar.class ).buildMetadata();
+			metadataSources.buildMetadata();
 			fail( "Expecting exception due to misplaced @Immutable annotation");
 		}
 		catch (AnnotationException ignore) {
 		}
+		finally {
+			ServiceRegistry metaServiceRegistry = metadataSources.getServiceRegistry();
+			if(metaServiceRegistry instanceof BootstrapServiceRegistry ) {
+				BootstrapServiceRegistryBuilder.destroy( metaServiceRegistry );
+			}
+		}
 	}
 
 	@Override

hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java

@@ -38,9 +38,6 @@ public class OrmVersion1SupportedTest extends BaseCoreFunctionalTestCase {
 	public void testOrm1Support() {
 		Triggerable triggerable = logInspection.watchForLogMessages( "HHH00196" );
 
-		// need to call buildSessionFactory, because this test is not using org.hibernate.testing.junit4.CustomRunner
-		buildSessionFactory();
-
 		Session s = openSession();
 		Transaction tx = s.beginTransaction();
 		Light light = new Light();
@@ -54,9 +51,6 @@ public class OrmVersion1SupportedTest extends BaseCoreFunctionalTestCase {
 		s.close();
 
 		assertFalse( triggerable.wasTriggered() );
-
-		// which means we also need to close it manually
-		releaseSessionFactory();
 	}
 
 	@Override

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/access/MixedAccessTestTask.java

@@ -1,11 +1,8 @@
 package org.hibernate.test.bytecode.enhancement.access;
 
-import org.hibernate.Session;
+import java.util.LinkedHashMap;
-import org.hibernate.cfg.Configuration;
+import java.util.Map;
-import org.hibernate.cfg.Environment;
+import java.util.stream.Collectors;
-import org.hibernate.test.bytecode.enhancement.AbstractEnhancerTestTask;
-import org.junit.Assert;
-
 import javax.persistence.Access;
 import javax.persistence.AccessType;
 import javax.persistence.Column;
@@ -16,9 +13,13 @@ import javax.persistence.Transient;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
-import java.util.LinkedHashMap;
+
-import java.util.Map;
+import org.hibernate.Session;
-import java.util.stream.Collectors;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.Environment;
+
+import org.hibernate.test.bytecode.enhancement.AbstractEnhancerTestTask;
+import org.junit.Assert;
 
 /**
  * @author Luis Barreiro
@@ -41,6 +42,7 @@ public class MixedAccessTestTask extends AbstractEnhancerTestTask {
 		Session s = getFactory().openSession();
 		s.beginTransaction();
 
+		try {
 			TestEntity testEntity = new TestEntity( "foo" );
 			testEntity.setParamsAsString( "{\"paramName\":\"paramValue\"}" );
 			s.persist( testEntity );
@@ -50,14 +52,21 @@ public class MixedAccessTestTask extends AbstractEnhancerTestTask {
 			s.persist( testOtherEntity );
 
 			s.getTransaction().commit();
-		s.clear();
+		}
+		catch ( Exception e ) {
+			s.getTransaction().rollback();
+			throw e;
+		}
+		finally {
 			s.close();
 		}
+	}
 
 	public void execute() {
 		Session s = getFactory().openSession();
 		s.beginTransaction();
 
+		try {
 			TestEntity testEntity = s.get( TestEntity.class, "foo" );
 			Assert.assertEquals( "{\"paramName\":\"paramValue\"}", testEntity.getParamsAsString() );
 
@@ -70,14 +79,21 @@ public class MixedAccessTestTask extends AbstractEnhancerTestTask {
 			testOtherEntity.setParamsAsString( "{}" );
 
 			s.getTransaction().commit();
-		s.clear();
+		}
+		catch ( RuntimeException e ) {
+			s.getTransaction().rollback();
+			throw e;
+		}
+		finally {
 			s.close();
 		}
+	}
 
 	protected void cleanup() {
 		Session s = getFactory().openSession();
 		s.beginTransaction();
 
+		try {
 			TestEntity testEntity = s.get( TestEntity.class, "foo" );
 			Assert.assertTrue( testEntity.getParams().isEmpty() );
 
@@ -85,9 +101,15 @@ public class MixedAccessTestTask extends AbstractEnhancerTestTask {
 			Assert.assertTrue( testOtherEntity.getParams().isEmpty() );
 
 			s.getTransaction().commit();
-		s.clear();
+		}
+		catch ( RuntimeException e ) {
+			s.getTransaction().rollback();
+			throw e;
+		}
+		finally {
 			s.close();
 		}
+	}
 
 	@Entity
 	private static class TestEntity {

hibernate-core/src/test/java/org/hibernate/test/connections/SuppliedConnectionTest.java

@@ -36,7 +36,7 @@ import org.hibernate.test.util.DdlTransactionIsolatorTestingImpl;
  */
 @RequiresDialect(H2Dialect.class)
 public class SuppliedConnectionTest extends ConnectionManagementTestCase {
-	private ConnectionProvider cp = ConnectionProviderBuilder.buildConnectionProvider();
+	private ConnectionProvider cp;
 	private Connection connectionUnderTest;
 
 	@BeforeClassOnce

hibernate-core/src/test/java/org/hibernate/test/entitymode/dom4j/DeprecationLoggingTest.java

@@ -7,7 +7,10 @@
 package org.hibernate.test.entitymode.dom4j;
 
 import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.BootstrapServiceRegistry;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
 import org.hibernate.internal.log.DeprecationLogger;
+import org.hibernate.service.ServiceRegistry;
 
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.hibernate.testing.logger.LoggerInspectionRule;
@@ -21,6 +24,7 @@ import org.junit.Test;
  * @author Steve Ebersole
  */
 public class DeprecationLoggingTest extends BaseUnitTestCase {
+
 	@Rule
 	public LoggerInspectionRule logInspection = new LoggerInspectionRule( DeprecationLogger.DEPRECATION_LOGGER );
 
@@ -28,7 +32,16 @@ public class DeprecationLoggingTest extends BaseUnitTestCase {
 	public void basicTest() {
 		logInspection.registerListener( LogListenerImpl.INSTANCE );
 
-		new MetadataSources().addResource( "org/hibernate/test/entitymode/dom4j/Car.hbm.xml" )
+		MetadataSources metadataSources = new MetadataSources()
-				.buildMetadata();
+			.addResource( "org/hibernate/test/entitymode/dom4j/Car.hbm.xml" );
+		try {
+			metadataSources.buildMetadata();
+		}
+		finally {
+			ServiceRegistry metaServiceRegistry = metadataSources.getServiceRegistry();
+			if(metaServiceRegistry instanceof BootstrapServiceRegistry ) {
+				BootstrapServiceRegistryBuilder.destroy( metaServiceRegistry );
+			}
+		}
 	}
 }

hibernate-core/src/test/java/org/hibernate/test/enums/InvalidEnumeratedJavaTypeTest.java

@@ -12,6 +12,9 @@ import javax.persistence.Id;
 
 import org.hibernate.AnnotationException;
 import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.BootstrapServiceRegistry;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
+import org.hibernate.service.ServiceRegistry;
 
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.junit.Test;
@@ -24,14 +27,20 @@ import static org.junit.Assert.fail;
 public class InvalidEnumeratedJavaTypeTest extends BaseUnitTestCase {
 	@Test
 	public void testInvalidMapping() {
+		MetadataSources metadataSources = new MetadataSources( )
+			.addAnnotatedClass( TheEntity.class );
 		try {
-			new MetadataSources( )
+			metadataSources.buildMetadata();
-					.addAnnotatedClass( TheEntity.class )
-					.buildMetadata();
 			fail( "Was expecting failure" );
 		}
 		catch (AnnotationException ignore) {
 		}
+		finally {
+			ServiceRegistry metaServiceRegistry = metadataSources.getServiceRegistry();
+			if(metaServiceRegistry instanceof BootstrapServiceRegistry ) {
+				BootstrapServiceRegistryBuilder.destroy( metaServiceRegistry );
+			}
+		}
 	}
 
 	@Entity

hibernate-core/src/test/java/org/hibernate/test/hbm/query/NamedQueryTest.java

@@ -2,6 +2,7 @@ package org.hibernate.test.hbm.query;
 
 import java.io.StringReader;
 
+import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.engine.jdbc.ReaderInputStream;
 import org.hibernate.testing.TestForIssue;
@@ -32,7 +33,8 @@ public class NamedQueryTest extends BaseUnitTestCase {
 		Configuration cfg = new Configuration();		
 		cfg.setProperty("hibernate.dialect", "org.hibernate.dialect.HSQLDialect");
 		cfg.addInputStream(new ReaderInputStream(new StringReader(NAMED_QUERY_HBM_XML)));
-		cfg.buildSessionFactory();
+		SessionFactory sessionFactory = cfg.buildSessionFactory();
+		sessionFactory.close();
 	}
 	
 	public class Bar {

hibernate-core/src/test/java/org/hibernate/test/hbm/query/QueryReturnTest.java

@@ -4,11 +4,14 @@ import java.io.StringReader;
 
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
 import org.hibernate.engine.jdbc.ReaderInputStream;
 import org.hibernate.engine.query.spi.sql.NativeSQLQueryReturn;
 import org.hibernate.engine.query.spi.sql.NativeSQLQueryRootReturn;
 import org.hibernate.engine.spi.NamedSQLQueryDefinition;
+
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.junit.Assert;
@@ -43,7 +46,9 @@ public class QueryReturnTest extends BaseUnitTestCase {
 	public void testQueryReturn() {
 		StandardServiceRegistryBuilder serviceRegistryBuilder = new StandardServiceRegistryBuilder()
 			.applySetting("hibernate.dialect", "org.hibernate.dialect.HSQLDialect");
-		MetadataSources metadataSources = new MetadataSources(serviceRegistryBuilder.build());
+		StandardServiceRegistry standardServiceRegistry = serviceRegistryBuilder.build();
+		MetadataSources metadataSources = new MetadataSources(standardServiceRegistry);
+		try {
 			metadataSources.addInputStream(new ReaderInputStream(new StringReader(QUERY_RETURN_HBM_XML)));
 			Metadata metadata = metadataSources.buildMetadata();
 			NamedSQLQueryDefinition myQuery = metadata.getNamedNativeQueryDefinition("myQuery");
@@ -56,6 +61,12 @@ public class QueryReturnTest extends BaseUnitTestCase {
 			Assert.assertEquals("e", myQueryRootReturn.getAlias());
 			Assert.assertEquals("org.hibernate.test.hbm.query.QueryReturnTest$Bar", myQueryRootReturn.getReturnEntityName());
 		}
+		finally {
+			if ( standardServiceRegistry instanceof StandardServiceRegistryImpl ) {
+				( (StandardServiceRegistryImpl) standardServiceRegistry ).destroy();
+			}
+		}
+	}
 
 	public class Bar {
 		public Integer id;		

hibernate-core/src/test/java/org/hibernate/test/hbm/version/GeneratedVersionBindingTest.java

@@ -6,8 +6,10 @@
  */
 package org.hibernate.test.hbm.version;
 
-import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.BootstrapServiceRegistry;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
+import org.hibernate.service.ServiceRegistry;
 
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.junit.Test;
@@ -18,8 +20,17 @@ import org.junit.Test;
 public class GeneratedVersionBindingTest extends BaseUnitTestCase {
 	@Test
 	public void testIt() {
-		final Metadata metadata = new MetadataSources()
+		MetadataSources metadataSources = new MetadataSources()
-				.addResource("org/hibernate/test/hbm/version/Mappings.hbm.xml")
+			.addResource("org/hibernate/test/hbm/version/Mappings.hbm.xml");
-				.buildMetadata();
+
+		try {
+			metadataSources.buildMetadata();
+		}
+		finally {
+			ServiceRegistry metaServiceRegistry = metadataSources.getServiceRegistry();
+			if(metaServiceRegistry instanceof BootstrapServiceRegistry ) {
+				BootstrapServiceRegistryBuilder.destroy( metaServiceRegistry );
+			}
+		}
 	}
 }

hibernate-core/src/test/java/org/hibernate/test/mapping/ValueVisitorTest.java

@@ -29,8 +29,8 @@ import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.Table;
 import org.hibernate.mapping.ValueVisitor;
 
-import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.hibernate.testing.boot.MetadataBuildingContextTestingImpl;
+import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -56,7 +56,9 @@ public class ValueVisitorTest extends BaseUnitTestCase {
 
 	@Test
 	public void testProperCallbacks() {
-		final MetadataImplementor metadata = (MetadataImplementor) new MetadataSources().buildMetadata();
+		final MetadataImplementor metadata =
+				(MetadataImplementor) new MetadataSources( serviceRegistry )
+		.buildMetadata();
 		final Table tbl = new Table();
 		final RootClass rootClass = new RootClass( metadataBuildingContext );
 

hibernate-core/src/test/java/org/hibernate/test/namingstrategy/collectionJoinTableNaming/CollectionJoinTableNamingTest.java

@@ -42,8 +42,11 @@ import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl;
 import org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl;
 import org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyJpaImpl;
+import org.hibernate.boot.registry.BootstrapServiceRegistry;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
 import org.hibernate.mapping.Collection;
 import org.hibernate.mapping.Column;
+import org.hibernate.service.ServiceRegistry;
 import org.hibernate.tool.hbm2ddl.SchemaExport;
 import org.hibernate.tool.schema.TargetType;
 
@@ -60,11 +63,13 @@ import static org.junit.Assert.assertSame;
  * @author Alessandro Polverini
  */
 public class CollectionJoinTableNamingTest extends BaseUnitTestCase {
+
 	@Test
 	@TestForIssue( jiraKey = "HHH-9908" )
 	public void testCollectionJoinTableNamingBase() {
 		// really the same as the JPA compliant tests; here we just pick up the default ImplicitNamingStrategy
 		final MetadataSources metadataSources = new MetadataSources();
+		try {
 			metadataSources.addAnnotatedClass( Input.class );
 			metadataSources.addAnnotatedClass( Ptx.class );
 
@@ -73,11 +78,19 @@ public class CollectionJoinTableNamingTest extends BaseUnitTestCase {
 
 			assertSameTableUsed( metadata );
 		}
+		finally {
+			ServiceRegistry metaServiceRegistry = metadataSources.getServiceRegistry();
+			if(metaServiceRegistry instanceof BootstrapServiceRegistry ) {
+				BootstrapServiceRegistryBuilder.destroy( metaServiceRegistry );
+			}
+		}
+	}
 
 	@Test
 	@TestForIssue( jiraKey = "HHH-9908" )
 	public void testCollectionJoinTableNamingLegacyJpaStrategy() {
 		final MetadataSources metadataSources = new MetadataSources();
+		try {
 			metadataSources.addAnnotatedClass( Input.class );
 			metadataSources.addAnnotatedClass( Ptx.class );
 
@@ -87,11 +100,19 @@ public class CollectionJoinTableNamingTest extends BaseUnitTestCase {
 
 			assertSameTableUsed( metadata );
 		}
+		finally {
+			ServiceRegistry metaServiceRegistry = metadataSources.getServiceRegistry();
+			if(metaServiceRegistry instanceof BootstrapServiceRegistry ) {
+				BootstrapServiceRegistryBuilder.destroy( metaServiceRegistry );
+			}
+		}
+	}
 
 	@Test
 	@TestForIssue( jiraKey = "HHH-9908" )
 	public void testCollectionJoinTableNamingLegacyHbmStrategy() {
 		final MetadataSources metadataSources = new MetadataSources();
+		try {
 			metadataSources.addAnnotatedClass( Input.class );
 			metadataSources.addAnnotatedClass( Ptx.class );
 
@@ -105,6 +126,13 @@ public class CollectionJoinTableNamingTest extends BaseUnitTestCase {
 			Collection inputs2Mapping = metadata.getCollectionBinding( Ptx.class.getName() + ".inputs2" );
 			assertEquals( "ptx_inputs2", inputs2Mapping.getCollectionTable().getName() );
 		}
+		finally {
+			ServiceRegistry metaServiceRegistry = metadataSources.getServiceRegistry();
+			if(metaServiceRegistry instanceof BootstrapServiceRegistry ) {
+				BootstrapServiceRegistryBuilder.destroy( metaServiceRegistry );
+			}
+		}
+	}
 
 	@Test
 	@TestForIssue( jiraKey = "HHH-9908" )
@@ -112,6 +140,7 @@ public class CollectionJoinTableNamingTest extends BaseUnitTestCase {
 		// Even in 4.3, with JPA compliant naming, Hibernate creates an unusable table...
 
 		final MetadataSources metadataSources = new MetadataSources();
+		try {
 			metadataSources.addAnnotatedClass( Input.class );
 			metadataSources.addAnnotatedClass( Ptx.class );
 
@@ -121,6 +150,13 @@ public class CollectionJoinTableNamingTest extends BaseUnitTestCase {
 
 			assertSameTableUsed( metadata );
 		}
+		finally {
+			ServiceRegistry metaServiceRegistry = metadataSources.getServiceRegistry();
+			if(metaServiceRegistry instanceof BootstrapServiceRegistry ) {
+				BootstrapServiceRegistryBuilder.destroy( metaServiceRegistry );
+			}
+		}
+	}
 
 	private void assertSameTableUsed(Metadata metadata) {
 		Collection inputs1Mapping = metadata.getCollectionBinding( Ptx.class.getName() + ".inputs1" );

hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/BaseNamingTests.java

@@ -9,11 +9,14 @@ package org.hibernate.test.namingstrategy.complete;
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.model.naming.ImplicitNamingStrategy;
+import org.hibernate.boot.registry.BootstrapServiceRegistry;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
 import org.hibernate.mapping.Collection;
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.Component;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
+import org.hibernate.service.ServiceRegistry;
 
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.junit.Test;
@@ -26,9 +29,11 @@ import static org.junit.Assert.assertNotNull;
  * @author Steve Ebersole
  */
 public abstract class BaseNamingTests extends BaseUnitTestCase {
+
 	@Test
 	public void doTest() {
 		final MetadataSources metadataSources = new MetadataSources();
+		try {
 			applySources( metadataSources );
 
 			final Metadata metadata = metadataSources.getMetadataBuilder()
@@ -44,6 +49,13 @@ public abstract class BaseNamingTests extends BaseUnitTestCase {
 			validateCustomerOrders( metadata );
 			validateCustomerIndustries( metadata );
 		}
+		finally {
+			ServiceRegistry metaServiceRegistry = metadataSources.getServiceRegistry();
+			if(metaServiceRegistry instanceof BootstrapServiceRegistry ) {
+				BootstrapServiceRegistryBuilder.destroy( metaServiceRegistry );
+			}
+		}
+	}
 
 	protected abstract void applySources(MetadataSources metadataSources);
 

hibernate-core/src/test/java/org/hibernate/test/naturalid/inheritance/spread/SpreadNaturalIdTest.java

@@ -8,6 +8,9 @@ package org.hibernate.test.naturalid.inheritance.spread;
 
 import org.hibernate.AnnotationException;
 import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.BootstrapServiceRegistry;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
+import org.hibernate.service.ServiceRegistry;
 
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
@@ -23,14 +26,21 @@ public class SpreadNaturalIdTest extends BaseUnitTestCase {
 	@Test
 	@SuppressWarnings("EmptyCatchBlock")
 	public void testSpreadNaturalIdDeclarationGivesMappingException() {
-		try {
+		final MetadataSources metadataSources = new MetadataSources()
-			new MetadataSources()
 			.addAnnotatedClass( Principal.class )
-					.addAnnotatedClass( User.class )
+			.addAnnotatedClass( User.class );
-					.buildMetadata();
+		try {
+
+			metadataSources.buildMetadata();
 			fail( "Expected binders to throw an exception" );
 		}
 		catch (AnnotationException expected) {
 		}
+		finally {
+			ServiceRegistry metaServiceRegistry = metadataSources.getServiceRegistry();
+			if(metaServiceRegistry instanceof BootstrapServiceRegistry ) {
+				BootstrapServiceRegistryBuilder.destroy( metaServiceRegistry );
+			}
+		}
 	}
 }

hibernate-core/src/test/java/org/hibernate/test/schemafilter/SchemaFilterTest.java

@@ -5,7 +5,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
@@ -14,16 +13,17 @@ import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.model.relational.Namespace;
 import org.hibernate.boot.model.relational.Sequence;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
 import org.hibernate.dialect.SQLServerDialect;
 import org.hibernate.mapping.Table;
-import org.hibernate.service.ServiceRegistry;
 import org.hibernate.tool.schema.internal.DefaultSchemaFilter;
 import org.hibernate.tool.schema.internal.SchemaCreatorImpl;
 import org.hibernate.tool.schema.internal.SchemaDropperImpl;
 import org.hibernate.tool.schema.spi.SchemaFilter;
 
+import org.hibernate.testing.AfterClassOnce;
 import org.hibernate.testing.DialectChecks;
 import org.hibernate.testing.RequiresDialectFeature;
 import org.hibernate.testing.ServiceRegistryBuilder;
@@ -45,7 +45,7 @@ import static org.hibernate.test.schemafilter.RecordingTarget.Category.TABLE_DRO
 @RequiresDialectFeature( value = {DialectChecks.SupportSchemaCreation.class})
 public class SchemaFilterTest extends BaseUnitTestCase {
 
-	private final ServiceRegistry serviceRegistry;
+	private final StandardServiceRegistryImpl serviceRegistry;
 	private final Metadata metadata;
 
 	public SchemaFilterTest() {
@@ -65,6 +65,11 @@ public class SchemaFilterTest extends BaseUnitTestCase {
 		this.metadata = ms.buildMetadata();
 	}
 
+	@AfterClassOnce
+	public void shutdown() {
+		serviceRegistry.destroy();
+	}
+
 	@Test
 	public void createSchema_unfiltered() {
 		RecordingTarget target = doCreation( new DefaultSchemaFilter() );

hibernate-core/src/test/java/org/hibernate/test/service/ServiceBootstrappingTest.java

@@ -6,10 +6,6 @@
  */
 package org.hibernate.test.service;
 
-import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import java.util.Properties;
 
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
@@ -19,21 +15,25 @@ import org.hibernate.dialect.H2Dialect;
 import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
 import org.hibernate.engine.jdbc.connections.internal.UserSuppliedConnectionProviderImpl;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
-import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
-import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator;
 import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.ConnectionProviderJdbcConnectionAccess;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
+
 import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.env.ConnectionProviderBuilder;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.junit.Assume;
 import org.junit.Test;
 
+import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 /**
  * @author Steve Ebersole
  */
 @RequiresDialect( H2Dialect.class )
 public class ServiceBootstrappingTest extends BaseUnitTestCase {
+
 	@Test
 	public void testBasicBuild() {
 		// this test requires that SHOW_SQL property isn't passed from the outside (eg. via Gradle)
@@ -43,6 +43,7 @@ public class ServiceBootstrappingTest extends BaseUnitTestCase {
 		final StandardServiceRegistryImpl serviceRegistry = (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder()
 				.applySettings( ConnectionProviderBuilder.getConnectionProviderProperties() )
 				.build();
+		try {
 			final JdbcServices jdbcServices = serviceRegistry.getService( JdbcServices.class );
 			assertTrue( jdbcServices.getDialect() instanceof H2Dialect );
 			final ConnectionProviderJdbcConnectionAccess connectionAccess = assertTyping(
@@ -51,9 +52,11 @@ public class ServiceBootstrappingTest extends BaseUnitTestCase {
 			);
 			assertTrue( connectionAccess.getConnectionProvider().isUnwrappableAs( DriverManagerConnectionProviderImpl.class ) );
 			assertFalse( jdbcServices.getSqlStatementLogger().isLogToStdout() );
-
+		}
+		finally {
 			serviceRegistry.destroy();
 		}
+	}
 
 	@Test
 	public void testBuildWithLogging() {
@@ -64,6 +67,7 @@ public class ServiceBootstrappingTest extends BaseUnitTestCase {
 			.applySettings( props )
 			.build();
 
+		try {
 			JdbcServices jdbcServices = serviceRegistry.getService( JdbcServices.class );
 
 			assertTrue( jdbcServices.getDialect() instanceof H2Dialect );
@@ -73,15 +77,22 @@ public class ServiceBootstrappingTest extends BaseUnitTestCase {
 			);
 			assertTrue( connectionAccess.getConnectionProvider().isUnwrappableAs( DriverManagerConnectionProviderImpl.class ) );
 			assertTrue( jdbcServices.getSqlStatementLogger().isLogToStdout() );
-
+		}
+		finally {
 			serviceRegistry.destroy();
 		}
+	}
 
 	@Test
 	public void testBuildWithServiceOverride() {
 		StandardServiceRegistryImpl serviceRegistry = (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder()
 				.applySettings( ConnectionProviderBuilder.getConnectionProviderProperties() )
 				.build();
+
+		Properties props = ConnectionProviderBuilder.getConnectionProviderProperties();
+		props.setProperty( Environment.DIALECT, H2Dialect.class.getName() );
+
+		try {
 			JdbcServices jdbcServices = serviceRegistry.getService( JdbcServices.class );
 
 			assertTrue( jdbcServices.getDialect() instanceof H2Dialect );
@@ -90,23 +101,27 @@ public class ServiceBootstrappingTest extends BaseUnitTestCase {
 					jdbcServices.getBootstrapJdbcConnectionAccess()
 			);
 			assertTrue( connectionAccess.getConnectionProvider().isUnwrappableAs( DriverManagerConnectionProviderImpl.class ) );
+		}
+		finally {
+			serviceRegistry.destroy();
+		}
 
-		Properties props = ConnectionProviderBuilder.getConnectionProviderProperties();
+		try {
-		props.setProperty( Environment.DIALECT, H2Dialect.class.getName() );
-
 			serviceRegistry = (StandardServiceRegistryImpl) new StandardServiceRegistryBuilder()
 					.applySettings( props )
 					.addService( ConnectionProvider.class, new UserSuppliedConnectionProviderImpl() )
 					.build();
-		jdbcServices = serviceRegistry.getService( JdbcServices.class );
+			JdbcServices jdbcServices = serviceRegistry.getService( JdbcServices.class );
 
 			assertTrue( jdbcServices.getDialect() instanceof H2Dialect );
-		connectionAccess = assertTyping(
+			ConnectionProviderJdbcConnectionAccess connectionAccess = assertTyping(
 					ConnectionProviderJdbcConnectionAccess.class,
 					jdbcServices.getBootstrapJdbcConnectionAccess()
 			);
 			assertTrue( connectionAccess.getConnectionProvider().isUnwrappableAs( UserSuppliedConnectionProviderImpl.class ) );
-
+		}
+		finally {
 			serviceRegistry.destroy();
 		}
 	}
+}

hibernate-core/src/test/java/org/hibernate/test/tool/schema/IndividuallySchemaValidatorImplTest.java

@@ -188,6 +188,8 @@ public class IndividuallySchemaValidatorImplTest extends BaseUnitTestCase {
 		}
 		finally {
 			new SchemaDropperImpl( serviceRegistry ).doDrop( metadata, false, schemaGenerator );
+			serviceRegistry.destroy();
+			connectionProvider.stop();
 		}
 	}
 
@@ -241,6 +243,8 @@ public class IndividuallySchemaValidatorImplTest extends BaseUnitTestCase {
 		}
 		finally {
 			new SchemaDropperImpl( serviceRegistry ).doDrop( metadata, false, schemaGenerator );
+			serviceRegistry.destroy();
+			connectionProvider.stop();
 		}
 	}
 

hibernate-core/src/test/java/org/hibernate/test/util/dtd/EntityResolverTest.java

@@ -7,6 +7,9 @@
 package org.hibernate.test.util.dtd;
 
 import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.BootstrapServiceRegistry;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
+import org.hibernate.service.ServiceRegistry;
 
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.junit.Test;
@@ -21,8 +24,17 @@ public class EntityResolverTest extends BaseUnitTestCase {
 		//		<!ENTITY child SYSTEM "classpath://org/hibernate/test/util/dtd/child.xml">
 		// which we are expecting the Hibernate custom entity resolver to be able to resolve
 		// locally via classpath lookup.
-		new MetadataSources()
+		final MetadataSources metadataSources = new MetadataSources()
-				.addResource( "org/hibernate/test/util/dtd/Parent.hbm.xml" )
+			.addResource( "org/hibernate/test/util/dtd/Parent.hbm.xml" );
-				.buildMetadata();
+
+		try {
+			metadataSources.buildMetadata();
+		}
+		finally {
+			ServiceRegistry metaServiceRegistry = metadataSources.getServiceRegistry();
+			if(metaServiceRegistry instanceof BootstrapServiceRegistry ) {
+				BootstrapServiceRegistryBuilder.destroy( metaServiceRegistry );
+			}
+		}
 	}
 }

hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/functional/RefreshUpdatedDataTest.java

@@ -20,6 +20,9 @@ import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.cfg.Environment;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.H2Dialect;
 
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
@@ -47,6 +50,9 @@ public class RefreshUpdatedDataTest extends BaseNonConfigCoreFunctionalTestCase
 	@SuppressWarnings("unchecked")
 	protected void addSettings(Map settings) {
 		super.addSettings( settings );
+		if ( H2Dialect.class.equals( Dialect.getDialect().getClass() ) ) {
+			settings.put( Environment.URL, "jdbc:h2:mem:db-mvcc;MVCC=true" );
+		}
 		settings.put( AvailableSettings.GENERATE_STATISTICS, "true" );
 	}
 

hibernate-ehcache/src/test/resources/hibernate-config/hibernate.cfg.xml

@@ -13,23 +13,6 @@
 
     <session-factory>
 
-        <!-- Database connection settings -->
-        <!-- <property name="connection.driver_class">org.hsqldb.jdbcDriver</property>
-                    <property name="connection.url">jdbc:hsqldb:hsql://localhost/TestDB</property> -->
-
-        <property name="connection.driver_class">org.h2.Driver</property>
-        <property name="connection.url">jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE</property>
-        <property name="connection.username">sa</property>
-        <property name="connection.password"></property>
-
-        <!-- JDBC connection pool (use the built-in) -->
-        <property name="connection.pool_size">1</property>
-
-        <!-- SQL dialect -->
-        <property name="dialect">
-            org.hibernate.dialect.H2Dialect
-        </property>
-
         <!-- Enable Hibernate's automatic session context management -->
         <property name="current_session_context_class">thread</property>
 

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cdi/NoCdiAvailableTest.java

@@ -112,18 +112,12 @@ public class NoCdiAvailableTest extends BaseUnitTestCase {
 				"org.hibernate.jpa.test.cdi.NoCdiAvailableTestDelegate"
 		);
 		Method mainMethod = delegateClass.getMethod( "passingBeanManager" );
-		EntityManagerFactory entityManagerFactory = null;
 		try {
-			entityManagerFactory = (EntityManagerFactory) mainMethod.invoke( null );
+			mainMethod.invoke( null );
 			fail( "Expecting failure from missing CDI classes" );
 		}
 		catch (InvocationTargetException expected) {
 			// hard to assert specific exception types due to classloader trickery
 		}
-		finally {
-			if (entityManagerFactory != null ) {
-				entityManagerFactory.close();
-			}
-		}
 	}
 }

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cdi/NoCdiAvailableTestDelegate.java

@@ -8,6 +8,8 @@ package org.hibernate.jpa.test.cdi;
 
 import java.util.Collections;
 
+import javax.persistence.EntityManagerFactory;
+
 import org.hibernate.jpa.AvailableSettings;
 import org.hibernate.jpa.HibernatePersistenceProvider;
 import org.hibernate.jpa.test.PersistenceUnitInfoAdapter;
@@ -16,8 +18,8 @@ import org.hibernate.jpa.test.PersistenceUnitInfoAdapter;
  * @author Steve Ebersole
  */
 public class NoCdiAvailableTestDelegate {
-	public static void passingNoBeanManager() {
+	public static EntityManagerFactory passingNoBeanManager() {
-		new HibernatePersistenceProvider().createContainerEntityManagerFactory(
+		return new HibernatePersistenceProvider().createContainerEntityManagerFactory(
 				new PersistenceUnitInfoAdapter(),
 				Collections.emptyMap()
 		);

hibernate-hikaricp/src/test/resources/hibernate.properties

@@ -16,4 +16,5 @@ hibernate.connection.provider_class HikariCPConnectionProvider
 hibernate.hikari.poolName testPool
 # Purposefully low and simplisitic.
 hibernate.hikari.maximumPoolSize 2
+hibernate.hikari.connectionTimeout 1000
 hibernate.hikari.idleTimeout 3000

hibernate-testing/src/main/java/org/hibernate/testing/jdbc/JdbcProperties.java

@@ -21,8 +21,6 @@ public class JdbcProperties {
 
 	private final String password;
 
-	private final Integer poolSize;
-
 	public JdbcProperties() {
 		Properties connectionProperties = new Properties();
 		InputStream inputStream = null;
@@ -34,8 +32,6 @@ public class JdbcProperties {
 				connectionProperties.load( inputStream );
 				url = connectionProperties.getProperty(
 						"hibernate.connection.url" );
-				poolSize = Integer.valueOf( connectionProperties.getProperty(
-						"hibernate.connection.pool_size" ) );
 				user = connectionProperties.getProperty(
 						"hibernate.connection.username" );
 				password = connectionProperties.getProperty(
@@ -68,8 +64,4 @@ public class JdbcProperties {
 	public String getPassword() {
 		return password;
 	}
-
-	public Integer getPoolSize() {
-		return poolSize;
-	}
 }

hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseUnitTestCase.java

@@ -47,7 +47,6 @@ public abstract class BaseUnitTestCase {
 	@AfterClassOnce
 	public void assertNoLeaks() {
 		if ( enableConnectionLeakDetection ) {
-			log.info( "Assert no leaks!" );
 			connectionLeakUtil.assertNoLeaks();
 		}
 	}