Merge branch '5.1.x'

This commit is contained in:
Juergen Hoeller
2019-06-12 18:16:30 +02:00
19 changed files with 31 additions and 31 deletions

View File

@@ -38,7 +38,7 @@ import org.springframework.core.annotation.AliasFor;
* @since 3.1
* @see CacheConfig
*/
@Target({ElementType.METHOD, ElementType.TYPE})
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Inherited
@Documented

View File

@@ -45,7 +45,7 @@ import org.springframework.core.annotation.AliasFor;
* @since 3.1
* @see CacheConfig
*/
@Target({ElementType.METHOD, ElementType.TYPE})
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Inherited
@Documented

View File

@@ -52,7 +52,7 @@ import org.springframework.core.annotation.AliasFor;
* @since 3.1
* @see CacheConfig
*/
@Target({ElementType.METHOD, ElementType.TYPE})
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Inherited
@Documented

View File

@@ -33,7 +33,7 @@ import java.lang.annotation.Target;
* @author Chris Beams
* @since 3.1
*/
@Target({ElementType.METHOD, ElementType.TYPE})
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Inherited
@Documented

View File

@@ -30,7 +30,7 @@ import java.lang.annotation.Target;
* @since 4.0
* @see org.springframework.beans.factory.config.BeanDefinition#getDescription()
*/
@Target({ElementType.METHOD, ElementType.TYPE})
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface Description {

View File

@@ -50,7 +50,7 @@ import java.lang.annotation.Target;
* @see AnnotationAsyncExecutionInterceptor
* @see AsyncAnnotationAdvisor
*/
@Target({ElementType.METHOD, ElementType.TYPE})
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface Async {