[libspring-java] 01/03: Merge tag 'upstream/3.2.13'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libspring-java.

commit 60217d04cb632fc2fbfcdb5cd747d4ffb96c66da
Merge: 26db60d c03c348
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Apr 27 22:17:36 2015 +0200

    Merge tag 'upstream/3.2.13'
    
    Upstream version 3.2.13

 build.gradle                                       |  40 +--
 gradle.properties                                  |   2 +-
 .../java/org/springframework/beans/BeanUtils.java  |  25 +-
 .../springframework/beans/ExtendedBeanInfo.java    |  37 ++-
 .../beans/MutablePropertyValues.java               |  14 +-
 .../AutowiredAnnotationBeanPostProcessor.java      |  55 ++--
 .../factory/annotation/InjectionMetadata.java      |  36 ++-
 .../beans/ExtendedBeanInfoTests.java               |  11 +-
 .../factory/DefaultListableBeanFactoryTests.java   |   5 +-
 .../beans/factory/xml/testUtilNamespace.xml        |   2 +-
 .../ui/freemarker/FreeMarkerTemplateUtils.java     |   3 +-
 .../ui/freemarker/SpringTemplateLoader.java        |  10 +-
 .../AbstractFallbackCacheOperationSource.java      |   9 +-
 .../annotation/AnnotationBeanNameGenerator.java    |   4 +-
 .../CommonAnnotationBeanPostProcessor.java         |  18 +-
 .../annotation/ConfigurationClassEnhancer.java     |   5 +-
 .../annotation/ConfigurationClassParser.java       |  42 ++-
 .../event/AbstractApplicationEventMulticaster.java |  78 +++--
 .../jmx/access/MBeanClientInterceptor.java         |  33 +-
 .../org/springframework/jmx/support/JmxUtils.java  |  14 +-
 .../annotation/BridgeMethodAutowiringTests.java    |  42 +--
 .../CommonAnnotationBeanPostProcessorTests.java    |  42 ++-
 .../annotation/configuration/Spr12526Tests.java    | 155 ++++++++++
 .../springframework/core/BridgeMethodResolver.java |  21 +-
 .../org/springframework/core/MethodParameter.java  |  28 +-
 .../convert/support/ArrayToArrayConverter.java     |   5 +-
 .../support/ArrayToCollectionConverter.java        |  19 +-
 .../convert/support/ArrayToObjectConverter.java    |   7 +-
 .../convert/support/ArrayToStringConverter.java    |   6 +-
 .../core/convert/support/MapToMapConverter.java    |  13 +-
 .../convert/support/ObjectToArrayConverter.java    |   8 +-
 .../support/ObjectToCollectionConverter.java       |  11 +-
 .../support/StringToCollectionConverter.java       |   8 +-
 .../support/StringToEnumConverterFactory.java      |   7 +-
 .../spel/support/ReflectiveMethodResolver.java     |  35 ++-
 .../expression/spel/SpelReproTests.java            |  20 ++
 .../jdbc/core/metadata/CallMetaDataContext.java    |  41 ++-
 .../jdbc/core/simple/AbstractJdbcCall.java         |  57 ++--
 .../jdbc/core/simple/AbstractJdbcInsert.java       |  82 +++--
 .../jdbc/core/simple/SimpleJdbcCall.java           |   6 +-
 .../jdbc/core/simple/SimpleJdbcCallOperations.java |  96 +++---
 .../jdbc/core/simple/SimpleJdbcInsert.java         |   3 +-
 .../core/simple/SimpleJdbcInsertOperations.java    |  38 +--
 .../embedded/DerbyEmbeddedDatabaseConfigurer.java  |  16 +-
 .../support/rowset/ResultSetWrappingSqlRowSet.java | 125 ++++----
 .../rowset/ResultSetWrappingSqlRowSetMetaData.java |  13 +-
 .../jdbc/support/rowset/SqlRowSet.java             | 335 +++++++++++----------
 .../jdbc/support/rowset/SqlRowSetMetaData.java     |  44 +--
 .../PersistenceAnnotationBeanPostProcessor.java    |  28 +-
 .../orm/jpa/support/PersistenceInjectionTests.java |   7 +-
 ...AbstractFallbackTransactionAttributeSource.java |   4 +-
 .../http/client/ClientHttpRequest.java             |   9 +-
 .../http/client/ClientHttpResponse.java            |  11 +-
 .../web/context/request/async/WebAsyncTask.java    |  90 +++---
 .../web/filter/AbstractRequestLoggingFilter.java   |  77 ++---
 .../web/portlet/HandlerExecutionChain.java         |  29 +-
 .../web/servlet/HandlerExecutionChain.java         |  95 +++---
 .../mvc/method/AbstractHandlerMethodAdapter.java   |  26 +-
 .../annotation/RequestMappingHandlerAdapter.java   |  70 +++--
 .../resource/ResourceHttpRequestHandler.java       |  20 +-
 .../web/servlet/HandlerExecutionChainTests.java    |   7 +-
 .../resource/ResourceHttpRequestHandlerTests.java  |  37 ++-
 .../view/freemarker/FreeMarkerMacroTests.java      |   6 +-
 .../view/freemarker/FreeMarkerViewTests.java       |  27 +-
 src/dist/changelog.txt                             |  19 ++
 src/reference/docbook/beans.xml                    |   9 +-
 66 files changed, 1373 insertions(+), 924 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git