Remove Batik path entries from test classpath

Firstly, Batik is not needed for running AspectJ tests.

Secondly, the fixed Windows path separators led to GitHub CI/CD tests
failing under Java 18+ on GitHub. Replacing ';' by 'File.pathSeparator'
would have fixed the problem, but removing the paths altogether is the
cleaner solution.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java
index 5a3cab221ffae9039d607c7e97d1c3a3a9186d1e..52602114ed8d2e9ebf1a5419da920a38efb90c1b 100644 (file)
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java
@@ -67,13 +67,14 @@ public class MultiProjTestCompilerConfiguration implements ICompilerConfiguratio
                for (File dir: allOutputPaths) {
                        sb.append(File.pathSeparator + dir.getAbsolutePath());
                }
-               String cp = sb.toString() + File.pathSeparator + new File(AjdeInteractionTestbed.testdataSrcDir) + File.pathSeparator
-                               + System.getProperty("sun.boot.class.path") + File.pathSeparator + "../runtime/target/classes" + File.pathSeparator
-                               + this.classPath + File.pathSeparator + System.getProperty("aspectjrt.path") + File.pathSeparator
-                               + "../lib/junit/junit.jar" + "c:/batik/batik-1.6/lib/batik-util.jar;"
-                               + "c:/batik/batik-1.6/lib/batik-awt-util.jar;" + "c:/batik/batik-1.6/lib/batik-dom.jar;"
-                               + "c:/batik/batik-1.6/lib/batik-svggen.jar;" + File.pathSeparator + ".." + File.separator + "lib" + File.separator
-                               + "test" + File.separator + "aspectjrt.jar";
+               String cp = sb + File.pathSeparator
+                       + new File(AjdeInteractionTestbed.testdataSrcDir) + File.pathSeparator
+                       + System.getProperty("sun.boot.class.path") + File.pathSeparator
+                       + "../runtime/target/classes" + File.pathSeparator
+                       + this.classPath + File.pathSeparator
+                       + System.getProperty("aspectjrt.path") + File.pathSeparator
+                       + "../lib/junit/junit.jar" + File.pathSeparator
+                       + ".." + File.separator + "lib" + File.separator + "test" + File.separator + "aspectjrt.jar";
                verifyClasspath(cp);
                if (LangUtil.is9VMOrGreater()) {
                        cp = LangUtil.getJrtFsFilePath() + File.pathSeparator + cp;