diff --git a/spring-context/src/main/java/org/springframework/context/annotation/EnableAspectJAutoProxy.java b/spring-context/src/main/java/org/springframework/context/annotation/EnableAspectJAutoProxy.java index bb82665f839..4e2afc28c0f 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/EnableAspectJAutoProxy.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/EnableAspectJAutoProxy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -77,8 +77,8 @@ import java.lang.annotation.Target; * // ... * } * - *
Note that {@code @Aspect} beans may be component-scanned like any other. Simply - * mark the aspect with both {@code @Aspect} and {@code @Component}: + *
Note that {@code @Aspect} beans may be component-scanned like any other. + * Simply mark the aspect with both {@code @Aspect} and {@code @Component}: * *
* package com.foo; @@ -101,6 +101,16 @@ import java.lang.annotation.Target; * // no explicit @Bean definitions required * }* + * Note: {@code @EnableAspectJAutoProxy} applies to its local application context only, + * allowing for selective proxying of beans at different levels. Please redeclare + * {@code @EnableAspectJAutoProxy} in each individual context, e.g. the common root web + * application context and any separate {@code DispatcherServlet} application contexts, + * if you need to apply its behavior at multiple levels. + * + *
This feature requires the presence of {@code aspectjweaver} on the classpath. + * While that dependency is optional for {@code spring-aop} in general, it is required + * for {@code @EnableAspectJAutoProxy} and its underlying facilities. + * * @author Chris Beams * @author Juergen Hoeller * @since 3.1 diff --git a/src/docs/asciidoc/core/core-aop.adoc b/src/docs/asciidoc/core/core-aop.adoc index e37be11e098..8743f44d562 100644 --- a/src/docs/asciidoc/core/core-aop.adoc +++ b/src/docs/asciidoc/core/core-aop.adoc @@ -235,7 +235,7 @@ as needed. The @AspectJ support can be enabled with XML or Java style configuration. In either case you will also need to ensure that AspectJ's `aspectjweaver.jar` library is on the -classpath of your application (version 1.6.8 or later). This library is available in the +classpath of your application (version 1.8 or later). This library is available in the `'lib'` directory of an AspectJ distribution or via the Maven Central repository.