diff options
| author | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-05-16 10:17:12 +0700 |
|---|---|---|
| committer | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-05-16 10:17:12 +0700 |
| commit | 45254f588150c944dfde84821308d27cc9d34a37 (patch) | |
| tree | 51bfa4cb19820107aa817137e9ffd07b12f7ba10 /tests | |
| parent | 95fc5eec2de1b46c069f805a0a8657427a1a0a0a (diff) | |
| download | aspectj-45254f588150c944dfde84821308d27cc9d34a37.tar.gz aspectj-45254f588150c944dfde84821308d27cc9d34a37.zip | |
Replace use of ASM-renamed by original ASM
This involves replacing references in weaver application code as well as
a few tests.
In order to make AspectJ weaver + tools contain a relocated ASM version,
I added a Maven Shade relocation step after Maven Assembly created the
uber JARs. Relocation works for both binaries and sources and also
encompasses Class::forName calls like in class AsmDetector.
Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/java5/ataspectj/ataspectj/UnweavableTest.java | 8 | ||||
| -rw-r--r-- | tests/pom.xml | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/java5/ataspectj/ataspectj/UnweavableTest.java b/tests/java5/ataspectj/ataspectj/UnweavableTest.java index 95f9e2712..066b30b05 100644 --- a/tests/java5/ataspectj/ataspectj/UnweavableTest.java +++ b/tests/java5/ataspectj/ataspectj/UnweavableTest.java @@ -22,10 +22,10 @@ import java.io.Serializable; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; -import aj.org.objectweb.asm.ClassWriter; -import aj.org.objectweb.asm.Opcodes; -import aj.org.objectweb.asm.MethodVisitor; -import aj.org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.AnnotationVisitor; /** * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a> diff --git a/tests/pom.xml b/tests/pom.xml index 95f91d838..99d1809ec 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -40,8 +40,8 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.aspectj</groupId> - <artifactId>asm-renamed</artifactId> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> </dependency> <dependency> <groupId>org.aspectj</groupId> |