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>

diff --git a/ajdoc/pom.xml b/ajdoc/pom.xml
index e92109017e21056718a86ef27b71b1e80352f0df..780dcb8e357da3717b8756cc6e0a8abf8a8efb8c 100644 (file)
--- a/ajdoc/pom.xml
+++ b/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 -->

diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml
index ce975e7432a1010aaf83b10b5f5b406770a8b756..48e8f37fe577de4887c72e0e0410ddc282b858e2 100644 (file)
--- a/aspectjmatcher/pom.xml
+++ b/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>

diff --git a/aspectjtools/pom.xml b/aspectjtools/pom.xml
index 292e9db416c9ceea7c63c97ce42d00cdd1d4e956..6888bc955d57777711e8f42e561104927e63fa1a 100644 (file)
--- a/aspectjtools/pom.xml
+++ b/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>

diff --git a/aspectjweaver/pom.xml b/aspectjweaver/pom.xml
index a8856330ea449a65b4a1b54919b738e533c1914d..72c223ad619ae4ebc0fd4749d93ecd72144e9ebf 100644 (file)
--- a/aspectjweaver/pom.xml
+++ b/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>

diff --git a/docs/pom.xml b/docs/pom.xml
index 5b487c73ecbb42db8573109ae3e6374a31d87eb2..5ab312309edad6f5e66dda305aca503c299cb98b 100644 (file)
--- a/docs/pom.xml
+++ b/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>

diff --git a/lib/asm/asm-6.2.1.jar b/lib/asm/asm-6.2.1.jar
deleted file mode 100644 (file)
index cc00792..0000000
Binary files a/lib/asm/asm-6.2.1.jar and /dev/null differ

diff --git a/lib/asm/asm-8.0.1.jar b/lib/asm/asm-8.0.1.jar
deleted file mode 100644 (file)
index 744fecc..0000000
Binary files a/lib/asm/asm-8.0.1.jar and /dev/null differ

diff --git a/lib/asm/asm-8.0.1.renamed.jar b/lib/asm/asm-8.0.1.renamed.jar
deleted file mode 100644 (file)
index d98456a..0000000
Binary files a/lib/asm/asm-8.0.1.renamed.jar and /dev/null differ

diff --git a/lib/asm/asm-9.1.jar b/lib/asm/asm-9.1.jar
new file mode 100644 (file)
index 0000000..8238019
Binary files /dev/null and b/lib/asm/asm-9.1.jar differ

diff --git a/lib/asm/asm-9.1.renamed.jar b/lib/asm/asm-9.1.renamed.jar
new file mode 100644 (file)
index 0000000..72f56b6
Binary files /dev/null and b/lib/asm/asm-9.1.renamed.jar differ

diff --git a/lib/asm/build.xml b/lib/asm/build.xml
index 87ae0b5686d16101fd68803a71e6ce2fe88c513d..57507f5494065e9b7448aca7b83c76c07133edad 100644 (file)
--- a/lib/asm/build.xml
+++ b/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>

diff --git a/lib/jarjar/jarjar-1.3.jar b/lib/jarjar/jarjar-1.3.jar
new file mode 100644 (file)
index 0000000..b1328f5
Binary files /dev/null and b/lib/jarjar/jarjar-1.3.jar differ

diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java
index a24edb80491c65db4fadbe21fe61279437906fe4..a1cccba7248e8f4f12f63426c7743dd57e9f14aa 100644 (file)
--- a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java
+++ b/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:

diff --git a/tests/pom.xml b/tests/pom.xml
index 9b59abd2e75c42b39343cd1fcb8c4d4149fc7607..3abcdde51b02fa2adb8d1c7b6d5a6751e9aad2b7 100644 (file)
--- a/tests/pom.xml
+++ b/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>

diff --git a/weaver/pom.xml b/weaver/pom.xml
index 4cc59bdfb0a3cf5523548eadd57f46250423af59..48703bf81dd019ae7d1c3d06b71721c6f5d87717 100644 (file)
--- a/weaver/pom.xml
+++ b/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>

diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/asm/StackMapAdder.java b/weaver/src/main/java/org/aspectj/weaver/bcel/asm/StackMapAdder.java
index 9be8f80de1e1868b2083ac3e9d0f9530ea986375..1de90f8888175b946ecf962671b3823fda29f44a 100644 (file)
--- a/weaver/src/main/java/org/aspectj/weaver/bcel/asm/StackMapAdder.java
+++ b/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);
                        }
                }