Merge remote-tracking branch 'upstream/master'

spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java

@@ -73,7 +73,6 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @TestExecutionListeners(TransactionalTestExecutionListener.class)
 @Transactional
-@SuppressWarnings("deprecation")
 public abstract class AbstractTransactionalJUnit4SpringContextTests extends AbstractJUnit4SpringContextTests {
 
 	/**

spring-test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java

@@ -64,7 +64,6 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @TestExecutionListeners(TransactionalTestExecutionListener.class)
 @Transactional
-@SuppressWarnings("deprecation")
 public abstract class AbstractTransactionalTestNGSpringContextTests extends AbstractTestNGSpringContextTests {
 
 	/**

spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java

@@ -93,7 +93,6 @@ import org.springframework.util.StringUtils;
  * @see BeforeTransaction
  * @see AfterTransaction
  */
-@SuppressWarnings("deprecation")
 public class TransactionalTestExecutionListener extends AbstractTestExecutionListener {
 
 	private static final Log logger = LogFactory.getLog(TransactionalTestExecutionListener.class);

spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java

@@ -50,7 +50,6 @@ import org.springframework.transaction.annotation.Transactional;
  * @author Sam Brannen
  * @since 2.5
  */
-@SuppressWarnings("deprecation")
 @ContextConfiguration
 public class ConcreteTransactionalJUnit4SpringContextTests extends AbstractTransactionalJUnit4SpringContextTests
 		implements BeanNameAware, InitializingBean {

spring-test/src/test/java/org/springframework/test/context/junit4/ExpectedExceptionSpringRunnerTests.java

@@ -37,7 +37,6 @@ import org.springframework.test.context.TestExecutionListeners;
  * @author Sam Brannen
  * @since 3.0
  */
-@SuppressWarnings("deprecation")
 @RunWith(JUnit4.class)
 public class ExpectedExceptionSpringRunnerTests {
 

spring-test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java

@@ -38,7 +38,6 @@ import org.springframework.transaction.annotation.Transactional;
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("transactionalTests-context.xml")
 @Transactional
-@SuppressWarnings("deprecation")
 public class TimedTransactionalSpringRunnerTests {
 
 	@Test

spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java

@@ -54,7 +54,6 @@ import org.testng.annotations.Test;
  * @author Sam Brannen
  * @since 3.1
  */
-@SuppressWarnings("deprecation")
 @ContextConfiguration
 public class AnnotationConfigTransactionalTestNGSpringContextTests extends
 		AbstractTransactionalTestNGSpringContextTests {

spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java

@@ -48,7 +48,6 @@ import org.testng.annotations.Test;
  * @author Sam Brannen
  * @since 2.5
  */
-@SuppressWarnings("deprecation")
 @ContextConfiguration
 public class ConcreteTransactionalTestNGSpringContextTests extends AbstractTransactionalTestNGSpringContextTests
 		implements BeanNameAware, InitializingBean {

spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java

@@ -53,7 +53,6 @@ public class DirtiesContextTransactionalTestNGSpringContextTests extends Abstrac
 	private ApplicationContext dirtiedApplicationContext;
 
 
-	@SuppressWarnings("deprecation")
 	private void performCommonAssertions() {
 		assertInTransaction(true);
 		assertNotNull(super.applicationContext,