aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kriegisch <Alexander@Kriegisch.name>2021-03-21 20:08:15 +0700
committerAlexander Kriegisch <Alexander@Kriegisch.name>2021-03-21 20:08:15 +0700
commitcf72b628c50fb296b38e559eff744bd829b61865 (patch)
tree4a025ff06cf537b4846da989ad2f2c87e72ef57e
parent72a092fcd925ccbcd5579a168a690ca44236eb12 (diff)
downloadaspectj-cf72b628c50fb296b38e559eff744bd829b61865.tar.gz
aspectj-cf72b628c50fb296b38e559eff744bd829b61865.zip
Make BCEL classpath utility recognise Java 16-19, fixing many tests
This is a follow-up commit on @07af5d41: Inside org.aspectj.apache.bcel.util.ClassPath.getClassPath(), some JVM version matching occurs which previously did not include Java 16 (I also added 17-19 to the regex matcher). This fixes test errors like: java.lang.ClassCastException: class org.aspectj.weaver.MissingResolvedTypeWithKnownSignature cannot be cast to class org.aspectj.weaver.ReferenceType (org.aspectj.weaver.MissingResolvedTypeWithKnownSignature and org.aspectj.weaver.ReferenceType are in unnamed module of loader 'app') Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
-rw-r--r--bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassPath.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassPath.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassPath.java
index 7d3d18de6..29f8f6d6d 100644
--- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassPath.java
+++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassPath.java
@@ -227,7 +227,7 @@ public class ClassPath implements Serializable {
}
// On Java9 the sun.boot.class.path won't be set. System classes accessible through JRT filesystem
- if (vm_version.matches("^(9|10|11|12|13|14|15).*")) {
+ if (vm_version.matches("^(9|10|11|12|13|14|15|16|17|18|19).*")) {
buf.insert(0, File.pathSeparatorChar);
buf.insert(0, System.getProperty("java.home") + File.separator + "lib" + File.separator + JRT_FS);
}