Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.2.x'

Browse Source 
# Conflicts:
#	spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
#	spring-context-support/src/main/java/org/springframework/cache/jcache/config/AbstractJCacheConfiguration.java
This commit is contained in:
Juergen Hoeller
2020-06-11 23:53:27 +02:00
parent bc4945d677 9138a04a0a
commit 1279b3b822
8 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-context-support/src/main/java/org/springframework/cache/jcache/config/AbstractJCacheConfiguration.java vendored
View File

@@ -39,7 +39,7 @@ import org.springframework.lang.Nullable;
* @see JCacheConfigurer
*/
@Configuration(proxyBeanMethods = false)
public class AbstractJCacheConfiguration extends AbstractCachingConfiguration {
public abstract class AbstractJCacheConfiguration extends AbstractCachingConfiguration {
@Nullable
protected Supplier<CacheResolver> exceptionCacheResolver;