[libspring-java] 10/13: Merge tag 'upstream/4.2.7'

[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 7592abce7ef4b02f0c80985b459c22e9dd4e7fa1
Merge: be1c123 9eaca6a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Aug 2 11:52:14 2016 +0200

    Merge tag 'upstream/4.2.7'
    
    Upstream version 4.2.7

 build.gradle                                       |  42 +--
 gradle.properties                                  |   2 +-
 .../AbstractBeanFactoryPointcutAdvisor.java        |  30 ++-
 .../cache/aspectj/AspectJCachingConfiguration.java |  15 +-
 .../aspectj/SpringConfiguredConfiguration.java     |   4 +-
 .../aspectj/AspectJEnableCachingIsolatedTests.java | 285 +++++++++++++++++++++
 .../cache/aspectj/AspectJEnableCachingTests.java   |  92 +++++++
 .../config/AnnotatedClassCacheableService.java     |   6 +-
 .../cache/config/DefaultCacheableService.java      |   5 +-
 .../cache/config/SomeCustomKeyGenerator.java       |   4 +-
 .../beans/AbstractNestablePropertyAccessor.java    |   7 +-
 .../beans/TypeConverterDelegate.java               |   9 +-
 .../beans/TypeConverterSupport.java                |   4 +-
 .../factory/support/AbstractBeanDefinition.java    |  11 +-
 .../beans/factory/support/AbstractBeanFactory.java |  19 +-
 .../beans/factory/support/MethodOverrides.java     |  30 ++-
 .../springframework/beans/BeanWrapperTests.java    |  16 +-
 .../springframework/context/annotation/Bean.java   |   7 +
 .../annotation/ConfigurationClassParser.java       |  28 +-
 .../springframework/context/annotation/Import.java |   4 +-
 .../event/EventListenerMethodProcessor.java        |  28 +-
 .../context/weaving/AspectJWeavingEnabler.java     |  19 +-
 .../support/FormatterPropertyEditorAdapter.java    |  19 +-
 .../support/FormattingConversionService.java       |   4 +-
 .../ScheduledAnnotationBeanPostProcessor.java      |   2 +-
 .../annotation/SchedulingConfiguration.java        |   6 +-
 .../scripting/groovy/GroovyScriptFactory.java      |   2 +-
 .../validation/beanvalidation/package-info.java    |   2 +-
 .../ConfigurationClassPostProcessorTests.java      |  20 +-
 .../ConfigurationClassWithConditionTests.java      |  64 +++--
 .../validation/DataBinderTests.java                |  75 +++++-
 .../org/springframework/cglib/package-info.java    |   4 +-
 .../org/springframework/core/MethodParameter.java  |  66 ++---
 .../core/annotation/AnnotationUtils.java           |   4 +-
 .../core/convert/ConversionFailedException.java    |   4 +-
 .../core/convert/ConversionService.java            |   8 +-
 .../core/convert/ConverterNotFoundException.java   |   6 +-
 .../core/convert/TypeDescriptor.java               |   9 +-
 .../core/convert/support/ConversionUtils.java      |   2 +-
 .../AnnotationAttributesReadingVisitor.java        |  33 ++-
 .../AnnotationReadingVisitorUtils.java             |   7 +-
 .../RecursiveAnnotationAttributesVisitor.java      |   4 +-
 .../util/DefaultPropertiesPersister.java           |   6 +-
 .../java/org/springframework/util/ObjectUtils.java |  77 +++---
 .../springframework/util/PropertiesPersister.java  |   8 +-
 .../util/concurrent/SettableListenableFuture.java  |  34 +--
 .../concurrent/SettableListenableFutureTests.java  |  44 ++--
 .../expression/common/package-info.java            |   4 +
 .../springframework/expression/package-info.java   |   4 +
 .../expression/spel/ast/package-info.java          |   4 +
 .../expression/spel/package-info.java              |   4 +
 .../expression/spel/standard/package-info.java     |   4 +
 .../expression/spel/support/package-info.java      |   4 +
 .../init/CompositeDatabasePopulator.java           |  12 +-
 .../support/PayloadArgumentResolver.java           |  19 +-
 .../invocation/AbstractMethodMessageHandler.java   |  80 +++---
 .../handler/invocation/InvocableHandlerMethod.java |   6 +-
 .../simp/broker/SimpleBrokerMessageHandler.java    |   8 +-
 .../simp/stomp/StompBrokerRelayMessageHandler.java |  17 ++
 .../messaging/support/AbstractMessageChannel.java  |   6 +-
 .../support/ExecutorSubscribableChannel.java       |  11 +-
 .../messaging/tcp/reactor/Reactor2TcpClient.java   |   3 +-
 .../support/PayloadArgumentResolverTests.java      |   4 +-
 .../hibernate4/HibernateTransactionManager.java    |   4 +-
 .../hibernate5/HibernateTransactionManager.java    |  10 +-
 spring-oxm/oxm.gradle                              |   2 +-
 .../test/context/cache/ContextCache.java           |  21 +-
 .../test/context/cache/package-info.java           |   4 +
 .../web/client/match/MockRestRequestMatchers.java  |   6 +-
 .../servlet/htmlunit/HtmlUnitRequestBuilder.java   |  63 ++---
 .../htmlunit/HtmlUnitRequestBuilderTests.java      |  49 ++--
 .../annotation/EnableTransactionManagement.java    |   4 +-
 .../TransactionManagementConfigurer.java           |   4 +-
 .../transaction/annotation/package-info.java       |   2 +-
 .../transaction/event/package-info.java            |   4 +
 .../transaction/support/TransactionTemplate.java   |   4 +-
 .../converter/AbstractHttpMessageConverter.java    |   2 +-
 .../converter/ByteArrayHttpMessageConverter.java   |   8 +-
 .../http/converter/FormHttpMessageConverter.java   |   4 +-
 .../ObjectToStringHttpMessageConverter.java        |  37 ++-
 .../converter/json/SpringHandlerInstantiator.java  |  40 ++-
 .../http/converter/json/package-info.java          |   2 +-
 .../http/converter/protobuf/package-info.java      |   5 +
 .../AllEncompassingFormHttpMessageConverter.java   |   4 +-
 .../http/converter/support/package-info.java       |   4 +
 .../http/converter/xml/package-info.java           |   2 +-
 .../http/server/ServletServerHttpRequest.java      |  42 +--
 .../AbstractMappingContentNegotiationStrategy.java |   7 +-
 .../web/accept/ContentNegotiationManager.java      |  14 +-
 .../ContentNegotiationManagerFactoryBean.java      |  38 +--
 .../web/accept/ContentNegotiationStrategy.java     |   6 +-
 .../accept/FixedContentNegotiationStrategy.java    |   5 +-
 .../accept/HeaderContentNegotiationStrategy.java   |   6 +-
 .../MappingMediaTypeFileExtensionResolver.java     |   4 +-
 .../web/accept/MediaTypeFileExtensionResolver.java |   7 +-
 .../ParameterContentNegotiationStrategy.java       |  22 +-
 .../PathExtensionContentNegotiationStrategy.java   |   5 +-
 ...letPathExtensionContentNegotiationStrategy.java |  14 +-
 .../support/WebApplicationContextUtils.java        |   4 +-
 .../web/cors/CorsConfigurationSource.java          |   3 +-
 .../web/filter/AbstractRequestLoggingFilter.java   |   7 +-
 .../org/springframework/web/filter/CorsFilter.java |  22 +-
 .../RequestParamMethodArgumentResolver.java        |   4 +-
 .../web/util/UriComponentsBuilder.java             | 178 +++++++------
 .../org/springframework/web/util/WebUtils.java     |  24 +-
 .../web/portlet/DispatcherPortlet.java             |  10 +-
 .../context/PortletApplicationContextUtils.java    |   4 +-
 .../web/servlet/AsyncHandlerInterceptor.java       |   7 +-
 .../web/servlet/DispatcherServlet.java             |   4 +-
 .../web/servlet/HandlerInterceptor.java            |  20 +-
 .../AbstractHandlerMethodExceptionResolver.java    |  10 +-
 .../AbstractMessageConverterMethodProcessor.java   | 117 +++++----
 .../ExceptionHandlerExceptionResolver.java         |  12 +-
 .../method/annotation/MvcUriComponentsBuilder.java |   4 +-
 .../annotation/ServletInvocableHandlerMethod.java  |  14 +-
 .../resource/ResourceHttpRequestHandler.java       |   2 +-
 .../support/ServletUriComponentsBuilder.java       |   4 +-
 .../web/servlet/tags/form/LabelTag.java            |   4 +-
 .../web/servlet/view/tiles3/TilesConfigurer.java   |   7 +-
 .../ExceptionHandlerExceptionResolverTests.java    |  24 +-
 .../ServletInvocableHandlerMethodTests.java        |  99 +++++--
 .../transport/session/AbstractSockJsSession.java   |  40 ++-
 .../transport/session/SockJsSessionTests.java      |   7 +-
 src/asciidoc/core-aop.adoc                         |  11 +-
 src/asciidoc/core-beans.adoc                       | 118 +++++----
 src/asciidoc/integration.adoc                      |  44 ++--
 126 files changed, 1724 insertions(+), 902 deletions(-)

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