Upgrade to ASM 9.1, delete obsolete ASM binaries

Keep only ASM 2.0 binary because it is still used in UnweavableTest
which uses an old ASM API, e.g. with a ClassWriter constructor which no
longer exists.

Also add JarJar 1.3 library because it is needed by an Ant task in
lib/asm/build.xml.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

ajdoc/pom.xml

@@ -45,7 +45,7 @@
       <artifactId>asm</artifactId>
       <version>1.0</version>
       <scope>system</scope>
-      <systemPath>${project.basedir}/../lib/asm/asm-8.0.1.renamed.jar</systemPath>
+      <systemPath>${project.basedir}/../lib/asm/asm-9.1.renamed.jar</systemPath>
     </dependency>
 
     <!-- Dependencies needed for running tests in this module independently of complete reactor build -->

aspectjmatcher/pom.xml

@@ -43,7 +43,7 @@
 							<tasks>
 								<echo message="unzip jarjar'd asm" />
 								<unzip
-									src="${project.basedir}/../lib/asm/asm-8.0.1.renamed.jar"
+									src="${project.basedir}/../lib/asm/asm-9.1.renamed.jar"
 									dest="target/asm-unzipped" />
 							</tasks>
 						</configuration>

aspectjtools/pom.xml

@@ -50,7 +50,7 @@
 							<tasks>
 								<echo message="unzip jarjar'd asm" />
 								<unzip
-									src="${project.basedir}/../lib/asm/asm-8.0.1.renamed.jar"
+									src="${project.basedir}/../lib/asm/asm-9.1.renamed.jar"
 									dest="target/asm-unzipped" />
 							</tasks>
 						</configuration>

aspectjweaver/pom.xml

@@ -50,7 +50,7 @@
 							<tasks>
 								<echo message="unzip jarjar'd asm" />
 								<unzip
-									src="${project.basedir}/../lib/asm/asm-8.0.1.renamed.jar"
+									src="${project.basedir}/../lib/asm/asm-9.1.renamed.jar"
 									dest="target/asm-unzipped" />
 							</tasks>
 						</configuration>

docs/pom.xml

@@ -85,7 +85,7 @@
               <artifactId>asm</artifactId>
               <version>1.0</version>
               <scope>system</scope>
-              <systemPath>${project.basedir}/../lib/asm/asm-8.0.1.renamed.jar</systemPath>
+              <systemPath>${project.basedir}/../lib/asm/asm-9.1.renamed.jar</systemPath>
             </dependency>
         -->
       </dependencies>

lib/asm/build.xml

@@ -1,14 +1,13 @@
 <project name="jarjar-asm" default="package">
 
-	<!-- if you need this defining, use the jarjar-1.0.jar in this project -->
-    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"/>
+  <!-- If you need the 'jarjar' task, put lib/jarjar/jarjar-1.3.jar on the Ant classpath -->
+  <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"/>
+
+  <target name="package" description="Jarjar asm-NNN.jar and prefix package name with aj">
+    <jarjar destfile="asm-9.1.renamed.jar">
+      <zipfileset src="asm-9.1.jar" excludes="module-info.class"/>
+      <rule pattern="org.objectweb.asm.**" result="aj.org.objectweb.asm.@1"/>
+    </jarjar>
+  </target>
 
-	<target name="package" description="Jarjar asm-NNN.jar and prefix package name with aj">
-	        <jarjar destfile="asm-8.0.1.renamed.jar">
-	          <zipfileset src="asm-8.0.1.jar" excludes="module-info.class"/>
-	          <rule pattern="org.objectweb.asm.**" result="aj.org.objectweb.asm.@1"/>
-	        </jarjar>
-	</target> 
-	
-			
 </project>

org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java

@@ -93,7 +93,7 @@ public abstract class AjcTestCase extends TestCase {
 			+ File.separator
 			+ "bcel-verifier.jar"
 
-			+ File.pathSeparator + ".." +  File.separator + "lib" + File.separator + "asm" + File.separator + "asm-8.0.1.renamed.jar"
+			+ File.pathSeparator + ".." +  File.separator + "lib" + File.separator + "asm" + File.separator + "asm-9.1.renamed.jar"
 
 			// When the build machine executes the tests, it is using code built into jars rather than code build into
 			// bin directories. This means for the necessary types to be found we have to put these jars on the classpath:

tests/pom.xml

@@ -54,7 +54,7 @@
 			<artifactId>asm</artifactId>
 			<version>1.0</version>
 			<scope>system</scope>
-			<systemPath>${project.basedir}/../lib/asm/asm-8.0.1.renamed.jar</systemPath>
+			<systemPath>${project.basedir}/../lib/asm/asm-9.1.renamed.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>

weaver/pom.xml

@@ -78,7 +78,7 @@
       <artifactId>asm</artifactId>
       <version>1.0</version>
       <scope>system</scope>
-      <systemPath>${project.basedir}/../lib/asm/asm-8.0.1.renamed.jar</systemPath>
+      <systemPath>${project.basedir}/../lib/asm/asm-9.1.renamed.jar</systemPath>
     </dependency>
   </dependencies>
 </project>

weaver/src/main/java/org/aspectj/weaver/bcel/asm/StackMapAdder.java

@@ -56,7 +56,7 @@ public class StackMapAdder {
 	private static class AspectJClassVisitor extends ClassVisitor {
 
 		public AspectJClassVisitor(ClassVisitor classwriter) {
-			super(Opcodes.ASM8, classwriter);
+			super(Opcodes.ASM9, classwriter);
 		}
 
 		@Override
@@ -69,7 +69,7 @@ public class StackMapAdder {
 		// created by a ClassWriter (see top level class comment)
 		static class AJMethodVisitor extends MethodVisitor {
 			public AJMethodVisitor(MethodVisitor mv) {
-				super(Opcodes.ASM8,mv);
+				super(Opcodes.ASM9,mv);
 			}
 		}