Merge branch '6.0.x'

spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -24,8 +24,8 @@ import org.springframework.lang.Nullable;
 
 /**
  * Interface to be implemented by @{@link org.springframework.context.annotation.Configuration
- * Configuration} classes annotated with @{@link EnableCaching} that wish or need to
- * specify explicitly how caches are resolved and how keys are generated for annotation-driven
+ * Configuration} classes annotated with @{@link EnableCaching} that wish or need to specify
+ * explicitly how caches are resolved and how keys are generated for annotation-driven
  * cache management.
  *
  * <p>See @{@link EnableCaching} for general examples and context; see

spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -141,11 +141,8 @@ import org.springframework.core.Ordered;
  * must be provided explicitly. Return {@code null} or {@code new SimpleKeyGenerator()}
  * from this method if no customization is necessary.
  *
- * <p>{@link CachingConfigurer} offers additional customization options: it is recommended
- * to extend from {@link org.springframework.cache.annotation.CachingConfigurerSupport
- * CachingConfigurerSupport} that provides a default implementation for all methods which
- * can be useful if you do not need to customize everything. See {@link CachingConfigurer}
- * Javadoc for further details.
+ * <p>{@link CachingConfigurer} offers additional customization options:
+ * see the {@link CachingConfigurer} javadoc for further details.
  *
  * <p>The {@link #mode} attribute controls how advice is applied: If the mode is
  * {@link AdviceMode#PROXY} (the default), then the other attributes control the behavior