From 377f3eecb4f11444f4c6f3870d67e68f32110de4 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 21 Dec 2012 21:34:56 +0100 Subject: [PATCH] Preparations for 3.1.4 release in January --- build-spring-framework/resources/changelog.txt | 4 +++- build-spring-framework/resources/readme.txt | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build-spring-framework/resources/changelog.txt b/build-spring-framework/resources/changelog.txt index bcff26e51ea..232ae099a7d 100644 --- a/build-spring-framework/resources/changelog.txt +++ b/build-spring-framework/resources/changelog.txt @@ -3,7 +3,7 @@ SPRING FRAMEWORK CHANGELOG http://www.springsource.org -Changes in version 3.1.4 (2012-12-19) +Changes in version 3.1.4 (2013-01-02) ------------------------------------- * overhauled non-void JavaBean write method support (SPR-10029) @@ -14,6 +14,8 @@ Changes in version 3.1.4 (2012-12-19) * DefaultMessageListenerContainer allows for concurrent subscription consumers on WebLogic/ActiveMQ (SPR-10037) * DefaultMessageListenerContainer clears resources of paused tasks when shutting down after stop (SPR-10092) * tx timeouts for JPA translate to "javax.persistence.query.timeout" only (for EclipseLink compatibility; SPR-10068) +* JmsTemplate uses configured receiveTimeout if shorter than remaining transaction timeout (SPR-10109) +* added MappingJackson2MessageConverter for JMS (SPR-10099) * ResourceDatabasePopulator explicitly closes its LineNumberReader (SPR-9912) * AbstractCachingViewResolver uses a cache limit of 1024 by default, avoiding overflow for redirect URLs (SPR-10065) * fixed HierarchicalUriComponents equals implementation (SPR-10088) diff --git a/build-spring-framework/resources/readme.txt b/build-spring-framework/resources/readme.txt index 461069114de..25c563f25c9 100644 --- a/build-spring-framework/resources/readme.txt +++ b/build-spring-framework/resources/readme.txt @@ -1,5 +1,5 @@ -SPRING FRAMEWORK 3.1.4 (December 2012) --------------------------------------- +SPRING FRAMEWORK 3.1.4 (January 2013) +------------------------------------- http://www.springsource.org 1. INTRODUCTION