latest HEAD changes

diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java b/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
index 78b820211e13c95b3c8c92dd55a5f1669051f215..794335ae35059bbccf443753655ec162a18c5ffc 100644 (file)
--- a/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
+++ b/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
@@ -279,11 +279,11 @@ public class AjcTask extends MatchingTask {
         = AjcTask.class.getName() + ".COMMAND_EDITOR";
 
     static final String[] TARGET_INPUTS = new String [] 
-    { "1.1", "1.2", "1.3", "1.4", "1.5" };
+    { "1.1", "1.2", "1.3", "1.4", "1.5", "1.6" };
     static final String[] SOURCE_INPUTS = new String [] 
-    { "1.3", "1.4", "1.5" };
+    { "1.3", "1.4", "1.5", "1.6" };
     static final String[] COMPLIANCE_INPUTS = new String [] 
-    { "-1.3", "-1.4", "-1.5" };
+    { "-1.3", "-1.4", "-1.5", "-1.6" };
 
     private static final ICommandEditor COMMAND_EDITOR;
             
@@ -544,6 +544,10 @@ public class AjcTask extends MatchingTask {
     public void setXJoinpoints(String optionalJoinpoints) {
        cmd.addFlag("-Xjoinpoints:"+optionalJoinpoints,true);
     }
+
+    public void setCheckRuntimeVersion(boolean b) {
+       cmd.addFlag("-checkRuntimeVersion:"+b,true);
+    }
     
     public void setXNoWeave(boolean b) {
        if (logger!=null) logger.warning("the noweave option is no longer required and is being ignored");