From 45254f588150c944dfde84821308d27cc9d34a37 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Sun, 16 May 2021 10:17:12 +0700 Subject: 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 --- tests/java5/ataspectj/ataspectj/UnweavableTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/java5/ataspectj') 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 Alexandre Vasseur -- cgit v1.2.3