diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTemplate.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTemplate.java
index d0811ca12c..f05bd73276 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTemplate.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.hibernate.Criteria;
 import org.hibernate.Filter;
 import org.hibernate.FlushMode;
@@ -863,7 +864,6 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean
 	public List<?> find(final String queryString, final Object... values) throws DataAccessException {
 		return executeWithNativeSession(new HibernateCallback<List<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public List<?> doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.createQuery(queryString);
 				prepareQuery(queryObject);
@@ -893,7 +893,6 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean
 		}
 		return executeWithNativeSession(new HibernateCallback<List<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public List<?> doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.createQuery(queryString);
 				prepareQuery(queryObject);
@@ -913,7 +912,6 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean
 
 		return executeWithNativeSession(new HibernateCallback<List<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public List<?> doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.createQuery(queryString);
 				prepareQuery(queryObject);
@@ -932,7 +930,6 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean
 	public List<?> findByNamedQuery(final String queryName, final Object... values) throws DataAccessException {
 		return executeWithNativeSession(new HibernateCallback<List<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public List<?> doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.getNamedQuery(queryName);
 				prepareQuery(queryObject);
@@ -963,7 +960,6 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean
 		}
 		return executeWithNativeSession(new HibernateCallback<List<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public List<?> doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.getNamedQuery(queryName);
 				prepareQuery(queryObject);
@@ -983,7 +979,6 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean
 
 		return executeWithNativeSession(new HibernateCallback<List<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public List<?> doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.getNamedQuery(queryName);
 				prepareQuery(queryObject);
@@ -1010,7 +1005,6 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean
 		Assert.notNull(criteria, "DetachedCriteria must not be null");
 		return executeWithNativeSession(new HibernateCallback<List<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public List<?> doInHibernate(Session session) throws HibernateException {
 				Criteria executableCriteria = criteria.getExecutableCriteria(session);
 				prepareCriteria(executableCriteria);
@@ -1074,7 +1068,6 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean
 	public Iterator<?> iterate(final String queryString, final Object... values) throws DataAccessException {
 		return executeWithNativeSession(new HibernateCallback<Iterator<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public Iterator<?> doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.createQuery(queryString);
 				prepareQuery(queryObject);
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/orm/jpa/jpa21/PersistenceContextTransactionTests.java b/spring-orm-hibernate4/src/test/java/org/springframework/orm/jpa/jpa21/PersistenceContextTransactionTests.java
index a44a7ac989..1a93a4ea74 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/orm/jpa/jpa21/PersistenceContextTransactionTests.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/orm/jpa/jpa21/PersistenceContextTransactionTests.java
@@ -43,7 +43,6 @@ import static org.mockito.BDDMockito.*;
  * @author Juergen Hoeller
  * @since 4.1.2
  */
-@SuppressWarnings({ "rawtypes", "unchecked" })
 public class PersistenceContextTransactionTests {
 
 	private EntityManagerFactory factory;
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/validation/hibernatevalidator5/BeanValidationPostProcessorTests.java b/spring-orm-hibernate4/src/test/java/org/springframework/validation/hibernatevalidator5/BeanValidationPostProcessorTests.java
index ae5008f734..36837d8cad 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/validation/hibernatevalidator5/BeanValidationPostProcessorTests.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/validation/hibernatevalidator5/BeanValidationPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,6 +54,7 @@ public class BeanValidationPostProcessorTests {
 			assertTrue(ex.getRootCause().getMessage().contains("testBean"));
 			assertTrue(ex.getRootCause().getMessage().contains("invalid"));
 		}
+		ac.close();
 	}
 
 	@Test
@@ -65,6 +66,7 @@ public class BeanValidationPostProcessorTests {
 		bd.getPropertyValues().add("testBean", new TestBean());
 		ac.registerBeanDefinition("bean", bd);
 		ac.refresh();
+		ac.close();
 	}
 
 	@Test
@@ -76,6 +78,7 @@ public class BeanValidationPostProcessorTests {
 		ac.registerBeanDefinition("capp", new RootBeanDefinition(CommonAnnotationBeanPostProcessor.class));
 		ac.registerBeanDefinition("bean", new RootBeanDefinition(AfterInitConstraintBean.class));
 		ac.refresh();
+		ac.close();
 	}
 
 	@Test
@@ -94,6 +97,7 @@ public class BeanValidationPostProcessorTests {
 			assertTrue(ex.getRootCause().getMessage().contains("stringValue"));
 			assertTrue(ex.getRootCause().getMessage().contains("invalid"));
 		}
+		ac.close();
 	}
 
 	@Test
@@ -105,6 +109,7 @@ public class BeanValidationPostProcessorTests {
 		bd.getPropertyValues().add("stringValue", "ss");
 		ac.registerBeanDefinition("bean", bd);
 		ac.refresh();
+		ac.close();
 	}
 
 
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/validation/hibernatevalidator5/MethodValidationTests.java b/spring-orm-hibernate4/src/test/java/org/springframework/validation/hibernatevalidator5/MethodValidationTests.java
index 94c557b764..592e12e831 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/validation/hibernatevalidator5/MethodValidationTests.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/validation/hibernatevalidator5/MethodValidationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,6 +64,7 @@ public class MethodValidationTests {
 		ac.registerSingleton("bean", MyValidBean.class);
 		ac.refresh();
 		doTestProxyValidation(ac.getBean("bean", MyValidInterface.class));
+		ac.close();
 	}
 
 
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/validation/hibernatevalidator5/ValidatorFactoryTests.java b/spring-orm-hibernate4/src/test/java/org/springframework/validation/hibernatevalidator5/ValidatorFactoryTests.java
index 356e1a99de..4165836065 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/validation/hibernatevalidator5/ValidatorFactoryTests.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/validation/hibernatevalidator5/ValidatorFactoryTests.java
@@ -39,7 +39,7 @@ import org.hibernate.validator.HibernateValidator;
 import org.junit.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.core.env.Environment;
 import org.springframework.validation.BeanPropertyBindingResult;
@@ -179,7 +179,8 @@ public class ValidatorFactoryTests {
 
 	@Test
 	public void testSpringValidationWithAutowiredValidator() throws Exception {
-		ApplicationContext ctx = new AnnotationConfigApplicationContext(LocalValidatorFactoryBean.class);
+		ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(
+				LocalValidatorFactoryBean.class);
 		LocalValidatorFactoryBean validator = ctx.getBean(LocalValidatorFactoryBean.class);
 
 		ValidPerson person = new ValidPerson();
@@ -194,6 +195,7 @@ public class ValidatorFactoryTests {
 		assertEquals(2, errorCodes.size());
 		assertTrue(errorCodes.contains("NameAddressValid.person"));
 		assertTrue(errorCodes.contains("NameAddressValid"));
+		ctx.close();
 	}
 
 	@Test
diff --git a/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/HibernateTemplate.java b/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/HibernateTemplate.java
index 055b86af1b..878357d452 100644
--- a/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/HibernateTemplate.java
+++ b/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/HibernateTemplate.java
@@ -27,6 +27,7 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.hibernate.Criteria;
 import org.hibernate.Filter;
 import org.hibernate.FlushMode;
@@ -417,7 +418,6 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean
 
 		return executeWithNativeSession(new HibernateCallback<T>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public T doInHibernate(Session session) throws HibernateException {
 				if (lockMode != null) {
 					return session.get(entityClass, id, new LockOptions(lockMode));
@@ -462,7 +462,6 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean
 
 		return executeWithNativeSession(new HibernateCallback<T>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public T doInHibernate(Session session) throws HibernateException {
 				if (lockMode != null) {
 					return session.load(entityClass, id, new LockOptions(lockMode));
@@ -863,7 +862,6 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean
 	public List<?> find(final String queryString, final Object... values) throws DataAccessException {
 		return executeWithNativeSession(new HibernateCallback<List<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public List<?> doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.createQuery(queryString);
 				prepareQuery(queryObject);
@@ -893,7 +891,6 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean
 		}
 		return executeWithNativeSession(new HibernateCallback<List<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public List<?> doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.createQuery(queryString);
 				prepareQuery(queryObject);
@@ -913,7 +910,6 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean
 
 		return executeWithNativeSession(new HibernateCallback<List<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public List<?> doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.createQuery(queryString);
 				prepareQuery(queryObject);
@@ -932,7 +928,6 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean
 	public List<?> findByNamedQuery(final String queryName, final Object... values) throws DataAccessException {
 		return executeWithNativeSession(new HibernateCallback<List<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public List<?> doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.getNamedQuery(queryName);
 				prepareQuery(queryObject);
@@ -963,7 +958,6 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean
 		}
 		return executeWithNativeSession(new HibernateCallback<List<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public List<?> doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.getNamedQuery(queryName);
 				prepareQuery(queryObject);
@@ -983,7 +977,6 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean
 
 		return executeWithNativeSession(new HibernateCallback<List<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public List<?> doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.getNamedQuery(queryName);
 				prepareQuery(queryObject);
@@ -1010,7 +1003,6 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean
 		Assert.notNull(criteria, "DetachedCriteria must not be null");
 		return executeWithNativeSession(new HibernateCallback<List<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public List<?> doInHibernate(Session session) throws HibernateException {
 				Criteria executableCriteria = criteria.getExecutableCriteria(session);
 				prepareCriteria(executableCriteria);
@@ -1074,7 +1066,6 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean
 	public Iterator<?> iterate(final String queryString, final Object... values) throws DataAccessException {
 		return executeWithNativeSession(new HibernateCallback<Iterator<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public Iterator<?> doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.createQuery(queryString);
 				prepareQuery(queryObject);
diff --git a/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java b/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java
index 715883ea97..175dd05b8e 100644
--- a/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java
+++ b/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java
@@ -20,6 +20,7 @@ import javax.sql.DataSource;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.hibernate.HibernateException;
 import org.hibernate.JDBCException;
 import org.hibernate.NonUniqueObjectException;
@@ -91,7 +92,6 @@ public abstract class SessionFactoryUtils {
 	 * @return the DataSource, or {@code null} if none found
 	 * @see ConnectionProvider
 	 */
-	@SuppressWarnings("deprecation")
 	public static DataSource getDataSource(SessionFactory sessionFactory) {
 		if (sessionFactory instanceof SessionFactoryImplementor) {
 			try {
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java
index ecbfc34c4a..ab8eaae351 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -343,7 +343,6 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 
 	@Override
 	@Deprecated
-	@SuppressWarnings("unchecked")
 	public List<?> executeFind(HibernateCallback<?> action) throws DataAccessException {
 		Object result = doExecute(action, false, false);
 		if (result != null && !(result instanceof List)) {
@@ -974,7 +973,6 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 	public List<?> find(final String queryString, final Object... values) throws DataAccessException {
 		return executeWithNativeSession(new HibernateCallback<List<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public List<?> doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.createQuery(queryString);
 				prepareQuery(queryObject);
@@ -1004,7 +1002,6 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		}
 		return executeWithNativeSession(new HibernateCallback<List<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public List<?> doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.createQuery(queryString);
 				prepareQuery(queryObject);
@@ -1024,7 +1021,6 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 
 		return executeWithNativeSession(new HibernateCallback<List<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public List<?> doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.createQuery(queryString);
 				prepareQuery(queryObject);
@@ -1053,7 +1049,6 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 	public List<?> findByNamedQuery(final String queryName, final Object... values) throws DataAccessException {
 		return executeWithNativeSession(new HibernateCallback<List<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public List<?> doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.getNamedQuery(queryName);
 				prepareQuery(queryObject);
@@ -1084,7 +1079,6 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		}
 		return executeWithNativeSession(new HibernateCallback<List<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public List<?> doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.getNamedQuery(queryName);
 				prepareQuery(queryObject);
@@ -1104,7 +1098,6 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 
 		return executeWithNativeSession(new HibernateCallback<List<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public List<?> doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.getNamedQuery(queryName);
 				prepareQuery(queryObject);
@@ -1131,7 +1124,6 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		Assert.notNull(criteria, "DetachedCriteria must not be null");
 		return executeWithNativeSession(new HibernateCallback<List<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public List<?> doInHibernate(Session session) throws HibernateException {
 				Criteria executableCriteria = criteria.getExecutableCriteria(session);
 				prepareCriteria(executableCriteria);
@@ -1205,7 +1197,6 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 	public Iterator<?> iterate(final String queryString, final Object... values) throws DataAccessException {
 		return executeWithNativeSession(new HibernateCallback<Iterator<?>>() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public Iterator<?> doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.createQuery(queryString);
 				prepareQuery(queryObject);
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
index ef14e8a9a1..b422c8745c 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
@@ -76,7 +76,7 @@ import org.springframework.util.ReflectionUtils;
  * @author Costin Leau
  * @since 2.0
  */
-@SuppressWarnings({"serial", "deprecation"})
+@SuppressWarnings("serial")
 public class HibernateJpaDialect extends DefaultJpaDialect {
 
 	private static Class<?> optimisticLockExceptionClass;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
index 44aff3d11c..ccb1510f1e 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
@@ -70,7 +70,7 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter {
 	private final Class<? extends EntityManager> entityManagerInterface;
 
 
-	@SuppressWarnings({"deprecation", "unchecked"})
+	@SuppressWarnings("unchecked")
 	public HibernateJpaVendorAdapter() {
 		ClassLoader cl = HibernateJpaVendorAdapter.class.getClassLoader();
 		Class<? extends EntityManagerFactory> emfIfcToUse;