From 1c7cc172d91ee0a3a71ff6f536dc03c87f185eb9 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Sat, 20 Aug 2011 18:39:36 +0000 Subject: [PATCH] [SPR-8627] Deprecated @ExpectedException. --- build-spring-framework/resources/changelog.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-spring-framework/resources/changelog.txt b/build-spring-framework/resources/changelog.txt index 4bf993674e7..fce940dfe5e 100644 --- a/build-spring-framework/resources/changelog.txt +++ b/build-spring-framework/resources/changelog.txt @@ -44,9 +44,10 @@ Changes in version 3.1 RC1 (2011-09-xx) * JavaMailSenderImpl detects and respects "mail.transport.protocol" property in existing Session * added ConcurrentMapCacheManager, dynamically building ConcurrentMapCache instances at runtime * added "disabled" property to EhCacheFactoryBean +* introduced DelegatingSmartContextLoader as new default ContextLoader for TestContext framework +* deprecated @ExpectedException * AnnotationConfigContextLoader now detects default configuration classes within test classes * TestContext now uses MergedContextConfiguration for the ContextCache key -* introduced DelegatingSmartContextLoader as new default ContextLoader for TestContext framework * extended Servlet API mocks for Servlet 3.0 forward compatibility as far as possible * made MockHttpServletResponse compatible with Servlet 3.0 getHeader(s) method returning Strings * added getHeaderValue(s) method to MockHttpServletResponse for raw value access