From b94040f329891ed2d7bc4c39bdb6836d59676bfe Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Thu, 8 Dec 2011 13:46:47 +0000
Subject: [PATCH] Remove unnecessary mentions of aspectjrt/aspectjweaver

aspectjrt is a subset of aspectjweaver. Eliminate mentions of aspectjrt
where aspectjweaver is already necessary (e.g. LTW), and do not mention
aspectjweaver where only aspectrt is required (e.g. @Aspect proxying)

Also bump required version of aspect* libs from 1.5 to 1.6.8, reflecting
OSGi and pom metadata.

Issue: SPR-8896
---
 spring-framework-reference/src/aop.xml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/spring-framework-reference/src/aop.xml b/spring-framework-reference/src/aop.xml
index 69d38023f24..8cddb122de8 100644
--- a/spring-framework-reference/src/aop.xml
+++ b/spring-framework-reference/src/aop.xml
@@ -343,12 +343,11 @@
 
       <programlisting language="xml">&lt;bean class="org.springframework.aop.aspectj.annotation.AnnotationAwareAspectJAutoProxyCreator" /&gt;</programlisting>
 
-      <para>You will also need two AspectJ libraries on the classpath of your
-      application: <filename class="libraryfile">aspectjweaver.jar</filename>
-      and <filename class="libraryfile">aspectjrt.jar</filename>, version 1.6.8
-      or later required. These libraries are available in the <filename
-      class="directory">'lib'</filename> directory of an AspectJ distribution
-      or via the Maven Central repository.</para>
+      <para>You will also need AspectJ's
+      <filename class="libraryfile">aspectjrt.jar</filename> library on the
+      classpath of your application, version 1.6.8 or later. This library is
+      available in the <filename class="directory">'lib'</filename> directory
+      of an AspectJ distribution or via the Maven Central repository.</para>
     </section>
 
     <section id="aop-at-aspectj">
@@ -3431,14 +3430,9 @@ public final class Main {
             2.5 or later, plus all mandatory dependencies)</para>
           </listitem>
 
-          <listitem>
-            <para><filename class="libraryfile">aspectjrt.jar</filename>
-            (version 1.5 or later)</para>
-          </listitem>
-
           <listitem>
             <para><filename class="libraryfile">aspectjweaver.jar</filename>
-            (version 1.5 or later)</para>
+            (version 1.6.8 or later)</para>
           </listitem>
         </orderedlist>