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 /run-all-junit-tests/pom.xml | |
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 'run-all-junit-tests/pom.xml')
-rw-r--r-- | run-all-junit-tests/pom.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/run-all-junit-tests/pom.xml b/run-all-junit-tests/pom.xml index c1d3a1fe4..7a3f8abe9 100644 --- a/run-all-junit-tests/pom.xml +++ b/run-all-junit-tests/pom.xml @@ -157,8 +157,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.aspectj</groupId> - <artifactId>asm-renamed</artifactId> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> <scope>test</scope> </dependency> <dependency> @@ -245,7 +245,7 @@ <usedDependencies> <!-- The tests need these during runtime, even though no direct usage is in our classes --> <usedDependency>ant:ant-launcher</usedDependency> - <usedDependency>org.aspectj:asm-renamed</usedDependency> + <usedDependency>org.ow2.asm:asm</usedDependency> <usedDependency>org.aspectj:ajde</usedDependency> <usedDependency>org.aspectj:build</usedDependency> <usedDependency>org.aspectj:tests</usedDependency> |