aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ajdoc/pom.xml2
-rw-r--r--aspectjmatcher/pom.xml2
-rw-r--r--aspectjtools/pom.xml2
-rw-r--r--aspectjweaver/pom.xml2
-rw-r--r--docs/pom.xml2
-rw-r--r--lib/asm/asm-6.2.1.jarbin112958 -> 0 bytes
-rw-r--r--lib/asm/asm-8.0.1.jarbin121772 -> 0 bytes
-rw-r--r--lib/asm/asm-8.0.1.renamed.jarbin121608 -> 0 bytes
-rw-r--r--lib/asm/asm-9.1.jarbin0 -> 121790 bytes
-rw-r--r--lib/asm/asm-9.1.renamed.jarbin0 -> 121609 bytes
-rw-r--r--lib/asm/build.xml19
-rw-r--r--lib/jarjar/jarjar-1.3.jarbin0 -> 120251 bytes
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java2
-rw-r--r--tests/pom.xml2
-rw-r--r--weaver/pom.xml2
-rw-r--r--weaver/src/main/java/org/aspectj/weaver/bcel/asm/StackMapAdder.java4
16 files changed, 19 insertions, 20 deletions
diff --git a/ajdoc/pom.xml b/ajdoc/pom.xml
index e92109017..780dcb8e3 100644
--- 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 ce975e743..48e8f37fe 100644
--- 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 292e9db41..6888bc955 100644
--- 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 a8856330e..72c223ad6 100644
--- 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 5b487c73e..5ab312309 100644
--- 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
index cc0079266..000000000
--- a/lib/asm/asm-6.2.1.jar
+++ /dev/null
Binary files differ
diff --git a/lib/asm/asm-8.0.1.jar b/lib/asm/asm-8.0.1.jar
deleted file mode 100644
index 744fecc02..000000000
--- a/lib/asm/asm-8.0.1.jar
+++ /dev/null
Binary files 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
index d98456a84..000000000
--- a/lib/asm/asm-8.0.1.renamed.jar
+++ /dev/null
Binary files differ
diff --git a/lib/asm/asm-9.1.jar b/lib/asm/asm-9.1.jar
new file mode 100644
index 000000000..823801988
--- /dev/null
+++ b/lib/asm/asm-9.1.jar
Binary files differ
diff --git a/lib/asm/asm-9.1.renamed.jar b/lib/asm/asm-9.1.renamed.jar
new file mode 100644
index 000000000..72f56b6fd
--- /dev/null
+++ b/lib/asm/asm-9.1.renamed.jar
Binary files differ
diff --git a/lib/asm/build.xml b/lib/asm/build.xml
index 87ae0b568..57507f549 100644
--- 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
index 000000000..b1328f594
--- /dev/null
+++ b/lib/jarjar/jarjar-1.3.jar
Binary files 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 a24edb804..a1cccba72 100644
--- 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 9b59abd2e..3abcdde51 100644
--- 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 4cc59bdfb..48703bf81 100644
--- 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 9be8f80de..1de90f888 100644
--- 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);
}
}