Merge branch '6.2.x'

Author: sbrannen

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

@@ -35,6 +35,8 @@
  * @author Sam Brannen
  * @since 4.1
  * @see Cacheable
+ * @see CachePut
+ * @see CacheEvict
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
@@ -43,7 +45,9 @@
 
 	/**
 	 * Alias for {@link #cacheNames}.
-	 * @since 7.0
+	 * <p>Intended to be used when no other attributes are needed, for example:
+	 * {@code @CacheConfig("books")}.
+	 * @since 6.2.9
 	 */
 	@AliasFor("cacheNames")
 	String[] value() default {};

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

@@ -38,6 +38,8 @@
  * @author Sam Brannen
  * @since 3.1
  * @see CacheConfig
+ * @see Cacheable
+ * @see CachePut
  */
 @Target({ElementType.TYPE, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
@@ -48,6 +50,8 @@
 
 	/**
 	 * Alias for {@link #cacheNames}.
+	 * <p>Intended to be used when no other attributes are needed, for example:
+	 * {@code @CacheEvict("books")}.
 	 */
 	@AliasFor("cacheNames")
 	String[] value() default {};

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

@@ -46,6 +46,8 @@
  * @author Sam Brannen
  * @since 3.1
  * @see CacheConfig
+ * @see Cacheable
+ * @see CacheEvict
  */
 @Target({ElementType.TYPE, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
@@ -56,6 +58,8 @@
 
 	/**
 	 * Alias for {@link #cacheNames}.
+	 * <p>Intended to be used when no other attributes are needed, for example:
+	 * {@code @CachePut("books")}.
 	 */
 	@AliasFor("cacheNames")
 	String[] value() default {};

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

@@ -54,6 +54,8 @@
  * @author Sam Brannen
  * @since 3.1
  * @see CacheConfig
+ * @see CachePut
+ * @see CacheEvict
  */
 @Target({ElementType.TYPE, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
@@ -64,6 +66,8 @@
 
 	/**
 	 * Alias for {@link #cacheNames}.
+	 * <p>Intended to be used when no other attributes are needed, for example:
+	 * {@code @Cacheable("books")}.
 	 */
 	@AliasFor("cacheNames")
 	String[] value() default {};