[libspring-java] 03/08: Merge tag 'upstream/4.3.7'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Jul 4 09:46:57 UTC 2017
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 db9d18077b1df43808b43ce6f40e2c809143d679
Merge: a2ba1f2 8fd583e
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu May 11 17:03:20 2017 +0200
Merge tag 'upstream/4.3.7'
Upstream version 4.3.7
build.gradle | 16 +-
gradle.properties | 2 +-
.../aop/aspectj/TypePatternClassFilter.java | 22 +-
.../aop/framework/CglibAopProxy.java | 6 +-
.../autoproxy/AbstractAdvisorAutoProxyCreator.java | 5 +-
.../aspectj/TransactionAspectTests.java | 76 +++---
.../org/springframework/beans/PropertyMatches.java | 6 +-
.../AutowiredAnnotationBeanPostProcessor.java | 4 +-
.../factory/config/CustomScopeConfigurer.java | 6 +-
.../factory/config/MethodInvokingFactoryBean.java | 4 +-
.../beans/factory/support/AbstractBeanFactory.java | 4 +-
.../factory/xml/BeanDefinitionParserDelegate.java | 14 +-
.../AutowiredAnnotationBeanPostProcessorTests.java | 49 +++-
.../beans/support/PropertyComparatorTests.java | 36 ++-
.../jcache/interceptor/CacheResultInterceptor.java | 16 +-
.../interceptor/DefaultCacheInvocationContext.java | 21 +-
.../jcache/interceptor/JCacheAspectSupport.java | 16 +-
.../scheduling/quartz/SchedulerFactoryBean.java | 4 +-
.../interceptor/CacheResolverAdapterTests.java | 19 +-
.../interceptor/JCacheErrorHandlerTests.java | 78 +++++-
.../annotation/SpringCacheAnnotationParser.java | 5 +-
.../cache/interceptor/AbstractCacheInvoker.java | 4 +-
.../AbstractFallbackCacheOperationSource.java | 6 +-
.../cache/interceptor/CacheOperation.java | 18 +-
.../annotation/ComponentScanAnnotationParser.java | 6 +-
.../annotation/ConfigurationClassEnhancer.java | 199 ++++++++++-----
.../annotation/ConfigurationClassParser.java | 60 +++--
.../context/support/DefaultLifecycleProcessor.java | 8 +-
.../support/PostProcessorRegistrationDelegate.java | 6 +-
.../standard/DateTimeFormatterFactory.java | 4 +-
.../glassfish/GlassFishLoadTimeWeaver.java | 17 +-
.../classloading/jboss/JBossMCAdapter.java | 4 +-
.../jboss/JBossMCTranslatorAdapter.java | 7 +-
.../classloading/jboss/JBossModulesAdapter.java | 28 +-
.../classloading/tomcat/TomcatLoadTimeWeaver.java | 8 +-
.../weblogic/WebLogicClassLoaderAdapter.java | 17 +-
.../websphere/WebSphereClassLoaderAdapter.java | 12 +-
.../websphere/WebSphereClassPreDefinePlugin.java | 12 +-
.../annotation/AsyncAnnotationAdvisor.java | 7 +-
.../scheduling/support/CronSequenceGenerator.java | 6 +-
.../MethodValidationPostProcessor.java | 3 +-
.../aop/framework/ClassWithComplexConstructor.java | 7 +-
.../org/springframework/cache/CacheReproTests.java | 98 ++++++-
.../cache/config/CacheableService.java | 6 +-
.../cache/config/DefaultCacheableService.java | 44 ++--
.../cache/config/EnableCachingTests.java | 28 +-
.../ConfigurationClassPostProcessorTests.java | 20 +-
.../context/annotation/Spr11202Tests.java | 29 +--
.../context/annotation/Spr15275Tests.java | 259 +++++++++++++++++++
.../context/annotation/Spr6602Tests.java | 11 +-
.../ConfigurationClassProcessingTests.java | 54 ++--
.../springframework/context/support/Service.java | 5 +-
.../datetime/standard/DateTimeFormattingTests.java | 3 +-
.../scheduling/annotation/EnableAsyncTests.java | 130 ++++++++--
.../java/org/springframework/core/Constants.java | 4 +-
.../core/ParameterizedTypeReference.java | 6 +-
.../core/SerializableTypeWrapper.java | 7 +-
.../core/annotation/AnnotatedElementUtils.java | 10 +-
.../support/StringToCharacterConverter.java | 4 +-
.../support/StringToEnumConverterFactory.java | 4 +-
.../support/StringToNumberConverterFactory.java | 4 +-
.../core/env/JOptCommandLinePropertySource.java | 13 +-
.../PathMatchingResourcePatternResolver.java | 4 +-
.../core/io/support/PropertiesLoaderSupport.java | 13 +-
.../main/java/org/springframework/util/Assert.java | 269 ++++++++++----------
.../java/org/springframework/util/Base64Utils.java | 4 +-
.../util/ConcurrentReferenceHashMap.java | 4 +-
.../org/springframework/util/MimeTypeUtils.java | 2 +-
.../util/PropertyPlaceholderHelper.java | 12 +-
.../java/org/springframework/util/StringUtils.java | 30 +--
.../CompletableToListenableFutureAdapter.java | 18 +-
.../util/concurrent/ListenableFuture.java | 3 +-
.../util/concurrent/ListenableFutureTask.java | 5 +-
.../util/concurrent/SettableListenableFuture.java | 125 +++++----
.../util/xml/AbstractStaxHandler.java | 6 +-
.../annotation/AnnotatedElementUtilsTests.java | 37 ++-
.../core/annotation/AnnotationUtilsTests.java | 11 +-
.../env/PropertySourcesPropertyResolverTests.java | 8 +-
.../java/org/springframework/util/AssertTests.java | 281 +++++++++++++++------
.../util/LinkedMultiValueMapTests.java | 9 +-
.../util/comparator/CompoundComparatorTests.java | 6 +-
.../util/comparator/InvertibleComparatorTests.java | 26 +-
.../concurrent/SettableListenableFutureTests.java | 129 +++++++---
.../common/TemplateAwareExpressionParser.java | 102 ++++----
.../springframework/expression/spel/ast/Elvis.java | 19 +-
.../expression/spel/ast/FormatHelper.java | 37 +--
.../springframework/expression/spel/ast/OpDec.java | 4 +-
.../springframework/expression/spel/ast/OpInc.java | 4 +-
.../expression/spel/ast/OpPlus.java | 4 +-
.../expression/spel/ast/Operator.java | 4 +-
.../expression/spel/ast/Ternary.java | 10 +-
.../standard/InternalSpelExpressionParser.java | 147 ++++++-----
.../expression/spel/standard/Tokenizer.java | 9 +-
.../spel/SpelCompilationCoverageTests.java | 190 +++++++++++++-
.../spel/support/ReflectionHelperTests.java | 5 +-
.../jdbc/core/CallableStatementCreatorFactory.java | 7 +-
.../jdbc/core/ParameterDisposer.java | 16 +-
.../jdbc/core/PreparedStatementCreatorFactory.java | 7 +-
.../jdbc/core/metadata/CallMetaDataProvider.java | 4 +-
.../metadata/GenericTableMetaDataProvider.java | 6 +-
.../core/metadata/OracleTableMetaDataProvider.java | 91 ++++---
.../jdbc/core/metadata/TableMetaDataProvider.java | 53 ++--
.../metadata/TableMetaDataProviderFactory.java | 14 +-
.../core/simple/SimpleJdbcInsertOperations.java | 9 +-
.../core/support/JdbcBeanDefinitionReader.java | 4 +-
.../jdbc/core/support/SqlLobValue.java | 5 +-
.../jdbc/datasource/ConnectionProxy.java | 5 +-
.../datasource/DataSourceTransactionManager.java | 77 +++++-
.../datasource/JdbcTransactionObjectSupport.java | 21 +-
.../datasource/LazyConnectionDataSourceProxy.java | 4 +-
.../datasource/SingleConnectionDataSource.java | 9 +-
.../TransactionAwareDataSourceProxy.java | 6 +-
.../datasource/WebSphereDataSourceAdapter.java | 14 +-
.../springframework/jdbc/support/JdbcUtils.java | 6 +-
.../jdbc/support/lob/package-info.java | 7 +-
.../jdbc/core/JdbcTemplateTests.java | 77 +++---
.../DataSourceTransactionManagerTests.java | 111 +++++++-
.../jms/connection/ConnectionFactoryUtils.java | 21 +-
.../jms/connection/JmsTransactionManager.java | 9 +-
.../jms/core/JmsMessagingTemplate.java | 4 +-
.../handler/annotation/MessageMapping.java | 10 +-
.../AbstractNamedValueMethodArgumentResolver.java | 2 +-
.../CompletableFutureReturnValueHandler.java | 11 +-
.../HandlerMethodReturnValueHandlerComposite.java | 9 +-
.../messaging/simp/SimpMessagingTemplate.java | 14 +-
.../SimpAnnotationMethodMessageHandler.java | 4 +-
.../simp/broker/AbstractSubscriptionRegistry.java | 40 +--
.../simp/broker/DefaultSubscriptionRegistry.java | 21 +-
.../simp/broker/SimpleBrokerMessageHandler.java | 7 +-
.../config/AbstractMessageBrokerConfiguration.java | 6 +-
.../simp/config/MessageBrokerRegistry.java | 6 +-
.../messaging/simp/stomp/DefaultStompSession.java | 49 ++--
.../messaging/simp/stomp/StompClientSupport.java | 4 +-
.../messaging/support/MessageHeaderAccessor.java | 56 ++--
.../messaging/tcp/ReconnectStrategy.java | 3 +-
.../SimpAnnotationMethodMessageHandlerTests.java | 18 +-
.../simp/stomp/Reactor2TcpStompClientTests.java | 5 +-
...pBrokerRelayMessageHandlerIntegrationTests.java | 7 +-
.../support/MessageHeaderAccessorTests.java | 46 ++--
.../support/OpenSessionInViewInterceptor.java | 3 +-
.../orm/hibernate5/SessionFactoryUtils.java | 4 +-
.../support/OpenSessionInViewInterceptor.java | 3 +-
.../orm/jpa/AbstractEntityManagerFactoryBean.java | 5 +-
.../orm/jpa/support/SharedEntityManagerBean.java | 3 +-
.../orm/jpa/vendor/HibernateJpaDialect.java | 4 +-
.../orm/jpa/vendor/HibernateJpaVendorAdapter.java | 10 +-
.../oxm/xstream/XStreamMarshaller.java | 17 +-
.../springframework/mock/web/MockAsyncContext.java | 6 +-
.../mock/web/MockHttpServletRequest.java | 82 +++---
.../springframework/mock/web/MockPageContext.java | 6 +-
.../springframework/test/util/AopTestUtils.java | 29 +--
.../client/MockMvcClientHttpRequestFactory.java | 2 +-
.../client/SimpleRequestExpectationManager.java | 4 +-
.../web/servlet/result/ContentResultMatchers.java | 4 +-
.../servlet/setup/StandaloneMockMvcBuilder.java | 4 +-
.../mock/web/MockHttpServletRequestTests.java | 29 ++-
.../standalone/FrameworkExtensionTests.java | 18 +-
.../jca/support/ResourceAdapterFactoryBean.java | 12 +-
...AbstractFallbackTransactionAttributeSource.java | 9 +-
.../AbstractPlatformTransactionManager.java | 3 +-
.../transaction/support/ResourceHolderSupport.java | 8 +-
.../support/TransactionCallbackWithoutResult.java | 5 +-
.../support/TransactionSynchronizationManager.java | 12 +-
.../EnableTransactionManagementTests.java | 127 ++++++++--
.../http/client/InterceptingClientHttpRequest.java | 10 +-
.../InterceptingClientHttpRequestFactory.java | 7 +-
.../http/client/Netty4ClientHttpRequest.java | 9 +-
.../client/SimpleClientHttpRequestFactory.java | 6 +-
.../converter/AbstractHttpMessageConverter.java | 10 +-
.../MappingJackson2XmlHttpMessageConverter.java | 9 +-
.../http/server/ServletServerHttpRequest.java | 6 +-
.../web/accept/ContentNegotiationManager.java | 6 +-
.../PathExtensionContentNegotiationStrategy.java | 8 +-
...nsatisfiedServletRequestParameterException.java | 4 +-
.../web/bind/annotation/ResponseStatus.java | 4 +-
.../springframework/web/context/ContextLoader.java | 8 +-
.../web/cors/CorsConfiguration.java | 18 +-
.../web/filter/ShallowEtagHeaderFilter.java | 31 ++-
.../AbstractNamedValueMethodArgumentResolver.java | 4 +-
.../annotation/ModelAttributeMethodProcessor.java | 5 +-
.../web/util/HierarchicalUriComponents.java | 2 +-
.../InterceptingClientHttpRequestFactoryTests.java | 56 ++--
.../mock/web/test/MockAsyncContext.java | 10 +-
.../mock/web/test/MockHttpServletRequest.java | 82 +++---
.../mock/web/test/MockPageContext.java | 6 +-
.../web/client/AbstractMockWebServerTestCase.java | 3 +-
.../web/filter/ShallowEtagHeaderFilterTests.java | 3 +
.../commons/CommonsMultipartResolverTests.java | 20 +-
.../web/util/DefaultUriTemplateHandlerTests.java | 6 +-
.../web/servlet/DispatcherServlet.java | 13 +-
.../web/servlet/HttpServletBean.java | 24 +-
.../config/annotation/CorsRegistration.java | 11 +-
.../servlet/config/annotation/CorsRegistry.java | 13 +-
.../annotation/WebMvcConfigurationSupport.java | 2 +
.../handler/AbstractHandlerMethodMapping.java | 8 +-
.../servlet/handler/AbstractUrlHandlerMapping.java | 28 +-
...ractMessageConverterMethodArgumentResolver.java | 4 +-
.../DeferredResultMethodReturnValueHandler.java | 13 +-
.../annotation/HttpHeadersReturnValueHandler.java | 4 +-
.../method/annotation/MvcUriComponentsBuilder.java | 17 +-
.../annotation/RequestMappingHandlerAdapter.java | 6 +-
.../RequestPartMethodArgumentResolver.java | 4 +-
.../ResponseBodyEmitterReturnValueHandler.java | 13 +-
.../annotation/ResponseEntityExceptionHandler.java | 9 +-
.../annotation/ServletInvocableHandlerMethod.java | 6 +-
.../ServletRequestMethodArgumentResolver.java | 67 +++--
.../servlet/mvc/method/annotation/SseEmitter.java | 5 +-
.../StreamingResponseBodyReturnValueHandler.java | 4 +-
.../support/ServletUriComponentsBuilder.java | 11 +-
.../view/ContentNegotiatingViewResolver.java | 4 +-
.../servlet/view/script/ScriptTemplateView.java | 4 +-
.../web/servlet/ComplexWebApplicationContext.java | 38 ++-
.../web/servlet/config/MvcNamespaceTests.java | 23 +-
.../annotation/ResponseBodyEmitterTests.java | 16 +-
.../ServletRequestMethodArgumentResolverTests.java | 56 ++--
...ServletResponseMethodArgumentResolverTests.java | 31 +--
.../AbstractWebSocketHandlerRegistration.java | 22 +-
.../socket/messaging/DefaultSimpUserRegistry.java | 65 ++---
.../server/jetty/JettyRequestUpgradeStrategy.java | 6 +-
.../standard/AbstractStandardUpgradeStrategy.java | 10 +-
.../sockjs/client/RestTemplateXhrTransport.java | 4 +-
.../socket/sockjs/client/WebSocketTransport.java | 12 +-
.../transport/session/AbstractSockJsSession.java | 4 +-
.../transport/session/StreamingSockJsSession.java | 4 +-
src/asciidoc/web-mvc.adoc | 4 +-
src/asciidoc/web-websocket.adoc | 10 +-
226 files changed, 3359 insertions(+), 1987 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git
More information about the pkg-java-commits
mailing list