Fix support for -14 on command line - was missing from JDT

diff --git a/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties
index 73d1e33370fc56993bec0b7124f6f86d801cb6d9..8506a18c9d8dde51138e29b62cc20cf226726ef8 100644 (file)
--- a/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties
+++ b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties
@@ -62,7 +62,7 @@ configure.invalidDebugOption = invalid debug option: {0}
 configure.invalidWarningConfiguration = invalid warning configuration: ''{0}''
 configure.invalidWarning = invalid warning token: ''{0}''. Ignoring warning and compiling
 configure.invalidWarningOption = invalid warning option: ''{0}''. Must specify a warning token
-configure.targetJDK = target level should be in ''1.1''...''1.8'',''9''...''11'' (or ''5.0''..''11.0'') or cldc1.1: {0}
+configure.targetJDK = target level should be in ''1.1''...''1.8'',''9''...''14'': {0}
 configure.incompatibleTargetForSource = Target level ''{0}'' is incompatible with source level ''{1}''. A target level ''{1}'' or better is required
 configure.incompatibleTargetForGenericSource = Target level ''{0}'' is incompatible with source level ''{1}''. A source level ''1.5'' or better is required
 configure.incompatibleComplianceForSource = Compliance level ''{0}'' is incompatible with source level ''{1}''. A compliance level ''{1}'' or better is required
@@ -193,17 +193,19 @@ Standard Eclipse compiler options:\n\
 \                       when suffixed with ''[''<enc>'']'' (e.g. X.java[utf8])\n\
 \ \n\
 \ Compliance options:\n\
-\    -1.3               use 1.3 compliance (-source 1.3 -target 1.1)\n\
 \    -1.4             + use 1.4 compliance (-source 1.3 -target 1.2)\n\
 \    -1.5 -5 -5.0       use 1.5 compliance (-source 1.5 -target 1.5)\n\
 \    -1.6 -6 -6.0       use 1.6 compliance (-source 1.6 -target 1.6)\n\
 \    -1.7 -7 -7.0       use 1.7 compliance (-source 1.7 -target 1.7)\n\
 \    -1.8 -8 -8.0       use 1.8 compliance (-source 1.8 -target 1.8)\n\
 \    -1.9 -9 -9.0       use 1.9 compliance (-source 1.9 -target 1.9)\n\
-\    -source <version>  set source level: 1.3 to 1.9 (or 6, 6.0, etc)\n\
-\    -target <version>  set classfile target: 1.1 to 1.9 (or 6, 6.0, etc)\n\
-\                       cldc1.1 can also be used to generate the StackMap\n\
-\                       attribute\n\
+\    -10                for Java 10 (-source 10 -target 10)\n\
+\    -11                for Java 11 (-source 11 -target 11)\n\
+\    -12                for Java 12 (-source 12 -target 12)\n\
+\    -13                for Java 13 (-source 13 -target 13)\n\
+\    -14                       for Java 14 (-source 14 -target 14)\n\
+\    -source <version>  set source level: 1.3 to 14 \n\
+\    -target <version>  set classfile target: 1.1 to 14\n\
 \ \n\
 \ Warning options:\n\
 \    -deprecation     + deprecation outside deprecated code (equivalent to\n\
@@ -350,6 +352,7 @@ Standard Eclipse compiler options:\n\
 \    -preserveAllLocals preserve unused local vars for debug purpose\n\
 \ \n\
 \ Advanced options:\n\
+\    --enable-preview   turn on support for any experimental features in that version of Java\n\
 \    -log <file>        log to a file\n\
 \    -proceedOnError    do not stop at first error, dumping class files with problem methods\n\
 \    -verbose           enable verbose output\n\
@@ -449,7 +452,7 @@ configure.invalidDebugOption = invalid debug option: {0}
 configure.invalidWarningConfiguration = invalid warning configuration: {0}
 configure.invalidWarning = invalid warning: {0}
 configure.invalidWarningOption = invalid warning option: {0}
-configure.targetJDK = target JDK should be comprised in between ''1.1'' and ''1.4'': {0}
+configure.targetJDK = target level should be in ''1.1''...''1.8'',''9''...''14'': {0}
 configure.incompatibleTargetForSource14 = ''1.4'' source mode requires ''-target 1.4'' : {0}
 configure.incompatibleComplianceForSource14 = ''1.4'' source mode requires ''-1.4'' compliance mode: {0}
 configure.incompatibleComplianceForTarget14 = ''1.4'' target mode requires ''-1.4'' compliance mode: {0}

diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
index 2975b473db752364858ae81e6ffec7023b19735c..e85670fef32541e4c9b3c9903520ea5594077f40 100644 (file)
Binary files a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip and b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip differ

diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
index 30dff3bab8c4f671af8d4146b3a28983cb7bb482..ee8178f332387c3002e6ab340f36d652e7f9df90 100644 (file)
Binary files a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar and b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar differ