diff options
| author | Andy Clement <aclement@pivotal.io> | 2019-04-03 10:23:44 -0700 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2019-04-03 10:23:44 -0700 |
| commit | 0e2c95a36900fe913f5d768e7f4632034ddf005b (patch) | |
| tree | f7f1bb92dfbae87de0a8998491e863490984aa0a /bcel-builder | |
| parent | dbb2c59fcfa6837f1fde9e0c1f0d04751c9268ee (diff) | |
| download | aspectj-0e2c95a36900fe913f5d768e7f4632034ddf005b.tar.gz aspectj-0e2c95a36900fe913f5d768e7f4632034ddf005b.zip | |
Updated with Java12 support
Diffstat (limited to 'bcel-builder')
| -rw-r--r-- | bcel-builder/src/main/java/org/aspectj/apache/bcel/Constants.java | 5 | ||||
| -rw-r--r-- | bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassPath.java | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/Constants.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/Constants.java index c75496527..c0c0930b0 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/Constants.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/Constants.java @@ -86,6 +86,11 @@ public interface Constants { public final static short MINOR_10 = 0; public final static short MAJOR_11 = 55; public final static short MINOR_11 = 0; + public final static short MAJOR_12 = 56; + public final static short MINOR_12 = 0; + + public final static int PREVIEW_MINOR_VERSION = 65535; + // Defaults public final static short MAJOR = MAJOR_1_1; public final static short MINOR = MINOR_1_1; 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 a66e9c58a..9d15e81f4 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,7 +226,8 @@ 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.startsWith("9") || vm_version.startsWith("10") || vm_version.startsWith("11")) { + if (vm_version.startsWith("9") || vm_version.startsWith("10") + || vm_version.startsWith("11") || vm_version.startsWith("12")) { buf.insert(0, File.pathSeparatorChar); buf.insert(0, System.getProperty("java.home") + File.separator + "lib" + File.separator + JRT_FS); } |