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 /org.aspectj.ajdt.core | |
| 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 'org.aspectj.ajdt.core')
| -rw-r--r-- | org.aspectj.ajdt.core/pom.xml | 4 | ||||
| -rw-r--r-- | org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/org.aspectj.ajdt.core/pom.xml b/org.aspectj.ajdt.core/pom.xml index 747fce918..6117b1580 100644 --- a/org.aspectj.ajdt.core/pom.xml +++ b/org.aspectj.ajdt.core/pom.xml @@ -64,8 +64,8 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.aspectj</groupId> - <artifactId>asm-renamed</artifactId> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> </dependency> </dependencies> 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 6a93731a5..22db23d17 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 @@ -63,12 +63,12 @@ public abstract class AjcTestCase extends TestCase { */ protected Ajc ajc; - public static final String CLASSPATH_ASM_RENAMED = + public static final String CLASSPATH_ASM = Arrays.stream(System.getProperty("java.class.path") .split(File.pathSeparator)) - .filter(path -> path.contains("asm-renamed")) + .filter(path -> path.replace('\\', '/').contains("org/ow2/asm/")) .findFirst() - .orElseThrow(() -> new RuntimeException("library 'asm-renamed' not found on classpath")); + .orElseThrow(() -> new RuntimeException("ASM library not found on classpath")); // see Ajc and AntSpec public static final String DEFAULT_CLASSPATH_ENTRIES = @@ -76,7 +76,7 @@ public abstract class AjcTestCase extends TestCase { + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "junit" + File.separator + "junit.jar" + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "bcel" + File.separator + "bcel.jar" + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "bcel" + File.separator + "bcel-verifier.jar" - + File.pathSeparator + CLASSPATH_ASM_RENAMED + + File.pathSeparator + CLASSPATH_ASM + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "test" + File.separator + "testing-client.jar" // hmmm, this next one should perhaps point to an aj-build jar... + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "test" + File.separator + "aspectjrt.jar" |