aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kriegisch <Alexander@Kriegisch.name>2021-04-10 11:44:47 +0700
committerAlexander Kriegisch <Alexander@Kriegisch.name>2021-04-10 11:44:47 +0700
commit2b0b1a98959bd0d569f1d04bd3b25dac8ef0bb7a (patch)
tree77953c7def10804f25f7aea0294cb5723257e4f0
parent1664dbf1fc27e59e0783f8956dae3f09739988ad (diff)
downloadaspectj-2b0b1a98959bd0d569f1d04bd3b25dac8ef0bb7a.tar.gz
aspectj-2b0b1a98959bd0d569f1d04bd3b25dac8ef0bb7a.zip
Move lib/ext/jrockit to just lib/jrockit
It was the only subdirectory under lib/ext anyway and somehow always irritating and difficult to find when just using a directory browser in the IDE. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
-rw-r--r--lib/jrockit/LICENSE.TXT (renamed from lib/ext/jrockit/LICENSE.TXT)0
-rw-r--r--lib/jrockit/jrockit-src.zip (renamed from lib/ext/jrockit/jrockit-src.zip)bin2570 -> 2570 bytes
-rw-r--r--lib/jrockit/jrockit.jar (renamed from lib/ext/jrockit/jrockit.jar)bin1969 -> 1969 bytes
-rw-r--r--lib/jrockit/managementapi-jrockit81.jar (renamed from lib/ext/jrockit/managementapi-jrockit81.jar)bin7796 -> 7796 bytes
-rw-r--r--loadtime/pom.xml2
-rw-r--r--loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java2
-rw-r--r--run-all-junit-tests/pom.xml2
7 files changed, 3 insertions, 3 deletions
diff --git a/lib/ext/jrockit/LICENSE.TXT b/lib/jrockit/LICENSE.TXT
index 6bbc97c40..6bbc97c40 100644
--- a/lib/ext/jrockit/LICENSE.TXT
+++ b/lib/jrockit/LICENSE.TXT
diff --git a/lib/ext/jrockit/jrockit-src.zip b/lib/jrockit/jrockit-src.zip
index dce223db8..dce223db8 100644
--- a/lib/ext/jrockit/jrockit-src.zip
+++ b/lib/jrockit/jrockit-src.zip
Binary files differ
diff --git a/lib/ext/jrockit/jrockit.jar b/lib/jrockit/jrockit.jar
index 0395fceb0..0395fceb0 100644
--- a/lib/ext/jrockit/jrockit.jar
+++ b/lib/jrockit/jrockit.jar
Binary files differ
diff --git a/lib/ext/jrockit/managementapi-jrockit81.jar b/lib/jrockit/managementapi-jrockit81.jar
index f95129592..f95129592 100644
--- a/lib/ext/jrockit/managementapi-jrockit81.jar
+++ b/lib/jrockit/managementapi-jrockit81.jar
Binary files differ
diff --git a/loadtime/pom.xml b/loadtime/pom.xml
index 5b19cb73c..d7333cd72 100644
--- a/loadtime/pom.xml
+++ b/loadtime/pom.xml
@@ -71,7 +71,7 @@
<artifactId>jrockit</artifactId>
<version>1.0</version>
<scope>system</scope>
- <systemPath>${project.basedir}/../lib/ext/jrockit/jrockit.jar</systemPath>
+ <systemPath>${project.basedir}/../lib/jrockit/jrockit.jar</systemPath>
</dependency>
<dependency>
diff --git a/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java b/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java
index 487ef0832..7f9d235d0 100644
--- a/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java
+++ b/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java
@@ -54,7 +54,7 @@ public class JRockitAgentTest extends TestCase {
}
public void testJrockitRecursionProtection() {
- URL jrockit = FileUtil.getFileURL(new File("../lib/ext/jrockit/jrockit.jar"));
+ URL jrockit = FileUtil.getFileURL(new File("../lib/jrockit/jrockit.jar"));
URL[] urls = new URL[] {jrockit};
URLClassLoader thisLoader = new URLClassLoader(urls, getClass().getClassLoader());
try {
diff --git a/run-all-junit-tests/pom.xml b/run-all-junit-tests/pom.xml
index a2d8aa604..e98cd7f04 100644
--- a/run-all-junit-tests/pom.xml
+++ b/run-all-junit-tests/pom.xml
@@ -244,7 +244,7 @@
<artifactId>jrockit</artifactId>
<version>1.0</version>
<scope>system</scope>
- <systemPath>${project.basedir}/../lib/ext/jrockit/jrockit.jar</systemPath>
+ <systemPath>${project.basedir}/../lib/jrockit/jrockit.jar</systemPath>
</dependency>
<dependency>
<!-- Identical to lib/ant/lib/ant-launcher.jar, a former system-scoped dependency -->