build.gradle

@@ -31,7 +31,7 @@ configure(allprojects) { project ->
 	group = "org.springframework"
 	version = qualifyVersionIfNecessary(version)
 
-	ext.aspectjVersion       = "1.8.10"
+	ext.aspectjVersion       = "1.8.9"
 	ext.caffeineVersion      = "2.3.5"
 	ext.eclipselinkVersion   = "2.4.2"
 	ext.ehcacheVersion       = "2.10.4"
@@ -52,7 +52,7 @@ configure(allprojects) { project ->
 	ext.hsqldbVersion        = "2.3.4"
 	ext.httpasyncVersion     = "4.1.3"
 	ext.httpclientVersion    = "4.5.3"
-	ext.jackson2Version      = "2.8.9"
+	ext.jackson2Version      = "2.8.10"
 	ext.jasperreportsVersion = "6.2.1"  // our tests fail with JR-internal NPEs against 6.2.2 and higher
 	ext.javamailVersion      = "1.5.6"
 	ext.jettyVersion         = "9.3.14.v20161028"  // as of 9.3.15, Jetty has hard Servlet 3.1 requirement
@@ -62,9 +62,9 @@ configure(allprojects) { project ->
 	ext.jtaVersion           = "1.2"
 	ext.junitVersion         = "4.12"
 	ext.log4jVersion         = "1.2.17"
-	ext.nettyVersion         = "4.1.13.Final"
+	ext.nettyVersion         = "4.1.15.Final"
 	ext.okhttpVersion        = "2.7.5"
-	ext.okhttp3Version       = "3.7.0"
+	ext.okhttp3Version       = "3.8.1"
 	ext.openjpaVersion       = "2.4.1"
 	ext.poiVersion           = "3.14"
 	ext.reactorVersion       = "2.0.8.RELEASE"
@@ -77,7 +77,7 @@ configure(allprojects) { project ->
 	ext.tiles3Version        = "3.0.7"
 	ext.tomcatVersion        = "8.5.16"
 	ext.tyrusVersion         = "1.3.5"  // constrained by WebLogic 12.1.3 support
-	ext.undertowVersion      = "1.3.30.Final"
+	ext.undertowVersion      = "1.3.31.Final"
 	ext.xmlunitVersion       = "1.6"
 	ext.xstreamVersion       = "1.4.9"
 
@@ -658,6 +658,8 @@ project("spring-context-support") {
 		testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
 		testRuntime("com.sun.mail:javax.mail:${javamailVersion}")
 		testRuntime("org.ehcache:jcache:${ehcachejcacheVersion}")
+		testRuntime("org.ehcache:ehcache:${ehcache3Version}")
+		testRuntime("org.terracotta:management-model:2.3.0")
 	}
 }
 
@@ -1034,8 +1036,6 @@ project("spring-test") {
 		testCompile("org.apache.httpcomponents:httpclient:${httpclientVersion}")
 		testCompile("javax.cache:cache-api:1.0.0")
 		testRuntime("log4j:log4j:${log4jVersion}")
-		testRuntime("org.ehcache:ehcache:${ehcache3Version}")
-		testRuntime("org.terracotta:management-model:2.3.0")
 	}
 
 	task testNG(type: Test) {

gradle.properties

@@ -1 +1 @@
-version=4.3.10.BUILD-SNAPSHOT
+version=4.3.11.RELEASE

spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -232,6 +232,7 @@ public interface BeanDefinition extends AttributeAccessor, BeanMetadataElement {
 	/**
 	 * Return whether this a <b>Prototype</b>, with an independent instance
 	 * returned for each call.
+	 * @since 3.0
 	 * @see #SCOPE_PROTOTYPE
 	 */
 	boolean isPrototype();

spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java

@@ -366,7 +366,7 @@ public Object getObject() throws BeansException {
 		}
 
 		// Check if required type matches the type of the actual bean instance.
-		if (requiredType != null && bean != null && !requiredType.isAssignableFrom(bean.getClass())) {
+		if (requiredType != null && bean != null && !requiredType.isInstance(bean)) {
 			try {
 				return getTypeConverter().convertIfNecessary(bean, requiredType);
 			}

spring-test/src/test/java/org/springframework/cache/jcache/JCacheEhCache3AnnotationTests.java → spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCache3AnnotationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-test/src/test/java/org/springframework/cache/jcache/JCacheEhCache3ApiTests.java → spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCache3ApiTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.springframework.cache.jcache;
 
-import javax.annotation.Resource;
 import javax.cache.CacheManager;
 import javax.cache.Caching;
 import javax.cache.configuration.MutableConfiguration;
@@ -26,6 +25,7 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CachingConfigurerSupport;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.config.AbstractCacheAnnotationTests;
@@ -59,7 +59,7 @@ protected ConfigurableApplicationContext getApplicationContext() {
 	}
 
 	protected CachingProvider getCachingProvider() {
-		return Caching.getCachingProvider();
+		return Caching.getCachingProvider("org.ehcache.jcache.JCacheCachingProvider");
 	}
 
 	@After
@@ -81,7 +81,7 @@ public void testCustomCacheManager() {
 	@EnableCaching
 	static class EnableCachingConfig extends CachingConfigurerSupport {
 
-		@Resource
+		@Autowired
 		CachingProvider cachingProvider;
 
 		@Override
@@ -93,7 +93,7 @@ public org.springframework.cache.CacheManager cacheManager() {
 		@Bean
 		public CacheManager jCacheManager() {
 			CacheManager cacheManager = this.cachingProvider.getCacheManager();
-			MutableConfiguration<Object, Object> mutableConfiguration = new MutableConfiguration<Object, Object>();
+			MutableConfiguration<Object, Object> mutableConfiguration = new MutableConfiguration<>();
 			mutableConfiguration.setStoreByValue(false);  // otherwise value has to be Serializable
 			cacheManager.createCache("testCache", mutableConfiguration);
 			cacheManager.createCache("primary", mutableConfiguration);

spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ public void setup() {
 	}
 
 	protected CachingProvider getCachingProvider() {
-		return Caching.getCachingProvider();
+		return Caching.getCachingProvider("org.ehcache.jcache.JCacheCachingProvider");
 	}
 
 	@After
@@ -58,7 +58,6 @@ public void shutdown() {
 		}
 	}
 
-
 	@Override
 	protected JCacheCache getCache() {
 		return this.cache;

spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,7 +79,7 @@ abstract class ConfigurationClassUtils {
 	 */
 	public static boolean checkConfigurationClassCandidate(BeanDefinition beanDef, MetadataReaderFactory metadataReaderFactory) {
 		String className = beanDef.getBeanClassName();
-		if (className == null) {
+		if (className == null || beanDef.getFactoryMethodName() != null) {
 			return false;
 		}
 

spring-context/src/main/java/org/springframework/context/annotation/ContextAnnotationAutowireCandidateResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,11 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import org.springframework.aop.TargetSource;
 import org.springframework.aop.framework.ProxyFactory;
@@ -82,6 +87,16 @@ public boolean isStatic() {
 			public Object getTarget() {
 				Object target = beanFactory.doResolveDependency(descriptor, beanName, null, null);
 				if (target == null) {
+					Class<?> type = getTargetClass();
+					if (Map.class == type) {
+						return Collections.EMPTY_MAP;
+					}
+					else if (List.class == type) {
+						return Collections.EMPTY_LIST;
+					}
+					else if (Set.class == type || Collection.class == type) {
+						return Collections.EMPTY_SET;
+					}
 					throw new NoSuchBeanDefinitionException(descriptor.getResolvableType(),
 							"Optional dependency not present for lazy injection point");
 				}

spring-context/src/main/java/org/springframework/context/annotation/Profile.java

@@ -71,7 +71,7 @@
  * {@code @Profile} can therefore not be used to select an overloaded method with a
  * particular argument signature over another; resolution between all factory methods
  * for the same bean follows Spring's constructor resolution algorithm at creation time.
- * <b>Use distinct Java method names pointing to the same {@link @Bean#name bean name}
+ * <b>Use distinct Java method names pointing to the same {@link Bean#name bean name}
  * if you'd like to define alternative beans with different profile conditions</b>;
  * see {@code ProfileDatabaseConfig} in {@link Configuration @Configuration}'s javadoc.
  *

spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java

@@ -151,34 +151,38 @@ private ResolvableType resolveDefaultEventType(ApplicationEvent event) {
 	 * @param event the current event to propagate
 	 * @since 4.1
 	 */
-	@SuppressWarnings({"unchecked", "rawtypes"})
-	protected void invokeListener(ApplicationListener listener, ApplicationEvent event) {
+	protected void invokeListener(ApplicationListener<?> listener, ApplicationEvent event) {
 		ErrorHandler errorHandler = getErrorHandler();
 		if (errorHandler != null) {
 			try {
-				listener.onApplicationEvent(event);
+				doInvokeListener(listener, event);
 			}
 			catch (Throwable err) {
 				errorHandler.handleError(err);
 			}
 		}
 		else {
-			try {
-				listener.onApplicationEvent(event);
-			}
-			catch (ClassCastException ex) {
-				String msg = ex.getMessage();
-				if (msg == null || msg.startsWith(event.getClass().getName())) {
-					// Possibly a lambda-defined listener which we could not resolve the generic event type for
-					Log logger = LogFactory.getLog(getClass());
-					if (logger.isDebugEnabled()) {
-						logger.debug("Non-matching event type for listener: " + listener, ex);
-					}
-				}
-				else {
-					throw ex;
+			doInvokeListener(listener, event);
+		}
+	}
+
+	@SuppressWarnings({"unchecked", "rawtypes"})
+	private void doInvokeListener(ApplicationListener listener, ApplicationEvent event) {
+		try {
+			listener.onApplicationEvent(event);
+		}
+		catch (ClassCastException ex) {
+			String msg = ex.getMessage();
+			if (msg == null || msg.startsWith(event.getClass().getName())) {
+				// Possibly a lambda-defined listener which we could not resolve the generic event type for
+				Log logger = LogFactory.getLog(getClass());
+				if (logger.isDebugEnabled()) {
+					logger.debug("Non-matching event type for listener: " + listener, ex);
 				}
 			}
+			else {
+				throw ex;
+			}
 		}
 	}
 

spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java

@@ -75,7 +75,7 @@
  * instead. If you really need programmatic {@code #forExecutables} access, inject this class as
  * a {@link ValidatorFactory} and call {@link #getValidator()} on it, then {@code #forExecutables}
  * on the returned native {@link Validator} reference instead of directly on this class.
- * Alternatively, call {@code #unwrap(Validator.class) which will also provide the native object.
+ * Alternatively, call {@code #unwrap(Validator.class)} which will also provide the native object.
  *
  * <p>This class is also being used by Spring's MVC configuration namespace, in case of the
  * {@code javax.validation} API being present but no explicit Validator having been configured.
@@ -353,7 +353,7 @@ else if (args[0] instanceof Method) {
 			ReflectionUtils.invokeMethod(parameterNameProviderMethod, configuration, parameterNameProvider);
 
 		}
-		catch (Exception ex) {
+		catch (Throwable ex) {
 			// Bean Validation 1.1 API not available - simply not applying the ParameterNameDiscoverer
 		}
 	}

spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -81,7 +81,7 @@ public class MethodValidationInterceptor implements MethodInterceptor {
 	}
 
 
-	private final Validator validator;
+	private volatile Validator validator;
 
 
 	/**
@@ -116,7 +116,18 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
 
 		if (forExecutablesMethod != null) {
 			// Standard Bean Validation 1.1 API
-			Object execVal = ReflectionUtils.invokeMethod(forExecutablesMethod, this.validator);
+			Object execVal;
+			try {
+				execVal = ReflectionUtils.invokeMethod(forExecutablesMethod, this.validator);
+			}
+			catch (AbstractMethodError err) {
+				// Probably an adapter (maybe a lazy-init proxy) without BV 1.1 support
+				Validator nativeValidator = this.validator.unwrap(Validator.class);
+				execVal = ReflectionUtils.invokeMethod(forExecutablesMethod, nativeValidator);
+				// If successful, store native Validator for further use
+				this.validator = nativeValidator;
+			}
+
 			Method methodToValidate = invocation.getMethod();
 			Set<ConstraintViolation<?>> result;
 
@@ -137,13 +148,11 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
 			}
 
 			Object returnValue = invocation.proceed();
-
 			result = (Set<ConstraintViolation<?>>) ReflectionUtils.invokeMethod(validateReturnValueMethod,
 					execVal, invocation.getThis(), methodToValidate, returnValue, groups);
 			if (!result.isEmpty()) {
 				throw new ConstraintViolationException(result);
 			}
-
 			return returnValue;
 		}
 

spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java

@@ -51,7 +51,7 @@
  * <p>Note that Bean Validation 1.1's {@code #forExecutables} method isn't supported
  * on this adapter: We do not expect that method to be called by application code;
  * consider {@link MethodValidationInterceptor} instead. If you really need programmatic
- * {@code #forExecutables} access, call {@code #unwrap(Validator.class) which will
+ * {@code #forExecutables} access, call {@code #unwrap(Validator.class)} which will
  * provide the native {@link Validator} object with {@code #forExecutables} support.
  *
  * @author Juergen Hoeller
@@ -177,7 +177,9 @@ protected void processConstraintViolations(Set<ConstraintViolation<Object>> viol
 	 * @see org.springframework.validation.FieldError#getField()
 	 */
 	protected String determineField(ConstraintViolation<Object> violation) {
-		return violation.getPropertyPath().toString();
+		String path = violation.getPropertyPath().toString();
+		int elementIndex = path.indexOf(".<");
+		return (elementIndex >= 0 ? path.substring(0, elementIndex) : path);
 	}
 
 	/**