From ba520d6cfab3b968bd020d1e965e18aa72819813 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Wed, 29 Mar 2023 08:38:57 +0200 Subject: Improve Java 9+ version matching in ClassPath.getClassPath On the short term, this fixes the failing weaver tests on JDK 20. On the long term, the improved matching heuristics should make it unnecessary to update the regex again. Signed-off-by: Alexander Kriegisch --- .../src/main/java/org/aspectj/apache/bcel/util/ClassPath.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 bb9e3c3f5..4189fab5b 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 @@ -226,8 +226,8 @@ public class ClassPath implements Serializable { buf.append(File.pathSeparatorChar); } - // 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|16|17|18|19).*")) { + // On Java 9+, sun.boot.class.path won't be set. System classes are accessible through JRT filesystem. + if (vm_version.matches("^(9|[1-9][0-9]+).*")) { buf.insert(0, File.pathSeparatorChar); buf.insert(0, System.getProperty("java.home") + File.separator + "lib" + File.separator + JRT_FS); } -- cgit v1.2.3