Further 1.9 changes: better handling of source/target

diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
index 2809d07815850b9a85627a25044b6fbfd45f7504..744f55c1914868ff8eb54fc573961e3ac7e43b1a 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 68cf1737e1722a79a90acbece244c35dbfda30cc..ce610bd451ea71d043677b223f2cfdec53617f12 100644 (file)
Binary files a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar and b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar differ

diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java b/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
index 0b36599f8d7814e8cc996c352a4d8372593ae478..ea53cf11f93b8a6c747a4c51cf4cd117c9bb0aeb 100644 (file)
--- a/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
+++ b/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
@@ -253,9 +253,9 @@ public class AjcTask extends MatchingTask {
 
        public static final String COMMAND_EDITOR_NAME = AjcTask.class.getName() + ".COMMAND_EDITOR";
 
-       static final String[] TARGET_INPUTS = new String[] { "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8" };
-       static final String[] SOURCE_INPUTS = new String[] { "1.3", "1.4", "1.5", "1.6", "1.7", "1.8" };
-       static final String[] COMPLIANCE_INPUTS = new String[] { "-1.3", "-1.4", "-1.5", "-1.6", "-1.7", "-1.8" };
+       static final String[] TARGET_INPUTS = new String[] { "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9" };
+       static final String[] SOURCE_INPUTS = new String[] { "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9" };
+       static final String[] COMPLIANCE_INPUTS = new String[] { "-1.3", "-1.4", "-1.5", "-1.6", "-1.7", "-1.8", "1.9" };
 
        private static final ICommandEditor COMMAND_EDITOR;
 

diff --git a/tests/src/org/aspectj/systemtest/ajc190/sanity-tests.xml b/tests/src/org/aspectj/systemtest/ajc190/sanity-tests.xml
index ca9b71efc74c445314ed50e223af54466c14bda7..f72350b30a9dbe9934459823780afa0397e4cd55 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc190/sanity-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc190/sanity-tests.xml
@@ -56,12 +56,12 @@
 
     <!-- check class file version is 53.0 -->
     <ajc-test dir="bugs160/simplejava" title="simple - k">
-      <compile files="SimpleJ.java" options="-1.9"/>
+      <compile files="SimpleJ.java" options="-source 1.9"/>
     </ajc-test>
 
     <!-- check class file version is 53.0 -->
     <ajc-test dir="bugs160/simplejava" title="simple - l">
-      <compile files="SimpleJ.java" options="-1.9"/>
+      <compile files="SimpleJ.java" options="-source 1.9 -target 1.9"/>
     </ajc-test>
 
     <!-- check class file version is 49.0 -->