From 45254f588150c944dfde84821308d27cc9d34a37 Mon Sep 17 00:00:00 2001
From: Alexander Kriegisch <Alexander@Kriegisch.name>
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 <Alexander@Kriegisch.name>
---
 loadtime/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'loadtime')

diff --git a/loadtime/pom.xml b/loadtime/pom.xml
index ae0645a92..7bc38c2fc 100644
--- a/loadtime/pom.xml
+++ b/loadtime/pom.xml
@@ -38,8 +38,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>
-- 
cgit v1.2.3