Document support for @Cache* as merged composed annotations

Issue: SPR-13475

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -29,6 +29,9 @@ import org.springframework.core.annotation.AliasFor;
  * Annotation indicating that a method (or all methods on a class) triggers a
  * {@link org.springframework.cache.Cache#evict(Object) cache evict} operation.
  *
+ * <p>This annotation may be used as a <em>meta-annotation</em> to create custom
+ * <em>composed annotations</em> with attribute overrides.
+ *
  * @author Costin Leau
  * @author Stephane Nicoll
  * @author Sam Brannen

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -33,6 +33,9 @@ import org.springframework.core.annotation.AliasFor;
  * does not cause the advised method to be skipped. Rather, it always causes the
  * method to be invoked and its result to be stored in the associated cache.
  *
+ * <p>This annotation may be used as a <em>meta-annotation</em> to create custom
+ * <em>composed annotations</em> with attribute overrides.
+ *
  * @author Costin Leau
  * @author Phillip Webb
  * @author Stephane Nicoll

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -40,6 +40,9 @@ import org.springframework.core.annotation.AliasFor;
  * <p>If no value is found in the cache for the computed key, the target method
  * will be invoked and the returned value stored in the associated cache.
  *
+ * <p>This annotation may be used as a <em>meta-annotation</em> to create custom
+ * <em>composed annotations</em> with attribute overrides.
+ *
  * @author Costin Leau
  * @author Phillip Webb
  * @author Stephane Nicoll

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -26,6 +26,9 @@ import java.lang.annotation.Target;
 /**
  * Group annotation for multiple cache annotations (of different or the same type).
  *
+ * <p>This annotation may be used as a <em>meta-annotation</em> to create custom
+ * <em>composed annotations</em> with attribute overrides.
+ *
  * @author Costin Leau
  * @author Chris Beams
  * @since 3.1

src/asciidoc/whats-new.adoc

@@ -641,7 +641,6 @@ public @interface MyTestConfig {
 * `@Scheduled` and `@Schedules` may now be used as _meta-annotations_ to create
   custom _composed annotations_ with attribute overrides.
 
-
 === Data Access Improvements
 
 * `jdbc:initialize-database` and `jdbc:embedded-database` support a configurable
@@ -661,6 +660,8 @@ Spring 4.3 also improves the caching abstraction as follows:
   `@beanName.method()`).
 * `ConcurrentMapCacheManager` and `ConcurrentMapCache` now support the serialization
   of cache entries via a new `storeByValue` attribute.
+* `@Cacheable`, `@CacheEvict`, `@CachePut`, and `@Caching` may now be used as
+  _meta-annotations_ to create custom _composed annotations_ with attribute overrides.
 
 === JMS Improvements
 
@@ -706,4 +707,3 @@ Spring 4.3 also improves the caching abstraction as follows:
 * Client-side REST test support allows indicating how many times a request is expected and
   whether the order of declaration for expectations should be ignored (see <<spring-mvc-test-client>>).
 * Client-side REST Test supports expectations for form data in the request body.
-