From 46a1172aac0b24ccbcb38083ff66d8e8e4ff2d17 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Wed, 10 Oct 2018 12:56:00 -0700
Subject: [PATCH] Reverse default - behave like 1.5 (support annotations) by
 default

---
 .../org/aspectj/ajdt/ajc/BuildArgParser.java  |   32 +-
 .../core/builder/AjCompilerOptions.java       |    5 +-
 .../compiler/batch/DeclareParents.java        |   43 +-
 .../internal/compiler/batch/JavadocTest.java  |    5 +-
 .../compiler/batch/PerformanceTestCase.java   |    2 +-
 .../core/builder/AjBuildManagerTest.java      |    8 +-
 .../internal/core/builder/OutjarTest.java     |    3 +-
 .../aspectj/tools/ajc/CompilationResult.java  |    3 +-
 .../drivers/AjcHarnessTestsUsingJUnit.java    |   11 +-
 tests/ajcHarnessTests.xml                     |   12 +-
 tests/bugs192/11flags/A.java                  |   13 +
 .../systemtest/ajc10x/ajc10x-tests.xml        |  542 +++----
 .../aspectj/systemtest/ajc11/ajc11-tests.xml  |    8 +-
 .../systemtest/ajc120/ajc120-tests.xml        |   20 +-
 .../systemtest/ajc121/ajc121-tests.xml        |    8 +-
 .../org/aspectj/systemtest/ajc150/ajc150.xml  |   24 +-
 .../systemtest/ajc150/ltw/ltw-tests.xml       | 1364 ++++++++---------
 .../org/aspectj/systemtest/ajc152/ajc152.xml  |    8 +-
 .../org/aspectj/systemtest/ajc153/ajc153.xml  |   20 +-
 .../ajc153/jdtlikehandleprovider.xml          |    6 +-
 .../systemtest/ajc160/newfeatures-tests.xml   |    4 +-
 .../org/aspectj/systemtest/ajc161/ajc161.xml  |    2 +-
 .../systemtest/ajc1611/Ajc1611Tests.java      |    4 +-
 .../aspectj/systemtest/ajc1611/ajc1611.xml    |    8 +-
 .../org/aspectj/systemtest/ajc174/ajc174.xml  |   10 +-
 .../systemtest/ajc192/Ajc192Tests.java        |    4 +
 .../org/aspectj/systemtest/ajc192/ajc192.xml  |    7 +-
 .../systemtest/base/baseTests-tests.xml       |    2 +-
 .../aspectj/systemtest/design/designtest.xml  |    4 +-
 .../incremental/incremental-junit-tests.xml   |    2 +-
 .../model/incremental-model-tests.xml         |    2 +-
 .../systemtest/pre10x/pre10x-tests.xml        |    4 +-
 .../serialVerUID/serialVerUID-tests.xml       |    2 +-
 .../aspectj/systemtest/tracing/tracing.xml    |    6 +-
 .../aspectj/systemtest/xlint/xlint-tests.xml  |    2 +-
 35 files changed, 1087 insertions(+), 1113 deletions(-)
 create mode 100644 tests/bugs192/11flags/A.java

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java
index 448618c11..66488fa8c 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java
@@ -815,33 +815,17 @@ public class BuildArgParser extends Main {
 			} else if (arg.equals("-timers")) {
 				buildConfig.setTiming(true);
 				// swallow - it is dealt with in Main.runMain()
-			} else if (arg.equals("-1.5")) {
-				buildConfig.setBehaveInJava5Way(true);
-				unparsedArgs.add("-1.5");
-				// this would enable the '-source 1.5' to do the same as '-1.5' but doesnt sound quite right as
-				// as an option right now as it doesnt mean we support 1.5 source code - people will get confused...
-			} else if (arg.equals("-1.6")) {
-				buildConfig.setBehaveInJava5Way(true);
-				unparsedArgs.add("-1.6");
-			} else if (arg.equals("-1.7")) {
-				buildConfig.setBehaveInJava5Way(true);
-				unparsedArgs.add("-1.7");
-			} else if (arg.equals("-1.8")) {
-				buildConfig.setBehaveInJava5Way(true);
-				unparsedArgs.add("-1.8");
-			} else if (arg.equals("-1.9")) {
-				buildConfig.setBehaveInJava5Way(true);
-				unparsedArgs.add("-1.9");
-			} else if (arg.equals("-10")) {
-				buildConfig.setBehaveInJava5Way(true);
-				unparsedArgs.add("-10");
+			} else if (arg.equals("-1.3")) {
+				buildConfig.setBehaveInJava5Way(false);
+				unparsedArgs.add("-1.3");
+			} else if (arg.equals("-1.4")) {
+				buildConfig.setBehaveInJava5Way(false);
+				unparsedArgs.add("-1.4");
 			} else if (arg.equals("-source")) {
 				if (args.size() > nextArgIndex) {
 					String level = args.get(nextArgIndex).getValue();
-					if (level.equals("1.5") || level.equals("5") || level.equals("1.6") || level.equals("6") || level.equals("1.7")
-							|| level.equals("7") || level.equals("8") || level.equals("1.8")
-							|| level.equals("9") || level.equals("1.9") || level.equals("10")) {
-						buildConfig.setBehaveInJava5Way(true);
+					if (level.equals("1.3") || level.equals("1.4")) {
+						buildConfig.setBehaveInJava5Way(false);
 					}
 					unparsedArgs.add("-source");
 					unparsedArgs.add(level);
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java
index a7be9ec6e..cdf534b54 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java
@@ -73,7 +73,7 @@ public class AjCompilerOptions extends CompilerOptions {
 	public String xOptionalJoinpoints = null;
 
 	// If true - autoboxing behaves differently ...
-	public boolean behaveInJava5Way = false;
+	public boolean behaveInJava5Way = true;
 
 	public boolean timing = false;
 
@@ -117,6 +117,7 @@ public class AjCompilerOptions extends CompilerOptions {
 		set(settings);
 	}
 
+	@Override
 	public Map<String,String> getMap() {
 		Map<String,String> map = super.getMap();
 		// now add AspectJ additional options		
@@ -148,6 +149,7 @@ public class AjCompilerOptions extends CompilerOptions {
 		return map;
 	}
 
+	@Override
 	public void set(Map<String,String> optionsMap) {
 		super.set(optionsMap);
 		Object optionValue;
@@ -282,6 +284,7 @@ public class AjCompilerOptions extends CompilerOptions {
 		super.warningThreshold.set(CompilerOptions.SwallowedExceptionInCatchBlock);
 	}
 
+	@Override
 	public String toString() {
 		StringBuffer buf = new StringBuffer(super.toString());
 		// now add AspectJ additional options
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/DeclareParents.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/DeclareParents.java
index 34b0222bc..c0d796753 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/DeclareParents.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/DeclareParents.java
@@ -227,17 +227,17 @@ public class DeclareParents extends AjcTestCase {
 		CompilationResult result = null;
 
 		// Execute: "ajc <classes> <aspects> -showWeaveInfo"
-		String[] sourceCompileCommandLine = new String[classes.length + aspects.length + 1];
+		String[] sourceCompileCommandLine = new String[classes.length + aspects.length + 2];
 		System.arraycopy(classes, 0, sourceCompileCommandLine, 0, classes.length);
 		System.arraycopy(aspects, 0, sourceCompileCommandLine, classes.length, aspects.length);
-		String[] extraOption = new String[] { "-showWeaveInfo" };
-		System.arraycopy(extraOption, 0, sourceCompileCommandLine, classes.length + aspects.length, 1);
+		String[] extraOption = new String[] { "-showWeaveInfo", "-1.4"};
+		System.arraycopy(extraOption, 0, sourceCompileCommandLine, classes.length + aspects.length, 2);
 		result = ajc(testBase, sourceCompileCommandLine);
 		if (!expectErrors)
 			assertTrue("errors? \n" + result.getErrorMessages(), !result.hasErrorMessages());
-		List sourceWeaveMessages = getWeaveMessages(result);
+		List<IMessage> sourceWeaveMessages = getWeaveMessages(result);
 		int sourceWeaveMessagesCount = sourceWeaveMessages.size();
-		List sourceErrorMessages = result.getErrorMessages();
+		List<IMessage> sourceErrorMessages = result.getErrorMessages();
 		int sourceErrorMessagesCount = sourceErrorMessages.size();
 
 		if (verbose) {
@@ -258,15 +258,15 @@ public class DeclareParents extends AjcTestCase {
 		assertTrue("Should get no errors for this compile, but got: " + result.getErrorMessages().size(), result.getErrorMessages()
 				.size() == 0);
 		// Execute: "ajc -inpath classes -showWeaveInfo -d classes2 -aspectpath aspects.jar"
-		result = ajc(testBase, new String[] { "-inpath", "classes", "-showWeaveInfo", "-d", "classes2", "-aspectpath",
+		result = ajc(testBase, new String[] { "-inpath", "classes", "-showWeaveInfo", "-1.4", "-d", "classes2", "-aspectpath",
 				"aspects.jar" });
 
 		if (!expectErrors)
 			assertTrue("unexpected errors? \n" + result.getErrorMessages(), !result.hasErrorMessages());
 
-		List binaryWeaveMessages = getWeaveMessages(result);
+		List<IMessage> binaryWeaveMessages = getWeaveMessages(result);
 		int binaryWeaveMessagesCount = binaryWeaveMessages.size();
-		List binaryErrorMessages = result.getErrorMessages();
+		List<IMessage> binaryErrorMessages = result.getErrorMessages();
 		int binaryErrorMessagesCount = binaryErrorMessages.size();
 
 		if (verbose) {
@@ -281,11 +281,11 @@ public class DeclareParents extends AjcTestCase {
 		// ///////////////////////////////////////////////////////////////////////////
 		// Check the error messages are comparable (allow for differing orderings)
 		if (compareErrors) {
-			for (Iterator iter = binaryErrorMessages.iterator(); iter.hasNext();) {
-				IMessage binaryMessage = (IMessage) iter.next();
+			for (Iterator<IMessage> iter = binaryErrorMessages.iterator(); iter.hasNext();) {
+				IMessage binaryMessage = iter.next();
 				IMessage correctSourceMessage = null;
-				for (Iterator iterator = sourceErrorMessages.iterator(); iterator.hasNext() && correctSourceMessage == null;) {
-					IMessage sourceMessage = (IMessage) iterator.next();
+				for (Iterator<IMessage> iterator = sourceErrorMessages.iterator(); iterator.hasNext() && correctSourceMessage == null;) {
+					IMessage sourceMessage = iterator.next();
 
 					if (sourceMessage.getMessage().equals(binaryMessage.getMessage())) {
 						correctSourceMessage = sourceMessage;
@@ -298,8 +298,8 @@ public class DeclareParents extends AjcTestCase {
 				sourceErrorMessages.remove(correctSourceMessage);
 			}
 			if (sourceErrorMessages.size() > 0) {
-				for (Iterator iter = sourceErrorMessages.iterator(); iter.hasNext();) {
-					IMessage srcMsg = (IMessage) iter.next();
+				for (Iterator<IMessage> iter = sourceErrorMessages.iterator(); iter.hasNext();) {
+					IMessage srcMsg = iter.next();
 					System.err.println("This error message from source compilation '" + srcMsg
 							+ "' didn't occur during binary weaving.");
 				}
@@ -316,8 +316,8 @@ public class DeclareParents extends AjcTestCase {
 
 		// Check weaving messages are comparable
 		for (int i = 0; i < sourceWeaveMessages.size(); i++) {
-			IMessage m1 = (IMessage) sourceWeaveMessages.get(i);
-			IMessage m2 = (IMessage) binaryWeaveMessages.get(i);
+			IMessage m1 = sourceWeaveMessages.get(i);
+			IMessage m2 = binaryWeaveMessages.get(i);
 			String s1 = m1.getDetails();
 			String s2 = m2.getDetails();
 
@@ -355,17 +355,18 @@ public class DeclareParents extends AjcTestCase {
 		return ret;
 	}
 
-	private List getWeaveMessages(CompilationResult result) {
-		List infoMessages = result.getInfoMessages();
-		List weaveMessages = new ArrayList();
-		for (Iterator iter = infoMessages.iterator(); iter.hasNext();) {
-			IMessage element = (IMessage) iter.next();
+	private List<IMessage> getWeaveMessages(CompilationResult result) {
+		List<IMessage> infoMessages = result.getInfoMessages();
+		List<IMessage> weaveMessages = new ArrayList<>();
+		for (IMessage element: infoMessages) {//Iterator iter = infoMessages.iterator(); iter.hasNext();) {
+//			IMessage element = (IMessage) iter.next();
 			if (element.getKind() == IMessage.WEAVEINFO)
 				weaveMessages.add(element);
 		}
 		return weaveMessages;
 	}
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		baseDir = new File("../org.aspectj.ajdt.core/testdata", PROJECT_DIR);
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java
index 8101dc1fd..a9ee51fe9 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java
@@ -14,16 +14,15 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.aspectj.bridge.IMessage;
 import org.aspectj.tools.ajc.AjcTestCase;
 import org.aspectj.tools.ajc.CompilationResult;
-import org.aspectj.util.LangUtil;
 
 public class JavadocTest extends AjcTestCase {
 	public static final String PROJECT_DIR = "javadoc";
 
 	private File baseDir;
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		baseDir = new File("../org.aspectj.ajdt.core/testdata", PROJECT_DIR);
@@ -36,7 +35,7 @@ public class JavadocTest extends AjcTestCase {
 	 * 
 	 */
 	public void testMissingJavadoc() {
-		String[] args = new String[] { "World.java", "-warn:allJavadoc" };
+		String[] args = new String[] { "World.java", "-warn:allJavadoc", "-1.4" };
 
 		List<Message> warningMessages = new ArrayList<Message>();
 		// These warnings are against public textX() methods declared in the World.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java
index 1563a57bb..2d678e140 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java
@@ -39,7 +39,7 @@ public class PerformanceTestCase extends CommandTestCase {
 		// into an error so that we can use checkCompiles() ability to check errors occur.
 		// Pass -proceedOnError to ensure even though we get that message, we still get the class file on disk
 		String sandboxName = getSandboxName();
-		checkCompile("src1/LazyTjp.aj", new String[] {"-Xlint:error","-proceedOnError"}, new int[] {96}, sandboxName);
+		checkCompile("src1/LazyTjp.aj", new String[] {"-Xlint:error","-proceedOnError", "-1.4"}, new int[] {96}, sandboxName);
 		runMain("LazyTjp");
 	}
 	
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java
index c4be26936..fc841c5a8 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java
@@ -16,9 +16,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
 import org.aspectj.ajdt.StreamPrintWriter;
 import org.aspectj.ajdt.ajc.AjdtAjcTests;
 import org.aspectj.ajdt.ajc.BuildArgParser;
@@ -27,6 +24,9 @@ import org.aspectj.bridge.MessageHandler;
 import org.aspectj.bridge.MessageWriter;
 import org.aspectj.tools.ajc.Ajc;
 
+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
+
 public class AjBuildManagerTest extends TestCase {
 
 	private final StreamPrintWriter outputWriter = new StreamPrintWriter(new PrintWriter(System.out));
@@ -62,7 +62,7 @@ public class AjBuildManagerTest extends TestCase {
 		String javaClassPath = System.getProperty("java.class.path");
 		System.out.println(javaClassPath);
 		String sandboxName = Ajc.createEmptySandbox().getAbsolutePath();
-		AjBuildConfig buildConfig = parser.genBuildConfig(new String[] { "-d", sandboxName, "-classpath", javaClassPath,
+		AjBuildConfig buildConfig = parser.genBuildConfig(new String[] { "-d", sandboxName, "-1.4", "-classpath", javaClassPath,
 				AjdtAjcTests.TESTDATA_PATH + "/src1/A.java",
 		// EajcModuleTests.TESTDATA_PATH + "/src1/Hello.java",
 				});
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/OutjarTest.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/OutjarTest.java
index 6fe4b7f52..32e8fd329 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/OutjarTest.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/OutjarTest.java
@@ -30,6 +30,7 @@ public class OutjarTest extends AjcTestCase {
 	 * Make copies of JARs used for -injars/-inpath and -aspectpath because so
 	 * they are not overwritten when a test fails.
 	 */
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		baseDir = new File("../org.aspectj.ajdt.core/testdata",PROJECT_DIR);
@@ -109,7 +110,7 @@ public class OutjarTest extends AjcTestCase {
 	 * Expected result = Compile fails with error message.
 	 */
 	public void testOutjarDeletedOnError () {
-		String[] args = new String[] {"-aspectpath", aspectjarName, "-injars", injarName, "-outjar", outjarName};
+		String[] args = new String[] {"-aspectpath", aspectjarName, "-injars", injarName, "-outjar", outjarName,"-1.4"};
 		Message error = new Message(WeaverMessages.format(WeaverMessages.CANT_FIND_TYPE_INTERFACES,"jar1.Parent"));
 		MessageSpec spec = new MessageSpec(null,newMessageList(error));
 		CompilationResult result = ajc(baseDir,args);
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/CompilationResult.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/CompilationResult.java
index 01e331523..1265e4502 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/CompilationResult.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/CompilationResult.java
@@ -114,7 +114,7 @@ public class CompilationResult {
 	 * though.
 	 * @see org.aspectj.tools.ajc.AjcTestCase
 	 */
-	public List /*IMessage*/ getInfoMessages() { return infoMessages; }
+	public List<IMessage> getInfoMessages() { return infoMessages; }
 	/**
 	 * The error messages produced by the compiler. The list
 	 * entries are the <code>IMessage</code> objects created during the
@@ -152,6 +152,7 @@ public class CompilationResult {
 	 * Returns string containing message count summary, list of messages
 	 * by type, and the actual ajc compilation command that was issued.
 	 */
+	@Override
 	public String toString() {
 		StringBuffer buff = new StringBuffer();
 		buff.append("AspectJ Compilation Result:\n");
diff --git a/testing-drivers/testsrc/org/aspectj/testing/drivers/AjcHarnessTestsUsingJUnit.java b/testing-drivers/testsrc/org/aspectj/testing/drivers/AjcHarnessTestsUsingJUnit.java
index ae7de7137..efaae5c25 100644
--- a/testing-drivers/testsrc/org/aspectj/testing/drivers/AjcHarnessTestsUsingJUnit.java
+++ b/testing-drivers/testsrc/org/aspectj/testing/drivers/AjcHarnessTestsUsingJUnit.java
@@ -14,7 +14,8 @@ package org.aspectj.testing.drivers;
 
 import org.aspectj.ajdt.internal.core.builder.AjState;
 
-import junit.framework.*;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
 
 /*
  * Run harness tests as JUnit test suites.
@@ -45,17 +46,13 @@ public class AjcHarnessTestsUsingJUnit extends TestCase {
 		super(name);
 	}
 	
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#setUp()
-	 */
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		AjState.FORCE_INCREMENTAL_DURING_TESTING = true;
 	}
 	
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#tearDown()
-	 */
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		AjState.FORCE_INCREMENTAL_DURING_TESTING = false;
diff --git a/tests/ajcHarnessTests.xml b/tests/ajcHarnessTests.xml
index 31b04a66e..4a031b682 100644
--- a/tests/ajcHarnessTests.xml
+++ b/tests/ajcHarnessTests.xml
@@ -180,10 +180,10 @@
       keywords="purejava">
         <compile classpath="classesDir,jars/required.jar" 
                  files="Main.java"
-                 outjar="main.zip"/>
+                 outjar="main.zip" options="-1.4"/>
         <compile classpath="classesDir,jars/required.jar"
                  aspectpath="jars/requiredAspects.jar,jars/AspectMain.jar"
-                 files="main.zip"/>
+                 files="main.zip" options="-1.4"/>
         <run class="Main"/>
     </ajc-test>
 
@@ -608,15 +608,15 @@
 
     <ajc-test dir="harness/aspectpath"
 		title="pass ltw-jarAspectpath">
-        <compile files="A.java" outjar="out.jar"/>
-        <compile files="Main.java"/>
+        <compile files="A.java" outjar="out.jar" options="-1.4"/>
+        <compile files="Main.java" options="-1.4"/>
         <run class="Main" aspectpath="out.jar"/> 
     </ajc-test>
 
     <ajc-test dir="harness/aspectpath"
 		title="pass ltw-jarAspectpath-jarClasspath">
-        <compile files="A.java" outjar="out.jar"/>
-        <compile files="Main.java" outjar="cl.zip"/>
+        <compile files="A.java" outjar="out.jar" options="-1.4"/>
+        <compile files="Main.java" outjar="cl.zip" options="-1.4"/>
         <run class="Main" aspectpath="out.jar" classpath="cl.zip"/> 
     </ajc-test>
 
diff --git a/tests/bugs192/11flags/A.java b/tests/bugs192/11flags/A.java
new file mode 100644
index 000000000..02d6e88f0
--- /dev/null
+++ b/tests/bugs192/11flags/A.java
@@ -0,0 +1,13 @@
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@interface B {}
+
+public class A {
+	@B
+	public void foo() {}
+}
+
+aspect X {
+	before(): execution(@B * foo(..)) {}
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc10x/ajc10x-tests.xml b/tests/src/org/aspectj/systemtest/ajc10x/ajc10x-tests.xml
index e93b9b150..56ee8f6e4 100644
--- a/tests/src/org/aspectj/systemtest/ajc10x/ajc10x-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc10x/ajc10x-tests.xml
@@ -4,45 +4,45 @@
     <ajc-test dir="new"
       title="properly make choice between cast and parenthesis in parser"
       keywords="from-resolved_10x">
-        <compile files="JoinPointFields.java"/>
+        <compile options="-1.4" files="JoinPointFields.java"/>
         <run class="JoinPointFields"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="96"
       title="field from implemented interface not found in advice"
       keywords="from-resolved_10x">
-        <compile files="FieldFromImplementsNotFound.java"/>
+        <compile options="-1.4" files="FieldFromImplementsNotFound.java"/>
         <run class="FieldFromImplementsNotFound"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="make sure advice affects introduced methods and constructors"
       keywords="from-resolved_10x">
-        <compile files="AdviceOnIntroduced.java"/>
+        <compile options="-1.4" files="AdviceOnIntroduced.java"/>
         <run class="AdviceOnIntroduced"/>
     </ajc-test>
 
     <ajc-test dir="new" title="new around construct"
       keywords="from-resolved_10x">
-        <compile files="AroundAdvice.java"/>
+        <compile options="-1.4" files="AroundAdvice.java"/>
         <run class="AroundAdvice"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="65" title="aspect redefines a parameter"
       keywords="from-resolved_10x">
-        <compile files="AspectRedefinesParam.java"/>
+        <compile options="-1.4" files="AspectRedefinesParam.java"/>
         <run class="AspectRedefinesParam"/>
     </ajc-test>
 
     <ajc-test dir="new" title="introducing extends and implements"
       keywords="from-resolved_10x">
-        <compile files="HierarchyIntroductions.java"/>
+        <compile options="-1.4" files="HierarchyIntroductions.java"/>
         <run class="HierarchyIntroductions"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="104" title="(related) aspect on interface"
       keywords="from-resolved_10x">
-        <compile files="AspectOnInterface.java"/>
+        <compile options="-1.4" files="AspectOnInterface.java"/>
         <run class="AspectOnInterface"/>
     </ajc-test>
 
@@ -65,326 +65,326 @@
 
     <ajc-test dir="new" title="advice on implied empty constructor"
       keywords="from-resolved_10x">
-        <compile files="AdviceOnEmptyConstructor.java"/>
+        <compile options="-1.4" files="AdviceOnEmptyConstructor.java"/>
         <run class="AdviceOnEmptyConstructor"/>
     </ajc-test>
 
     <ajc-test dir="new" title="advice on * *(..) not mapping to initializers"
       keywords="from-resolved_10x">
-        <compile files="InitializerAdvice.java"/>
+        <compile options="-1.4" files="InitializerAdvice.java"/>
         <run class="InitializerAdvice"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="three type declarations in the scope of an advice"
       keywords="from-resolved_10x">
-        <compile files="TypeDeclInAdvice.java"/>
+        <compile options="-1.4" files="TypeDeclInAdvice.java"/>
         <run class="TypeDeclInAdvice"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="129"
       title="introduction fails on class with an inner class that extends or implements something"
       keywords="from-resolved_10x">
-        <compile files="IntroductionFailsWithInnerClass.java"/>
+        <compile options="-1.4" files="IntroductionFailsWithInnerClass.java"/>
         <run class="IntroductionFailsWithInnerClass"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="126"
       title="checks that methods are introduced on the topmost class implemented"
       keywords="from-resolved_10x">
-        <compile files="TopmostImplements.java"/>
+        <compile options="-1.4" files="TopmostImplements.java"/>
         <run class="TopmostImplements"/>
     </ajc-test>
 
     <ajc-test dir="new/arndAdvRet" pr="140"
       title="a couple different returns from around advice"
       keywords="from-resolved_10x">
-        <compile files="Driver.java"/>
+        <compile options="-1.4" files="Driver.java"/>
         <run class="Driver"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="member finally advice paired with signature advice"
       keywords="from-resolved_10x">
-        <compile files="TryErrors.java"/>
+        <compile options="-1.4" files="TryErrors.java"/>
         <run class="TryErrors"/>
     </ajc-test>
 
     <ajc-test dir="new" title="aspect of eachobject(instanceof(Interface))"
       keywords="from-resolved_10x">
-        <compile files="AspectOfInterface.java"/>
+        <compile options="-1.4" files="AspectOfInterface.java"/>
         <run class="AspectOfInterface"/>
     </ajc-test>
 
     <ajc-test dir="new/finalMemInit" pr="162"
       title="final member initialization broken with JDK before 1.1.8"
       keywords="from-resolved_10x">
-        <compile files="Driver.java"/>
+        <compile options="-1.4" files="Driver.java"/>
         <run class="Driver"/>
     </ajc-test>
 
     <ajc-test dir="new/packageNameClash" pr="205"
       title="same package and var name clash in preprocessed code when aspectOf is used"
       keywords="from-resolved_10x">
-        <compile files="otherpkg/Driver.java,pkg/Aspect1.java,pkg/Class1.java"/>
+        <compile options="-1.4" files="otherpkg/Driver.java,pkg/Aspect1.java,pkg/Class1.java"/>
         <run class="otherpkg.Driver"/>
     </ajc-test>
 
     <ajc-test dir="new/adviceOnStaticMeth" pr="221"
       title="and PR#201 advice on static methods fails javac compile with this"
       keywords="from-resolved_10x">
-        <compile files="Driver.java"/>
+        <compile options="-1.4" files="Driver.java"/>
         <run class="Driver"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="non-static advice on inner class defined inside of method body"
       keywords="from-resolved_10x">
-        <compile files="MethodInner.java"/>
+        <compile options="-1.4" files="MethodInner.java"/>
         <run class="MethodInner"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="simple single-threaded eachcflow test (includes aspectOf)"
       keywords="from-resolved_10x">
-        <compile files="Client.java"/>
+        <compile options="-1.4" files="Client.java"/>
         <run class="Client"/>
     </ajc-test>
 
     <ajc-test dir="new/scopeTypingBug" pr="191"
       title="bad type resolution when var reassigned in same scope"
       keywords="from-resolved_10x">
-        <compile files="Driver.java"/>
+        <compile options="-1.4" files="Driver.java"/>
         <run class="Driver"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="242"
       title="generating the right throws clause for call-site advice (and around)"
       keywords="from-resolved_10x">
-        <compile files="ComputedThrows.java"/>
+        <compile options="-1.4" files="ComputedThrows.java"/>
         <run class="ComputedThrows"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="246"
       title="advice on calls to static methods using several syntax"
       keywords="from-resolved_10x">
-        <compile files="StaticCalls.java"/>
+        <compile options="-1.4" files="StaticCalls.java"/>
         <run class="StaticCalls"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="248"
       title=", PR#249, PR#250 advice on constructor sites"
       keywords="from-resolved_10x">
-        <compile files="NewSiteAdvice.java" options="-Xlint:ignore"/>
+        <compile files="NewSiteAdvice.java" options="-1.4 -Xlint:ignore"/>
         <run class="NewSiteAdvice"/>
     </ajc-test>
 
     <ajc-test dir="new" title="test after throwing advice in several ways"
       keywords="from-resolved_10x">
-        <compile files="AfterThrowing.java"/>
+        <compile options="-1.4" files="AfterThrowing.java"/>
         <run class="AfterThrowing"/>
     </ajc-test>
 
     <ajc-test dir="new" title="fancy name patterns for method names"
       keywords="from-resolved_10x">
-        <compile files="WildNames.java"/>
+        <compile options="-1.4" files="WildNames.java"/>
         <run class="WildNames"/>
     </ajc-test>
 
     <ajc-test dir="design/calls" title="calls: calls(...)"
       keywords="from-resolved_10x">
-        <compile files="Simple.java" options="-Xlint:ignore"/>
+        <compile files="Simple.java" options="-Xlint:ignore -1.4"/>
         <run class="Simple"/>
     </ajc-test>
 
     <ajc-test dir="new/extraThrows" pr="259"
       title="throws Exception clause is unnecessarily added to Driver.main method"
       keywords="from-resolved_10x">
-        <compile files="Driver.java" options="-Xlint:ignore"/>
+        <compile files="Driver.java" options="-Xlint:ignore -1.4"/>
         <run class="Driver"/>
     </ajc-test>
 
     <ajc-test dir="new/thisUsedInMain" pr="262"
       title="javac fails when this is referenced in the static main method"
       keywords="from-resolved_10x">
-        <compile files="Driver.java"/>
+        <compile options="-1.4" files="Driver.java"/>
         <run class="Driver"/>
     </ajc-test>
 
     <ajc-test dir="new/badCast" pr="275"
       title="and 276 cast error generated by ajc when type not in signature"
       keywords="from-resolved_10x">
-        <compile files="Driver.java"/>
+        <compile options="-1.4" files="Driver.java"/>
         <run class="Driver"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="285"
       title="calls to methods to which we don't have source"
       keywords="from-resolved_10x">
-        <compile files="ExternalCalls.java"/>
+        <compile options="-1.4" files="ExternalCalls.java"/>
         <run class="ExternalCalls"/>
     </ajc-test>
 
     <ajc-test dir="new/beforeNotRun" pr="265" title="more aspect inheritance"
       keywords="from-resolved_10x">
-        <compile files="Driver.java"/>
+        <compile options="-1.4" files="Driver.java"/>
         <run class="Driver"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="310"
       title="around and calls with both calling and called this params"
       keywords="from-resolved_10x">
-        <compile files="AroundAndCalls.java"/>
+        <compile options="-1.4" files="AroundAndCalls.java"/>
         <run class="AroundAndCalls"/>
     </ajc-test>
 
     <ajc-test dir="new/pointcutParameter" pr="290"
       title="compiler crashes with eachobject and named pointcuts with parameters"
       keywords="from-resolved_10x">
-        <compile files="Driver.java"/>
+        <compile options="-1.4" files="Driver.java"/>
         <run class="Driver"/>
     </ajc-test>
 
     <ajc-test dir="new/unqualifiedPointcutName" pr="304"
       title="lookup rules for unqualified pointcut names"
       keywords="from-resolved_10x">
-        <compile files="Driver.java"/>
+        <compile options="-1.4" files="Driver.java"/>
         <run class="Driver"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="321"
       title="eachcflow only instantiated if the aspect has some advice in it"
       keywords="from-resolved_10x">
-        <compile files="CFlowNoAdvice.java"/>
+        <compile options="-1.4" files="CFlowNoAdvice.java"/>
         <run class="CFlowNoAdvice"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="309"
       title="(DESIGN QUESTION) aspect of eachJVM advising its own initializer"
       keywords="from-resolved_10x">
-        <compile files="EachJVMOnSelf.java"/>
+        <compile options="-1.4" files="EachJVMOnSelf.java"/>
         <run class="EachJVMOnSelf"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="302"
       title="after returning advice on calls to constructors"
       keywords="from-resolved_10x">
-        <compile files="AfterConstructorCalls.java"/>
+        <compile options="-1.4" files="AfterConstructorCalls.java"/>
         <run class="AfterConstructorCalls"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="Does annotating 'new' with a type work as desired?"
       keywords="from-resolved_10x">
-        <compile files="ConstructorSignatures.java"/>
+        <compile options="-1.4" files="ConstructorSignatures.java"/>
         <run class="ConstructorSignatures"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="Referring to inner classes as {super}.{inner} confused ajc."
       keywords="from-resolved_10x">
-        <compile files="InnerClassNaming.java"/>
+        <compile options="-1.4" files="InnerClassNaming.java"/>
         <run class="InnerClassNaming"/>
     </ajc-test>
 
     <ajc-test dir="new" title="Advice on advice" keywords="from-resolved_10x">
-        <compile files="AdviceOnAdvice.java"/>
+        <compile options="-1.4" files="AdviceOnAdvice.java"/>
         <run class="AdviceOnAdvice"/>
     </ajc-test>
 
     <ajc-test dir="new" title="Introductions on other introductions"
       keywords="from-resolved_10x">
-        <compile files="IntroOnIntro.java"/>
+        <compile options="-1.4" files="IntroOnIntro.java"/>
         <run class="IntroOnIntro"/>
     </ajc-test>
 
     <ajc-test dir="new" title="Putting advice on array constructors."
       keywords="from-resolved_10x">
-        <compile files="Orleans.java"/>
+        <compile options="-1.4" files="Orleans.java"/>
         <run class="Orleans"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="call points within block inner classes are doubled"
       keywords="from-resolved_10x">
-        <compile files="DoubledCalls.java"/>
+        <compile options="-1.4" files="DoubledCalls.java"/>
         <run class="DoubledCalls"/>
     </ajc-test>
 
     <ajc-test dir="new" title="Gets and sets with other advice"
       keywords="from-resolved_10x">
-        <compile files="Counting3.java"/>
+        <compile options="-1.4" files="Counting3.java"/>
         <run class="Counting3"/>
     </ajc-test>
 
     <ajc-test dir="new" title="Compiler can compile correct strictfp modifiers"
       keywords="from-resolved_10x">
-        <compile files="StrictFpCompile.java"/>
+        <compile options="-1.4" files="StrictFpCompile.java"/>
         <run class="StrictFpCompile"/>
     </ajc-test>
 
     <ajc-test dir="new" title="basic test of callsto pointcuts"
       keywords="from-resolved_10x">
-        <compile files="CallsTo.java"/>
+        <compile options="-1.4" files="CallsTo.java"/>
         <run class="CallsTo"/>
     </ajc-test>
 
     <ajc-test dir="new" title="package wildcards in packages"
       keywords="from-resolved_10x">
-        <compile files="pack/PackageWildcards.java"/>
+        <compile options="-1.4" files="pack/PackageWildcards.java"/>
         <run class="pack.PackageWildcards"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="around advice on calls and receptions with lots of context"
       keywords="from-resolved_10x">
-        <compile files="AroundCalls.java"/>
+        <compile options="-1.4" files="AroundCalls.java"/>
         <run class="AroundCalls"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="208"
       title="! modifier and char in pointcut (no longer an error)"
       keywords="from-resolved_10x">
-        <compile files="NotCharInPointcut.java"/>
+        <compile options="-1.4" files="NotCharInPointcut.java"/>
         <run class="NotCharInPointcut"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="308"
       title="right number of aspect instances per cflow"
       keywords="from-resolved_10x">
-        <compile files="CFlowObjects.java"/>
+        <compile options="-1.4" files="CFlowObjects.java"/>
         <run class="CFlowObjects"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="310" title="many this's into around advice on calls"
       keywords="from-resolved_10x">
-        <compile files="AroundCallsArgs.java"/>
+        <compile options="-1.4" files="AroundCallsArgs.java"/>
         <run class="AroundCallsArgs"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="Ensures introduction methods can have advice placed on them"
       keywords="from-resolved_10x">
-        <compile files="Dominates.java"/>
+        <compile options="-1.4" files="Dominates.java"/>
         <run class="Dominates"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="355"
       title="No boolean appearing in the 'if' clause for around advice with eachJVM()"
       keywords="from-resolved_10x">
-        <compile files="PR355.java"/>
+        <compile options="-1.4" files="PR355.java"/>
         <run class="PR355"/>
     </ajc-test>
 
     <ajc-test dir="new" title="Order of super introductions."
       keywords="from-resolved_10x">
-        <compile files="OrderOfExtendsPlusAndImplementsPlus.java"/>
+        <compile options="-1.4" files="OrderOfExtendsPlusAndImplementsPlus.java"/>
         <run class="OrderOfExtendsPlusAndImplementsPlus"/>
     </ajc-test>
 
     <ajc-test dir="new" title="Ensuring backdoor methods are produced."
       keywords="from-resolved_10x">
-        <compile files="BackdoorMethods.java"/>
+        <compile options="-1.4" files="BackdoorMethods.java"/>
         <run class="BackdoorMethods"/>
     </ajc-test>
 
@@ -408,41 +408,41 @@
     <ajc-test dir="new"
       title="Putting after-constructor advice on the wrong types implementing the same interface."
       keywords="from-resolved_10x">
-        <compile files="AfterAdviceOnConstructorsOnTheWrongType.java"/>
+        <compile options="-1.4" files="AfterAdviceOnConstructorsOnTheWrongType.java"/>
         <run class="AfterAdviceOnConstructorsOnTheWrongType"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="Instantiating non-static inner classes in advice."
       keywords="from-resolved_10x">
-        <compile files="NonstaticInnerClassesInAspects.java"/>
+        <compile options="-1.4" files="NonstaticInnerClassesInAspects.java"/>
         <run class="NonstaticInnerClassesInAspects"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="316" title="Referring to pointcut in of clauses"
       keywords="from-resolved_10x">
-        <compile files="ReferringToPointcutsInAspect_PR316.java"/>
+        <compile options="-1.4" files="ReferringToPointcutsInAspect_PR316.java"/>
         <run class="ReferringToPointcutsInAspect_PR316"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="191"
       title="Confused referring to instance variables and locals"
       keywords="from-resolved_10x">
-        <compile files="ScopesAndFields_PR191.java"/>
+        <compile options="-1.4" files="ScopesAndFields_PR191.java"/>
         <run class="ScopesAndFields_PR191"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="Parsing C+ expressions without parens in super introductions."
       keywords="from-resolved_10x">
-        <compile files="ParsingSubtypesIntroductions.java"/>
+        <compile options="-1.4" files="ParsingSubtypesIntroductions.java"/>
         <run class="ParsingSubtypesIntroductions"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="Introducing methods on classes that implements inner-interfaces with +implements."
       keywords="from-resolved_10x">
-        <compile files="IntroducingMethodsOnPlusImplementedInterfaces.java" options="-Xlint:ignore"/>
+        <compile files="IntroducingMethodsOnPlusImplementedInterfaces.java" options="-Xlint:ignore -1.4"/>
         <run class="IntroducingMethodsOnPlusImplementedInterfaces"/>
     </ajc-test>
 
@@ -457,74 +457,74 @@
 
     <ajc-test dir="new" title="Making sure final variables stay final."
       keywords="from-resolved_10x">
-        <compile files="RemovingFinals.java"/>
+        <compile options="-1.4" files="RemovingFinals.java"/>
         <run class="RemovingFinals"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="Problem resolving meta-joinpoint names with around advice on methods called from around advice."
       keywords="from-resolved_10x">
-        <compile files="AroundAdviceOnMethodsCalledInAroundAdvice.java"/>
+        <compile options="-1.4" files="AroundAdviceOnMethodsCalledInAroundAdvice.java"/>
         <run class="AroundAdviceOnMethodsCalledInAroundAdvice"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="Make sure that names of lifted local classes are right when referenced in call-site advice"
       keywords="from-resolved_10x">
-        <compile files="CallsAndLocalClasses.java"/>
+        <compile options="-1.4" files="CallsAndLocalClasses.java"/>
         <run class="CallsAndLocalClasses"/>
     </ajc-test>
 
     <ajc-test dir="new" title="matching for throws clause"
       keywords="from-resolved_10x">
-        <compile files="ThrowsMatching.java"/>
+        <compile options="-1.4" files="ThrowsMatching.java"/>
         <run class="ThrowsMatching"/>
     </ajc-test>
 
     <ajc-test dir="new" title="basic test of declare soft"
       keywords="from-resolved_10x">
-        <compile files="DeclareSoft.java"/>
+        <compile options="-1.4" files="DeclareSoft.java"/>
         <run class="DeclareSoft"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="advice on calls to constructors of anonymous inners and access to context"
       keywords="from-resolved_10x">
-        <compile files="NewAnonymous.java"/>
+        <compile options="-1.4" files="NewAnonymous.java"/>
         <run class="NewAnonymous"/>
     </ajc-test>
 
     <ajc-test dir="new/innerAspectAccess" pr="211"
       title="inner aspects can't access outer pointcuts"
       keywords="from-resolved_10x">
-        <compile files="Driver.java"/>
+        <compile options="-1.4" files="Driver.java"/>
         <run class="Driver"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="implements and extends are introduced before methods and fields"
       keywords="from-resolved_10x">
-        <compile files="IntroOrder.java"/>
+        <compile options="-1.4" files="IntroOrder.java"/>
         <run class="IntroOrder"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="a static/inner aspect of a inner class of an aspect is pulled to the top level as static"
       keywords="from-resolved_10x">
-        <compile files="StaticInnerAspect.java"/>
+        <compile options="-1.4" files="StaticInnerAspect.java"/>
         <run class="StaticInnerAspect"/>
     </ajc-test>
 
     <ajc-test dir="new" title="Crashes with privileged aspect."
       keywords="from-resolved_10x">
-        <compile files="Privileged.java"/>
+        <compile options="-1.4" files="Privileged.java"/>
         <run class="Privileged"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="join points exist in the execution of field initializers"
       keywords="from-resolved_10x">
-        <compile files="FieldInitializerJoinPoints.java"/>
+        <compile options="-1.4" files="FieldInitializerJoinPoints.java"/>
         <run class="FieldInitializerJoinPoints"/>
     </ajc-test>
 
@@ -537,135 +537,135 @@
 
     <ajc-test dir="new" title="advice on field gets in privileged aspects"
       keywords="from-resolved_10x">
-        <compile files="AdviceOnPrivileged.java"/>
+        <compile options="-1.4" files="AdviceOnPrivileged.java"/>
         <run class="AdviceOnPrivileged"/>
     </ajc-test>
 
     <ajc-test dir="new" title="Two anonymous classes in the same scope"
       keywords="from-resolved_10x">
-        <compile files="TwoAnonymous.java"/>
+        <compile options="-1.4" files="TwoAnonymous.java"/>
         <run class="TwoAnonymous"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="basic tests for initializer and staticinitializer PCDs"
       keywords="from-resolved_10x">
-        <compile files="InitializerTest.java"/>
+        <compile options="-1.4" files="InitializerTest.java"/>
         <run class="InitializerTest"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="98"
       title="introduction of an initializer into a class"
       keywords="from-resolved_10x">
-        <compile files="IntroductionOfInitializer.java"/>
+        <compile options="-1.4" files="IntroductionOfInitializer.java"/>
         <run class="IntroductionOfInitializer"/>
     </ajc-test>
 
     <ajc-test dir="new/access"
       title="some method accessibility tests, particularly package-protected and inheritance"
       keywords="from-resolved_10x">
-        <compile files="Test1.java,pc/C.java,psub/SubC.java,psub/A.java"/>
+        <compile options="-1.4" files="Test1.java,pc/C.java,psub/SubC.java,psub/A.java"/>
         <run class="Test1"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="fairly monotonous (and non-covering) tests for expanded dot patterns"
       keywords="from-resolved_10x">
-        <compile files="ExpandedDotDotPattern.java"/>
+        <compile options="-1.4" files="ExpandedDotDotPattern.java"/>
         <run class="ExpandedDotDotPattern"/>
     </ajc-test>
 
     <ajc-test dir="new" title="field patterns and subtyping"
       keywords="from-resolved_10x">
-        <compile files="FieldPatterns.java"/>
+        <compile options="-1.4" files="FieldPatterns.java"/>
         <run class="FieldPatterns"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="Checking formal matching as in Roeder's bug in 0.7b10"
       keywords="from-resolved_10x">
-        <compile files="FormalMatching.java"/>
+        <compile options="-1.4" files="FormalMatching.java"/>
         <run class="FormalMatching"/>
     </ajc-test>
 
     <ajc-test dir="new" title="Introducing synchronized methods on interfaces."
       keywords="from-resolved_10x">
-        <compile files="SynchronizedMethodsOnInterfaces.java"/>
+        <compile options="-1.4" files="SynchronizedMethodsOnInterfaces.java"/>
         <run class="SynchronizedMethodsOnInterfaces"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="The pointcut params (..,int..) is not recognizing (Object,int,Object)."
       keywords="from-resolved_10x">
-        <compile files="Params.java"/>
+        <compile options="-1.4" files="Params.java"/>
         <run class="Params"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="calls advice on array objects causes error in code generation"
       keywords="from-resolved_10x">
-        <compile files="CallsToArray.java"/>
+        <compile options="-1.4" files="CallsToArray.java"/>
         <run class="CallsToArray"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="join points in field initializers aren't showing up."
       keywords="from-resolved_10x">
-        <compile files="NonexistentFieldInitializers.java"/>
+        <compile options="-1.4" files="NonexistentFieldInitializers.java"/>
         <run class="NonexistentFieldInitializers"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="318" title="Handlers problem"
       keywords="from-resolved_10x">
-        <compile files="PR318.java" options="-Xlint:ignore"/>
+        <compile files="PR318.java" options="-Xlint:ignore -1.4"/>
         <run class="PR318"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="work nicely with inner class method look-up rules and call-site advice"
       keywords="from-resolved_10x">
-        <compile files="InnerMethods.java"/>
+        <compile options="-1.4" files="InnerMethods.java"/>
         <run class="InnerMethods"/>
     </ajc-test>
 
     <ajc-test dir="new" title="strictfp modifier allowed on advice"
       keywords="from-resolved_10x">
-        <compile files="StrictFPAdvice.java"/>
+        <compile options="-1.4" files="StrictFPAdvice.java"/>
         <run class="StrictFPAdvice"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="415"
       title="No argthis was being created for calls advice."
       keywords="from-resolved_10x">
-        <compile files="PR415.java"/>
+        <compile options="-1.4" files="PR415.java"/>
         <run class="PR415"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="Ensuring no advice with instanceof(..) is run on static methods."
       keywords="from-resolved_10x">
-        <compile files="StaticMethodsShouldNotReceiveInstanceofAdvice.java"/>
+        <compile options="-1.4" files="StaticMethodsShouldNotReceiveInstanceofAdvice.java"/>
         <run class="StaticMethodsShouldNotReceiveInstanceofAdvice"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="Null pointer on gets advice showing the case causing the error"
       keywords="from-resolved_10x">
-        <compile files="NullPointerOnGetsSimple.java"/>
+        <compile options="-1.4" files="NullPointerOnGetsSimple.java"/>
         <run class="NullPointerOnGetsSimple"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="try to make sure that dynamic JoinPoint objects aren't generated when used inside of if (false) { ... }"
       keywords="from-resolved_10x">
-        <compile files="IfdefsAndAdvice.java"/>
+        <compile options="-1.4" files="IfdefsAndAdvice.java"/>
         <run class="IfdefsAndAdvice"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="within and withincode (doesn't all work due to local class name issues)"
       keywords="from-resolved_10x">
-        <compile files="WithinInners.java"/>
+        <compile options="-1.4" files="WithinInners.java"/>
         <run class="WithinInners"/>
     </ajc-test>
 
@@ -685,263 +685,263 @@
     
     <ajc-test dir="new" title="Arguments to runNext should be final when needed"
       keywords="from-resolved_10x">
-        <compile files="Finals.java"/>
+        <compile options="-1.4" files="Finals.java"/>
         <run class="Finals"/>
     </ajc-test>
 
     <ajc-test dir="new" title="Method introductions"
       keywords="from-resolved_10x">
-        <compile files="MethodIntroductions.java"/>
+        <compile options="-1.4" files="MethodIntroductions.java"/>
         <run class="MethodIntroductions"/>
     </ajc-test>
 
     <ajc-test dir="new" title="Putting an introduced method on each interface"
       keywords="from-resolved_10x">
-        <compile files="IntroducedMethodsOnEachInterface.java"/>
+        <compile options="-1.4" files="IntroducedMethodsOnEachInterface.java"/>
         <run class="IntroducedMethodsOnEachInterface"/>
     </ajc-test>
 
     <ajc-test dir="new" title="Extending interfaces"
       keywords="from-resolved_10x">
-        <compile files="BindingInterfaces.java"/>
+        <compile options="-1.4" files="BindingInterfaces.java"/>
         <run class="BindingInterfaces"/>
     </ajc-test>
 
     <ajc-test dir="new" title="Introducing private methods on interfaces"
       keywords="from-resolved_10x">
-        <compile files="IntroducingPrivateMethodsOnInterfaces.java"/>
+        <compile options="-1.4" files="IntroducingPrivateMethodsOnInterfaces.java"/>
         <run class="IntroducingPrivateMethodsOnInterfaces"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="Issuing errors for assigning variables thisJoinPoint -- not assigning thisJoinPoint."
       keywords="from-resolved_10x">
-        <compile files="ThisJoinPointAssignments.java"/>
+        <compile options="-1.4" files="ThisJoinPointAssignments.java"/>
         <run class="ThisJoinPointAssignments"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="Static references inside of introduced bodies get bound correctly."
       keywords="from-resolved_10x">
-        <compile files="StaticIntroducedReferences.java"/>
+        <compile options="-1.4" files="StaticIntroducedReferences.java"/>
         <run class="StaticIntroducedReferences"/>
     </ajc-test>
 
     <ajc-test dir="new/cflowObjectCreations" pr="307"
       title="cflow and object creations [of eachcflow]"
       keywords="from-resolved_10x">
-        <compile files="Driver.java"/>
+        <compile options="-1.4" files="Driver.java"/>
         <run class="Driver"/>
     </ajc-test>
 
     <ajc-test dir="new/twofiles"
       title="Doesn't import MightHaveAspect when compiling with more than 1 file. [eachobject]"
       keywords="from-resolved_10x">
-        <compile files="TheObject.java,TheAspect.java"/>
+        <compile options="-1.4" files="TheObject.java,TheAspect.java"/>
         <run class="TheObject"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="436"
       title="test binding to formals in calls to constructors (binding to null) (eachobject !!! now misnamed)"
       keywords="from-resolved_10x">
-        <compile files="BindingThisInsteadOfFormal.java"/>
+        <compile options="-1.4" files="BindingThisInsteadOfFormal.java"/>
         <run class="BindingThisInsteadOfFormal"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="After advice isn't being woven into after throwing advice"
       keywords="from-resolved_10x">
-        <compile files="AfterThrowingNotWoven.java"/>
+        <compile options="-1.4" files="AfterThrowingNotWoven.java"/>
         <run class="AfterThrowingNotWoven"/>
     </ajc-test>
 
     <ajc-test dir="new" title="Throwing an EmptyStackException."
       keywords="from-resolved_10x">
-        <compile files="EmptyStack.java"/>
+        <compile options="-1.4" files="EmptyStack.java"/>
         <run class="EmptyStack"/>
     </ajc-test>
 
 	<ajc-test dir="new/perThis"
 	    title="check that MightHaveAspect interface is created correctly for an aspect in deep package"
 	    keywords="from-resolved_10x">
-	      <compile files="p/EachObjectTarget.java,the/deep/pkg/EachObjectInDeepPackage.java"/>
+	      <compile options="-1.4" files="p/EachObjectTarget.java,the/deep/pkg/EachObjectInDeepPackage.java"/>
 	      <run class="p.EachObjectTarget"/>
 	</ajc-test>
   
     <ajc-test dir="new" title="Defines clfow$ajc0 more once. [eachcflow]"
       keywords="from-resolved_10x">
-        <compile files="Binkley.java"/>
+        <compile options="-1.4" files="Binkley.java"/>
         <run class="Binkley"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="Various calls, receptions, and callsto tests [callsto]"
       keywords="from-resolved_10x">
-        <compile files="CallsReceptionsCallsto.java"/>
+        <compile options="-1.4" files="CallsReceptionsCallsto.java"/>
         <run class="CallsReceptionsCallsto"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="320"
       title="Was throwing exception, now just an error. [eachobject]"
       keywords="from-resolved_10x">
-        <compile files="PR320.java"/>
+        <compile options="-1.4" files="PR320.java"/>
         <run class="PR320"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="different version of aspect inheritance, particularly empty pointcuts and abstract cflows [eachcflow]"
       keywords="from-resolved_10x,fail-unimplemented">
-        <compile files="AspectInheritance.java"/>
+        <compile options="-1.4" files="AspectInheritance.java"/>
         <run class="AspectInheritance"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="339"
       title="set advice on member initing throwing exception [eachobject]"
       keywords="from-resolved_10x">
-        <compile files="PR339.java"/>
+        <compile options="-1.4" files="PR339.java"/>
         <run class="PR339"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="417"
       title="Testing class names with same name's with difference case as package. [eachobject]"
       keywords="from-resolved_10x">
-        <compile files="test/TraceAspect.java,test/Test.java"/>
+        <compile options="-1.4" files="test/TraceAspect.java,test/Test.java"/>
         <run class="test.Test"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="Null pointer on gets advice with coverage [painful]"
       keywords="from-resolved_10x">
-        <compile files="NullPointerOnGets.java"/>
+        <compile options="-1.4" files="NullPointerOnGets.java"/>
         <run class="NullPointerOnGets"/>
     </ajc-test>
 
     <ajc-test dir="new" title="Basic test for cflow pointcuts [eachcflow]"
       keywords="from-resolved_10x">
-        <compile files="CFlowPoints.java" options="-Xlint:ignore"/>
+        <compile files="CFlowPoints.java" options="-Xlint:ignore -1.4"/>
         <run class="CFlowPoints"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="Crashing when looking up the type of array members."
       keywords="from-resolved_10x">
-        <compile files="ArrayCasts.java"/>
+        <compile options="-1.4" files="ArrayCasts.java"/>
         <run class="ArrayCasts"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="PostfixExprs to various synthetic things are fixed correctly [eachobject]"
       keywords="from-resolved_10x">
-        <compile files="Fixes.java"/>
+        <compile options="-1.4" files="Fixes.java"/>
         <run class="Fixes"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="Dave Binkley's problem with eachcflowroot. [eachcflow]"
       keywords="from-resolved_10x">
-        <compile files="Binkley2.java"/>
+        <compile options="-1.4" files="Binkley2.java"/>
         <run class="Binkley2"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="105" title="advice on an inherited method"
       keywords="from-resolved_10x">
-        <compile files="AdviceOnInheritedMethod.java"/>
+        <compile options="-1.4" files="AdviceOnInheritedMethod.java"/>
         <run class="AdviceOnInheritedMethod"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="114"
       title=", PR#115 checks the ordering of catch clauses"
       keywords="from-resolved_10x">
-        <compile files="OrderOfCatches.java" options="-Xlint:ignore"/>
+        <compile files="OrderOfCatches.java" options="-Xlint:ignore -1.4"/>
         <run class="OrderOfCatches"/>
     </ajc-test>
 
     <ajc-test dir="new" title="various declared exception permutations"
       keywords="from-resolved_10x">
-        <compile files="DeclaredExcs.java"/>
+        <compile options="-1.4" files="DeclaredExcs.java"/>
         <run class="DeclaredExcs"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="ordering of advice kinds as well as cflow and dominates"
       keywords="from-resolved_10x">
-        <compile files="AdviceOrdering.java"/>
+        <compile options="-1.4" files="AdviceOrdering.java"/>
         <run class="AdviceOrdering"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="241"
       title="advice on default constructor for a class only referenced via reflection"
       keywords="from-resolved_10x">
-        <compile files="OddConstructors.java"/>
+        <compile options="-1.4" files="OddConstructors.java"/>
         <run class="OddConstructors"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="289"
       title="calling and called this params in calls points"
       keywords="from-resolved_10x">
-        <compile files="CallsParams.java"/>
+        <compile options="-1.4" files="CallsParams.java"/>
         <run class="CallsParams"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="322"
       title="primitive parameters coercable to Object just like return values are"
       keywords="from-resolved_10x">
-        <compile files="ObjectForInt.java"/>
+        <compile options="-1.4" files="ObjectForInt.java"/>
         <run class="ObjectForInt"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="join points in static/dynamic initializers aren't showing up."
       keywords="from-resolved_10x">
-        <compile files="NonexistentInitializers.java"/>
+        <compile options="-1.4" files="NonexistentInitializers.java"/>
         <run class="NonexistentInitializers"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="Gets and sets on a number of variables (field access ???)"
       keywords="from-resolved_10x">
-        <compile files="Gets.java"/>
+        <compile options="-1.4" files="Gets.java"/>
         <run class="Gets"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="Joinpoints are showing up on intermediate call sites"
       keywords="from-resolved_10x">
-        <compile files="Counting1.java"/>
+        <compile options="-1.4" files="Counting1.java"/>
         <run class="Counting1"/>
     </ajc-test>
 
     <ajc-test dir="new" title="Reception based on strictfp modifier"
       keywords="from-resolved_10x">
-        <compile files="StrictFpReceptions.java"/>
+        <compile options="-1.4" files="StrictFpReceptions.java"/>
         <run class="StrictFpReceptions"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="353"
       title="Subclasses that do not redefine a method are not being handled correctly"
       keywords="from-resolved_10x">
-        <compile files="PR353b.java"/>
+        <compile options="-1.4" files="PR353b.java"/>
         <run class="PR353b"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="making sure that super calls are bound to the right methods"
       keywords="from-resolved_10x">
-        <compile files="SupersAndInterfaces.java"/>
+        <compile options="-1.4" files="SupersAndInterfaces.java"/>
         <run class="SupersAndInterfaces"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="317"
       title="inheritance, around advice and abstract pointcuts [eachobject] (still)"
       keywords="from-resolved_10x">
-        <compile files="OverridingPointcuts.java"/>
+        <compile options="-1.4" files="OverridingPointcuts.java"/>
         <run class="OverridingPointcuts"/>
     </ajc-test>
 
     <ajc-test dir="new/foemmel"
       title="Priviledged aspect methods are missing for privates. [eachobject]"
       keywords="from-resolved_10x">
-        <compile files="TheAspect.java,TheObject.java">
+        <compile options="-1.4" files="TheAspect.java,TheObject.java">
         </compile>
         <run class="TheObject"/>
     </ajc-test>
@@ -949,20 +949,20 @@
     <ajc-test dir="new"
       title="exceptions thrown and caught in advice, particularly try+proceed"
       keywords="from-resolved_10x">
-        <compile files="TryAndProceed.java" options="-Xlint:ignore"/>
+        <compile files="TryAndProceed.java" options="-Xlint:ignore -1.4"/>
         <run class="TryAndProceed"/>
     </ajc-test>
 
     <ajc-test dir="new" title="Not and And operators in pointcuts not working"
       keywords="from-resolved_10x">
-        <compile files="NotAndPointcut.java"/>
+        <compile options="-1.4" files="NotAndPointcut.java"/>
         <run class="NotAndPointcut"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="Member initializers should run before the current class constructor"
       keywords="from-resolved_10x">
-        <compile files="MemberInitializationsAfterExplicitConstructorCalls.java"/>
+        <compile options="-1.4" files="MemberInitializationsAfterExplicitConstructorCalls.java"/>
         <run class="MemberInitializationsAfterExplicitConstructorCalls"/>
     </ajc-test>
 
@@ -977,55 +977,55 @@
     <ajc-test dir="new"
       title="thisJoinPoint{Static} not visible in if() pcd of named pointcut"
       keywords="from-resolved_10x">
-        <compile files="IfPCDExprJoinPointVisibleCE.java"/>
+        <compile options="-1.4" files="IfPCDExprJoinPointVisibleCE.java"/>
         <run class="IfPCDExprJoinPointVisibleCE"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="pcd if() expression visibility at compile-time  (minimal operation)"
       keywords="from-resolved_10x">
-        <compile files="IfPCDExprVisibility.java" options="-Xlint:ignore"/>
+        <compile files="IfPCDExprVisibility.java" options="-Xlint:ignore -1.4"/>
         <run class="IfPCDExprVisibility"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="pcd if() NPE in compiler when unwinding assignment in pcd if(expr)"
       keywords="from-resolved_10x">
-        <compile files="IfPCDExprAssignUnparseFailure.java"/>
+        <compile options="-1.4" files="IfPCDExprAssignUnparseFailure.java"/>
         <run class="IfPCDExprAssignUnparseFailure"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="pcd if() dup methods produced when pointcut after advice etc (javac)"
       keywords="from-resolved_10x">
-        <compile files="IfPCDDupMethod.java"/>
+        <compile options="-1.4" files="IfPCDDupMethod.java"/>
         <run class="IfPCDDupMethod"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="pcd if() variants: [anonymous, named] x [execution, call, callTyped, get, set, initializations] x [before, after, around]"
       keywords="from-resolved_10x">
-        <compile files="IfPCDAdviceMethods.java"/>
+        <compile options="-1.4" files="IfPCDAdviceMethods.java"/>
         <run class="IfPCDAdviceMethods"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="476" title="initialization order with this"
       keywords="from-resolved_10x">
-        <compile files="InitializationOrder.java"/>
+        <compile options="-1.4" files="InitializationOrder.java"/>
         <run class="InitializationOrder"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="496"
       title="!within and !this handling for callee-side call points"
       keywords="from-resolved_10x">
-        <compile files="NotThis.java"/>
+        <compile options="-1.4" files="NotThis.java"/>
         <run class="NotThis"/>
     </ajc-test>
 
     <ajc-test dir="new/innerInterfaces" pr="494"
       title="private inner interfaces and bytecode visibility"
       keywords="from-resolved_10x">
-        <compile files="p/Driver.java,p/InnerTest.java,other/Test.java"/>
+        <compile options="-1.4" files="p/Driver.java,p/InnerTest.java,other/Test.java"/>
         <run class="p.Driver"/>
     </ajc-test>
 
@@ -1036,54 +1036,54 @@
     <ajc-test dir="new" pr="490"
       title="elaborated into testing of around on all join points"
       keywords="from-resolved_10x">
-        <compile files="AroundAll.java"/>
+        <compile options="-1.4" files="AroundAll.java"/>
         <run class="AroundAll"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="type name hygiene when code comes from aspects in different packages"
       keywords="from-resolved_10x">
-        <compile
+        <compile options="-1.4"
           files="typeNameConflicts/Driver.java,typeNameConflicts/p1/C.java,typeNameConflicts/aspects/A.java"/>
         <run class="typeNameConflicts.Driver"/>
     </ajc-test>
 
     <ajc-test dir="new" title="cflowbelow dependencies (from Chris Dutchyn)"
       keywords="from-resolved_10x">
-        <compile files="CflowBelowTest.java"/>
+        <compile options="-1.4" files="CflowBelowTest.java"/>
         <run class="CflowBelowTest"/>
     </ajc-test>
 
    <ajc-test dir="new" pr="493"
       title="Compiler incorrectly flagging *1 (non-alphabetic start to signature pattern)"
       keywords="from-resolved_10x">
-        <compile files="NonAlphaSignaturePatternCE.java"/>
+        <compile options="-1.4" files="NonAlphaSignaturePatternCE.java"/>
         <run class="NonAlphaSignaturePatternCE"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="Unable to bind privately-introduced field name from introduced method in the same aspect"
       keywords="from-resolved_10x">
-        <compile files="IntroducedFieldsNotBinding.java"/>
+        <compile options="-1.4" files="IntroducedFieldsNotBinding.java"/>
         <run class="IntroducedFieldsNotBinding"/>
     </ajc-test>
 
     <ajc-test dir="new/anonInnerClass" pr="297"
       title="anonymous inner class with aspect" keywords="from-resolved_10x">
-        <compile files="Driver.java"/>
+        <compile options="-1.4" files="Driver.java"/>
         <run class="Driver"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="335"
       title="Arguments are not being passed in to calls advice"
       keywords="from-resolved_10x">
-        <compile files="PR335.java"/>
+        <compile options="-1.4" files="PR335.java"/>
         <run class="PR335"/>
     </ajc-test>
 
     <ajc-test dir="design/intro" title="interfaces as mixins with introduction"
       keywords="from-resolved_10x">
-        <compile files="Interfaces.java">
+        <compile options="-1.4" files="Interfaces.java">
         <message kind="error" text="can't override java.lang.String SubI.instanceField with java.lang.String SubC.instanceField visibility is reduced"/>
         <message kind="error" text="can't override java.lang.String I.instanceField with java.lang.String C.instanceField visibility is reduced"/>
         </compile>
@@ -1091,109 +1091,109 @@
     
     <ajc-test dir="design/intro" title="interfaces as mixins with introduction b"
       keywords="from-resolved_10x">
-        <compile files="Interfaces.java" options="-Xset:itdVersion=1"/>
+        <compile files="Interfaces.java" options="-Xset:itdVersion=1 -1.4"/>
         <run class="Interfaces"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="functional modifiers work correctly with introduced members"
       keywords="from-resolved_10x">
-        <compile files="IntroducedModifiers.java"/>
+        <compile options="-1.4" files="IntroducedModifiers.java"/>
         <run class="IntroducedModifiers"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="ExceptionInInitializerError accessing cflow in aspect initialization - before variants"
       keywords="from-resolved_10x">
-        <compile files="CflowInitInAspectVariantsBefore.java"/>
+        <compile options="-1.4" files="CflowInitInAspectVariantsBefore.java"/>
         <run class="CflowInitInAspectVariantsBefore"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="NoClassDefFoundError accessing cflow in aspect initialization - after variants"
       keywords="from-resolved_10x">
-        <compile files="CflowInitInAspectVariantsAfter.java"/>
+        <compile options="-1.4" files="CflowInitInAspectVariantsAfter.java"/>
         <run class="CflowInitInAspectVariantsAfter"/>
     </ajc-test>
 
     <ajc-test dir="new" title="InternalCompilerError in JpPlan when args alone"
       keywords="from-resolved_10x">
-        <compile files="ArgsAlone.java"/>
+        <compile options="-1.4" files="ArgsAlone.java"/>
         <run class="ArgsAlone"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="527"
       title="compile error using pcd if() with advice on introduced methods."
       keywords="from-resolved_10x">
-        <compile files="PR527.java"/>
+        <compile options="-1.4" files="PR527.java"/>
         <run class="PR527"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="528"
       title="compile errors boolean using cflow and unimplemented method using around advice on methods introduced by interface"
       keywords="from-resolved_10x">
-        <compile files="PR528.java"/>
+        <compile options="-1.4" files="PR528.java"/>
         <run class="PR528"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="534" title="aspect as member of interface"
       keywords="from-resolved_10x">
-        <compile files="AspectInInterfaceCP.java"/>
+        <compile options="-1.4" files="AspectInInterfaceCP.java"/>
         <run class="AspectInInterfaceCP"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="535"
       title="missing method name to synthetic invocation"
       keywords="from-resolved_10x,new-messages-vary">
-        <compile files="PR535.java"/>
+        <compile options="-1.4" files="PR535.java"/>
         <run class="PR535"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="536"
       title="protected subclass impl of superclass method with default access and variants"
       keywords="from-resolved_10x">
-        <compile files="RestrictingVisibilityCP.java"/>
+        <compile options="-1.4" files="RestrictingVisibilityCP.java"/>
         <run class="RestrictingVisibilityCP"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="519" title="Exception planning advice"
       keywords="from-resolved_10x">
-        <compile files="PR519.java" options="-Xlint:ignore"/>
+        <compile files="PR519.java" options="-Xlint:ignore -1.4"/>
         <run class="PR519"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="521"
       title="unreproduced bug with advice - probably UTR"
       keywords="from-resolved_10x">
-        <compile files="PR520.java"/>
+        <compile options="-1.4" files="PR520.java"/>
         <run class="PR520"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="494"
       title="introduced inner interfaces accessible inside aspect"
       keywords="from-resolved_10x">
-        <compile files="IntroduceInnerInterfaceCP.java"/>
+        <compile options="-1.4" files="IntroduceInnerInterfaceCP.java"/>
         <run class="IntroduceInnerInterfaceCP"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="525"
       title="validate (enclosing) join point and source locations"
       keywords="from-resolved_10x">
-        <compile files="NegativeSourceLocation.java" options="-Xlint:ignore"/>
+        <compile files="NegativeSourceLocation.java" options="-Xlint:ignore -1.4"/>
         <run class="NegativeSourceLocation"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="544"
       title="advice formals are just like method formals"
       keywords="from-resolved_10x">
-        <compile files="AdviceFormalsCp.java"/>
+        <compile options="-1.4" files="AdviceFormalsCp.java"/>
         <run class="AdviceFormalsCp"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="544"
       title="advice formals produce errors just like method formals"
       keywords="from-resolved_10x">
-        <compile files="AdviceFormalsCf.java">
+        <compile options="-1.4" files="AdviceFormalsCf.java">
             <message kind="error" line="28"/>
             <message kind="error" line="29"/>
             <message kind="error" line="36"/>
@@ -1204,21 +1204,21 @@
     <ajc-test dir="new"
       title="advice throws clauses must be compatible with joinpoints they apply to"
       keywords="from-resolved_10x">
-        <compile files="AdviceThrowsCp.java"/>
+        <compile options="-1.4" files="AdviceThrowsCp.java"/>
         <run class="AdviceThrowsCp"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="570"
       title="potential method conflicts with introductions and interfaces and PR#561"
       keywords="from-resolved_10x">
-        <compile files="MethodConflictsCP.java"/>
+        <compile options="-1.4" files="MethodConflictsCP.java"/>
         <run class="MethodConflictsCP"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="570"
       title="illegal method conflicts with introductions and interfaces and PR#561"
       keywords="from-resolved_10x">
-        <compile files="MethodConflictsCF.java">
+        <compile options="-1.4" files="MethodConflictsCF.java">
             <message kind="error" line="8"/>
             <message kind="error" line="20"/>
             <message kind="error" line="28"/>
@@ -1227,14 +1227,14 @@
 
     <ajc-test dir="new" title="AspectOf available for different aspect types"
       keywords="from-resolved_10x">
-        <compile files="AspectOf.java"/>
+        <compile options="-1.4" files="AspectOf.java"/>
         <run class="AspectOf"/>
     </ajc-test>
 
     <ajc-test dir="new/privilegedAspects" pr="35593"
       title="access to all members of class and inner class from privileged aspect"
       keywords="from-resolved_10x">
-        <compile
+        <compile options="-1.4"
           files="driver/PrivilegedAspect.java,util/Util.java,pack/DefaultTarget.java,pack/PublicTarget.java"/>
         <run class="driver.PrivilegedAspect"/>
     </ajc-test>
@@ -1242,49 +1242,49 @@
     <ajc-test dir="new"
       title="cflow alone with around produces compiler bcg StackOverflowError"
       keywords="from-resolved_10x">
-        <compile files="CflowAlone.java"/>
+        <compile options="-1.4" files="CflowAlone.java"/>
         <run class="CflowAlone"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="get/set join points run for complex assignment operators (+=, etc.) (working)"
       keywords="from-resolved_10x">
-        <compile files="AssignOps.java"/>
+        <compile options="-1.4" files="AssignOps.java"/>
         <run class="AssignOps"/>
     </ajc-test>
 
     <ajc-test dir="new/introTypeMissing"
       title="this available in introduced field initializers"
       keywords="from-resolved_10x">
-        <compile files="ThisInIntroFieldInit.java"/>
+        <compile options="-1.4" files="ThisInIntroFieldInit.java"/>
         <run class="ThisInIntroFieldInit"/>
     </ajc-test>
 
     <ajc-test dir="new/introTypeMissing"
       title="Introduced type unavailable to cast expressions in introduced methods"
       keywords="from-resolved_10x">
-        <compile files="Cast.java,TargetClass.java,Util.java"/>
+        <compile options="-1.4" files="Cast.java,TargetClass.java,Util.java"/>
         <run class="Cast"/>
     </ajc-test>
 
     <ajc-test dir="new/introTypeMissing"
       title="Introduced type unavailable to qualified new expressions in introduced methods"
       keywords="from-resolved_10x">
-        <compile files="Inner.java,TargetClass.java,Util.java"/>
+        <compile options="-1.4" files="Inner.java,TargetClass.java,Util.java"/>
         <run class="Inner"/>
     </ajc-test>
 
     <ajc-test dir="new/introTypeMissing"
       title="Introduced type unavailable to cast expressions in introduced field initializers"
       keywords="from-resolved_10x">
-        <compile files="CastInFieldInit.java,TargetClass.java,Util.java"/>
+        <compile options="-1.4" files="CastInFieldInit.java,TargetClass.java,Util.java"/>
         <run class="CastInFieldInit"/>
     </ajc-test>
 
     <ajc-test dir="new/introTypeMissing"
       title="Aspect type unavailable to qualified new expressions in body of introduced methods"
       keywords="from-resolved_10x">
-        <compile files="AspectInIntroducedMethod.java"/>
+        <compile options="-1.4" files="AspectInIntroducedMethod.java"/>
         <run class="AspectInIntroducedMethod"/>
     </ajc-test>
 
@@ -1292,14 +1292,14 @@
     <ajc-test dir="new/introTypeMissing"
       title="Introduced type unavailable to qualified new expressions in introduced field initializers"
       keywords="from-resolved_10x">
-        <compile files="InnerInFieldInit.java,TargetClass.java,Util.java"/>
+        <compile options="-1.4" files="InnerInFieldInit.java,TargetClass.java,Util.java"/>
         <run class="InnerInFieldInit"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="595"
       title="variable slots and finally/catch causing verify errors"
       keywords="from-resolved_10final,from-resolved_10x">
-        <compile files="AfterFinally.java"/>
+        <compile options="-1.4" files="AfterFinally.java"/>
         <run class="AfterFinally"/>
     </ajc-test>
 
@@ -1307,7 +1307,7 @@
     <ajc-test dir="new" pr="590"
       title="after advice on static method with pcd if() using result"
       keywords="from-resolved_10x">
-        <compile files="PR590.java">
+        <compile options="-1.4" files="PR590.java">
             <message kind="error" line="20"/>
             <message kind="error" line="23"/>
         </compile>
@@ -1316,7 +1316,7 @@
     <ajc-test dir="new" pr="590"
       title="after advice on static method with pcd if() using result through pointcut"
       keywords="from-resolved_10x">
-        <compile files="PR590a.java" options="-Xlint:ignore">
+        <compile files="PR590a.java" options="-Xlint:ignore -1.4">
             <message kind="error" line="29"/>
             <message kind="error" line="31"/>
         </compile>
@@ -1325,41 +1325,41 @@
     <ajc-test dir="new/PR600" pr="600"
       title="AbstractMethodError for introduced methods (order 1)"
       keywords="from-resolved_10x">
-        <compile files="Main.java,My_error.java,A.java,B.java,C.java"/>
+        <compile options="-1.4" files="Main.java,My_error.java,A.java,B.java,C.java"/>
         <run class="Main"/>
     </ajc-test>
 
     <ajc-test dir="new/PR600" pr="600"
       title="AbstractMethodError for introduced methods (order 2)"
       keywords="from-resolved_10x">
-        <compile files="Main.java,My_error.java,C.java,A.java,B.java"/>
+        <compile options="-1.4" files="Main.java,My_error.java,C.java,A.java,B.java"/>
         <run class="Main"/>
     </ajc-test>
 
     <ajc-test dir="new/PR600" pr="600"
       title="AbstractMethodError for introduced methods (order 3)"
       keywords="from-resolved_10x">
-        <compile files="My_error.java,A.java,B.java,C.java,Main.java"/>
+        <compile options="-1.4" files="My_error.java,A.java,B.java,C.java,Main.java"/>
         <run class="Main"/>
     </ajc-test>
 
     <ajc-test dir="new/PR600" pr="600"
       title="AbstractMethodError for introduced methods (order 4)"
       keywords="from-resolved_10x">
-        <compile files="A.java,B.java,C.java,Main.java,My_error.java"/>
+        <compile options="-1.4" files="A.java,B.java,C.java,Main.java,My_error.java"/>
         <run class="Main"/>
     </ajc-test>
 
     <ajc-test dir="new/PR600" pr="600"
       title="AbstractMethodError for introduced methods (order 5)"
       keywords="from-resolved_10x">
-        <compile files="A.java,B.java,Main.java,C.java,My_error.java"/>
+        <compile options="-1.4" files="A.java,B.java,Main.java,C.java,My_error.java"/>
         <run class="Main"/>
     </ajc-test>
 
     <ajc-test dir="new" title="declare error and abstract pointcuts"
       keywords="from-resolved_10x">
-        <compile files="AbstractDeclare.java">
+        <compile options="-1.4" files="AbstractDeclare.java">
             <message kind="error" line="3"/>
             <message kind="error" line="4"/>
         </compile>
@@ -1368,14 +1368,14 @@
     <ajc-test dir="new/runtime"
       title="Exercise runtime classes (optionally in 1.1 VM)"
       keywords="from-resolved_10x">
-        <compile files="AllRuntime.java,TesterDriver.java"/>
+        <compile options="-1.4" files="AllRuntime.java,TesterDriver.java"/>
         <run class="TesterDriver"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="VerifyError after around advice falls off end of tryCatch"
       keywords="from-resolved_10x">
-        <compile files="TryOffEnd.java">
+        <compile options="-1.4" files="TryOffEnd.java">
             <message kind="warning" line="13"/>
             <message kind="warning" line="21"/>
         </compile>
@@ -1384,14 +1384,14 @@
 
     <ajc-test dir="new" pr="635" title="Named within pointcuts failing"
       keywords="from-resolved_10x">
-        <compile files="NamedWithinPointcuts.java"/>
+        <compile options="-1.4" files="NamedWithinPointcuts.java"/>
         <run class="NamedWithinPointcuts"/>
     </ajc-test>
 
     <ajc-test dir="new/subaspects" pr="647"
       title="aspect with private abstract pointcut" 
    keywords="from-resolved_10x,fail-unimplemented">
-        <compile files="PrivatePointcutCE.java">
+        <compile options="-1.4" files="PrivatePointcutCE.java">
             <message kind="error" line="5"/>
         </compile>
     </ajc-test>
@@ -1400,7 +1400,7 @@
       title="concrete aspect unable to access abstract package-private pointcut in parent for overriding"
       keywords="from-resolved_10x"
        comment="XXX getting error - confirm line numbers">
-        <compile files="parent/ParentCE.java,child/ChildCE.java">
+        <compile options="-1.4" files="parent/ParentCE.java,child/ChildCE.java">
             <message kind="error" file="child/ChildCE.java" line="32" text="pointcut 'parent.ParentCE.define()' is not visible"/>
             <message kind="error" file="child/ChildCE.java" line="21"/>
             <message kind="error" file="parent/ParentCE.java" line="10"/>
@@ -1420,42 +1420,42 @@
     <ajc-test dir="new/subaspects" pr="647"
       title="inner subaspects of an aspect with private pointcut"
       keywords="from-resolved_10x">
-        <compile files="parent/PrivatePointcut.java"/>
+        <compile options="-1.4" files="parent/PrivatePointcut.java"/>
         <run class="parent.PrivatePointcut"/>
     </ajc-test>
 
     <ajc-test dir="new/subaspects" pr="647"
       title="outer subaspects of an aspect with private pointcut"
       keywords="from-resolved_10x">
-        <compile files="parent/PrivatePointcutOuterClass.java"/>
+        <compile options="-1.4" files="parent/PrivatePointcutOuterClass.java"/>
         <run class="parent.PrivatePointcutOuterClass"/>
     </ajc-test>
 
     <ajc-test dir="new/subaspects" pr="647"
       title="abstract aspect used statically should not cause instantiation of advice or pointcut"
       keywords="from-resolved_10x">
-        <compile files="AbstractAspectUsedStatically.java"/>
+        <compile options="-1.4" files="AbstractAspectUsedStatically.java"/>
         <run class="AbstractAspectUsedStatically"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="private inner interface accessible in scope when declared on outer class"
       keywords="from-resolved_10x">
-        <compile files="DeclareAccess.java"/>
+        <compile options="-1.4" files="DeclareAccess.java"/>
         <run class="DeclareAccess"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="accessing protected superclass members in and outside CCC from body of method introduction"
       keywords="from-resolved_10x">
-        <compile files="SuperInIntroduction.java"/>
+        <compile options="-1.4" files="SuperInIntroduction.java"/>
         <run class="SuperInIntroduction"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="accessing private superclass members from body of method introduction"
       keywords="from-resolved_10x">
-        <compile files="SuperInIntroductionCE.java">
+        <compile options="-1.4" files="SuperInIntroductionCE.java">
             <message kind="error" line="25"/>
             <message kind="error" line="26"/>
         </compile>
@@ -1463,63 +1463,63 @@
 
     <ajc-test dir="new" title="simple test for around and casting"
       keywords="from-resolved_10x">
-        <compile files="AroundCasting.java"/>
+        <compile options="-1.4" files="AroundCasting.java"/>
         <run class="AroundCasting"/>
     </ajc-test>
 
     <ajc-test dir="new/aroundinner" pr="620"
       title="aroundInner 1 - around advice inner Thread subclass running proceed but not writing field"
       keywords="from-resolved_10x">
-        <compile files="ThreadNoField.java,Common.java"/>
+        <compile options="-1.4" files="ThreadNoField.java,Common.java"/>
         <run class="ThreadNoField"/>
     </ajc-test>
 
     <ajc-test dir="new/aroundinner" pr="620"
       title="aroundInner 2 - around advice inner Runnable running proceed and writing method-final proxy"
       keywords="from-resolved_10x">
-        <compile files="Proxy.java,Common.java"/>
+        <compile options="-1.4" files="Proxy.java,Common.java"/>
         <run class="Proxy"/>
     </ajc-test>
 
     <ajc-test dir="new/aroundinner" pr="620"
       title="aroundInner 3 - around advice inner class running proceed and writing field"
       keywords="from-resolved_10x">
-        <compile files="Minimal.java,Common.java"/>
+        <compile options="-1.4" files="Minimal.java,Common.java"/>
         <run class="Minimal"/>
     </ajc-test>
 
     <ajc-test dir="new/aroundinner" pr="620"
       title="aroundInner 4 - around advice inner Thread subclass running proceed and writing field"
       keywords="from-resolved_10x">
-        <compile files="ThreadSub.java,Common.java"/>
+        <compile options="-1.4" files="ThreadSub.java,Common.java"/>
         <run class="ThreadSub"/>
     </ajc-test>
 
     <ajc-test dir="new/aroundinner" pr="620"
       title="aroundInner 5 - around advice inner Runnable (subinterface) running proceed and writing field introduced on subinterface"
       keywords="from-resolved_10x">
-        <compile files="RunnableSub.java,Common.java"/>
+        <compile options="-1.4" files="RunnableSub.java,Common.java"/>
         <run class="RunnableSub"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="636"
       title="Named local class closing over proceed invocation"
       keywords="from-resolved_10x">
-        <compile files="LocalClassClosingOverProceed.java"/>
+        <compile options="-1.4" files="LocalClassClosingOverProceed.java"/>
         <run class="LocalClassClosingOverProceed"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="beautiful recursive computation of factorial with around is now supported"
       keywords="from-resolved_10x">
-        <compile files="CircularAdvice.java"/>
+        <compile options="-1.4" files="CircularAdvice.java"/>
         <run class="CircularAdvice"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="632"
       title="multi-dispatch not used for named pcd references"
       keywords="from-resolved_10x">
-        <compile files="MultiDispatchCf.java">
+        <compile options="-1.4" files="MultiDispatchCf.java">
             <message kind="error" line="54"/>
             <message kind="error" line="57"/>
             <message kind="error" line="60"/>
@@ -1530,14 +1530,14 @@
     <ajc-test dir="new" pr="632"
       title="multi-dispatch implemented through around + args"
       keywords="from-resolved_10x">
-        <compile files="MultiDispatchCp.java"/>
+        <compile options="-1.4" files="MultiDispatchCp.java"/>
         <run class="MultiDispatchCp"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="unrecognized aspect should not net Cloneable and Serializable warnings"
       keywords="from-resolved_10x">
-        <compile files="UnrecognizedAspectCE.java">
+        <compile options="-1.4" files="UnrecognizedAspectCE.java">
             <message kind="error" line="3"/>
         </compile>
     </ajc-test>
@@ -1545,27 +1545,27 @@
     <ajc-test dir="new"
       title="unreachable code generated by around advice on the execution of void methods"
       keywords="from-resolved_10x">
-        <compile files="AroundVoid.java"/>
+        <compile options="-1.4" files="AroundVoid.java"/>
         <run class="AroundVoid"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="654"
       title="Overriding method implementations using introduction on interfaces"
       keywords="from-resolved_10x,fail-unimplemented">
-        <compile files="IntroductionsOverriding.java" options="-Xlint:ignore" />
+        <compile files="IntroductionsOverriding.java" options="-Xlint:ignore -1.4" />
         <run class="IntroductionsOverriding"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="654"
       title="more coverage for around and concrete methods on interfaces"
       keywords="from-resolved_10x">
-        <compile files="MultiAndAround.java" options="-Xlint:ignore"/>
+        <compile files="MultiAndAround.java" options="-Xlint:ignore -1.4"/>
         <run class="MultiAndAround"/>
     </ajc-test>
 
     <ajc-test dir="new" title="invalid number and type of proceed arguments"
       keywords="from-resolved_10x">
-        <compile files="InvalidProceedArgsCE.java">
+        <compile options="-1.4" files="InvalidProceedArgsCE.java">
             <message kind="error" line="10"/>
             <message kind="error" line="15"/>
             <message kind="error" line="17"/>
@@ -1583,41 +1583,41 @@
 
     <ajc-test dir="new" pr="694" title="after returning advice order"
       keywords="from-resolved_10x">
-        <compile files="Cricket.java"/>
+        <compile options="-1.4" files="Cricket.java"/>
         <run class="Cricket"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="694" title="after returning advice param"
       keywords="from-resolved_10x">
-        <compile files="AfterReturningParam.java"/>
+        <compile options="-1.4" files="AfterReturningParam.java"/>
         <run class="AfterReturningParam"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="695"
       title="! and declaring types with callee-side call join points"
       keywords="from-resolved_10x">
-        <compile files="NotAndDeclaringTypes.java" options="-Xlint:ignore"/>
+        <compile files="NotAndDeclaringTypes.java" options="-Xlint:ignore -1.4"/>
         <run class="NotAndDeclaringTypes"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="479"
       title=". Binding the wrong arguments in withincode(..)."
       keywords="from-resolved_10x">
-        <compile files="BindingArgumentsInWithincode.java"/>
+        <compile options="-1.4" files="BindingArgumentsInWithincode.java"/>
         <run class="BindingArgumentsInWithincode"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="479"
       title=". Matching arguments in cflow correctly."
       keywords="from-resolved_10x">
-        <compile files="MatchingArgumentsInCflow.java"/>
+        <compile options="-1.4" files="MatchingArgumentsInCflow.java"/>
         <run class="MatchingArgumentsInCflow"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="480"
       title=". Binding variables with numbers in their name with pertarget(..)'s."
       keywords="from-resolved_10x">
-        <compile files="PerTargetAndVariablesWithNumbersInTheirNames.java"/>
+        <compile options="-1.4" files="PerTargetAndVariablesWithNumbersInTheirNames.java"/>
         <run class="PerTargetAndVariablesWithNumbersInTheirNames"/>
     </ajc-test>
 
@@ -1625,7 +1625,7 @@
     <ajc-test dir="new" pr="554"
       title="second arg in formal on shared joinpoint with pcd if() causes verify error ??"
       keywords="from-resolved_10rc3">
-        <compile files="PR554.java"/>
+        <compile options="-1.4" files="PR554.java"/>
         <run class="PR554"/>
     </ajc-test>
 
@@ -1640,35 +1640,35 @@
     <ajc-test dir="new" pr="555"
       title="inner classes of privileged aspects cannot see target class private members"
       keywords="from-resolved_10rc3">
-        <compile files="InnerClassInPrivilegedAspect.java"/>
+        <compile options="-1.4" files="InnerClassInPrivilegedAspect.java"/>
         <run class="InnerClassInPrivilegedAspect"/>
     </ajc-test>
 
     <ajc-test dir="new/packageAccessPR556" pr="556"
       title="aspects should get package access outside the file"
       keywords="from-resolved_10rc3">
-        <compile files="base1/p/C1.java,base2/p/C2.java" options="-Xlint:ignore"/>
+        <compile files="base1/p/C1.java,base2/p/C2.java" options="-Xlint:ignore -1.4"/>
         <run class="p.C1"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="559"
       title="subclass advice not run for join points selected by superclass cflow-based pointcuts"
       keywords="from-resolved_10rc3">
-        <compile files="PR559.java"/>
+        <compile options="-1.4" files="PR559.java"/>
         <run class="PR559"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="559"
       title="more issues with abstract aspects and cflow pointcuts"
       keywords="from-resolved_10rc3,fail-unimplemented">
-        <compile files="AbstractCflows.java"/>
+        <compile options="-1.4" files="AbstractCflows.java"/>
         <run class="AbstractCflows"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="560"
       title="compile fails for aspect derived from percflow base aspect unless pointcut excludes base aspect and subaspects"
       keywords="from-resolved_10rc3">
-        <compile files="PR560.java"/>
+        <compile options="-1.4" files="PR560.java"/>
         <run class="PR560"/>
     </ajc-test>
 
@@ -1676,62 +1676,62 @@
     <ajc-test dir="new" pr="573"
       title="pertarget stack overflow getting name of anonymous (Interface) class"
       keywords="from-resolved_10rc3">
-        <compile files="PR573.java"/>
+        <compile options="-1.4" files="PR573.java"/>
         <run class="PR573"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="573"
       title="pertarget stack overflow getting name of anonymous (Object) class"
       keywords="from-resolved_10rc3">
-        <compile files="PR573_1.java"/>
+        <compile options="-1.4" files="PR573_1.java"/>
         <run class="PR573_1"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="573"
       title="pertarget runtime stack overflow (getting name of anonymous (Object) class?)"
       keywords="from-resolved_10rc3">
-        <compile files="PR573_2.java"/>
+        <compile options="-1.4" files="PR573_2.java"/>
         <run class="PR573_2"/>
     </ajc-test>
 
      <ajc-test dir="new" pr="685"
       title="subaspect method declaration on superaspect inner interface (names)"
       keywords="from-resolved_104">
-        <compile files="InnerInterfaceNames.java"/>
+        <compile options="-1.4" files="InnerInterfaceNames.java"/>
         <run class="InnerInterfaceNames"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="685"
       title="subaspect method declaration on superaspect inner interface (access)"
       keywords="from-resolved_104">
-        <compile files="InnerInterfaceAccess.java"/>
+        <compile options="-1.4" files="InnerInterfaceAccess.java"/>
         <run class="InnerInterfaceAccess"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="685"
       title="subaspect method declaration on superaspect inner interface (types)"
       keywords="from-resolved_104">
-        <compile files="InnerInterfaceTypes.java,InnerInterfaceTypesHelper.java"/>
+        <compile options="-1.4" files="InnerInterfaceTypes.java,InnerInterfaceTypesHelper.java"/>
         <run class="InnerInterfaceTypes"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="691" title="around AST type XXX"
       keywords="from-resolved_104">
-        <compile files="PR691.java"/>
+        <compile options="-1.4" files="PR691.java"/>
         <run class="PR691"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="687"
       title="around all execution with double assignment in initializer (simple)"
       keywords="from-resolved_104">
-        <compile files="AroundDoubleAssignment.java"/>
+        <compile options="-1.4" files="AroundDoubleAssignment.java"/>
         <run class="AroundDoubleAssignment"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="687"
       title="around all execution with double assignment in initializer (coverage)"
       keywords="from-resolved_104">
-        <compile files="AroundDoubleAssignmentC.java"/>
+        <compile options="-1.4" files="AroundDoubleAssignmentC.java"/>
         <run class="AroundDoubleAssignmentC"/>
     </ajc-test>
 
@@ -1753,35 +1753,35 @@
     <ajc-test dir="new/PR569" pr="569"
       title="anon class written to wrong directory" 
    keywords="from-resolved_104,from-resolved_104">
-        <compile files="a/IntroAnon.java,a/MyInterface.java,b/Dest.java"/>
+        <compile options="-1.4" files="a/IntroAnon.java,a/MyInterface.java,b/Dest.java"/>
         <run class="a.IntroAnon"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="603"
       title="unqualified transitive pointcut references not resolved"
       keywords="from-resolved_104">
-        <compile files="PointcutQualification.java"/>
+        <compile options="-1.4" files="PointcutQualification.java"/>
         <run class="PointcutQualification"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="603"
       title="unqualified transitive pointcut references not resolved - 2"
       keywords="from-resolved_104">
-        <compile files="PointcutQualification2.java"/>
+        <compile options="-1.4" files="PointcutQualification2.java"/>
         <run class="PointcutQualification2"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="619"
       title="direct use outside aspect of defined abstract pointcut"
       keywords="from-resolved_104">
-        <compile files="AbstractPointcutAccess.java"/>
+        <compile options="-1.4" files="AbstractPointcutAccess.java"/>
         <run class="AbstractPointcutAccess"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="619"
       title="direct use outside aspect of undefined abstract pointcut"
       keywords="from-resolved_104">
-        <compile files="AbstractPointcutAccessCE.java">
+        <compile options="-1.4" files="AbstractPointcutAccessCE.java">
             <message kind="error" line="9"/>
         </compile>
     </ajc-test>
@@ -1789,7 +1789,7 @@
     <ajc-test dir="new" pr="619"
       title="indirect use outside aspect of undefined abstract pointcut"
       keywords="from-resolved_104">
-        <compile files="AbstractPointcutIndirectCE.java">
+        <compile options="-1.4" files="AbstractPointcutIndirectCE.java">
             <message kind="error" line="9"/>
             <message kind="error" line="5"/>
         </compile>
@@ -1798,59 +1798,59 @@
     <ajc-test dir="new" pr="658"
       title="simple call join point tests for JoinPoint SourceLocation context"
       keywords="from-resolved_104">
-        <compile files="SourceLocationCall.java"/>
+        <compile options="-1.4" files="SourceLocationCall.java"/>
         <run class="SourceLocationCall"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="661"
       title="!target with second advice on casted call"
       keywords="from-resolved_104">
-        <compile files="CallNotTarget.java"/>
+        <compile options="-1.4" files="CallNotTarget.java"/>
         <run class="CallNotTarget"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="666" title="name binding in around cflow"
       keywords="from-resolved_104">
-        <compile files="AroundCall.java"/>
+        <compile options="-1.4" files="AroundCall.java"/>
         <run class="AroundCall"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="660" title="name binding in around cflow - 2"
       keywords="from-resolved_104">
-        <compile files="ArgsInCflow2.java"/>
+        <compile options="-1.4" files="ArgsInCflow2.java"/>
         <run class="ArgsInCflow2"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="677"
       title="around name-binding in cflows using factorial"
       keywords="from-resolved_104">
-        <compile files="FactorialCflow.java"/>
+        <compile options="-1.4" files="FactorialCflow.java"/>
         <run class="FactorialCflow"/>
     </ajc-test>
 
      <ajc-test dir="new" title="replacing this or target in around advice"
       keywords="from-resolved_104">
-        <compile files="TargetObjectReplacement.java"/>
+        <compile options="-1.4" files="TargetObjectReplacement.java"/>
         <run class="TargetObjectReplacement"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="after returning from initialization and after executing constructor"
       keywords="from-resolved_104">
-        <compile files="ConstructorExecInit.java"/>
+        <compile options="-1.4" files="ConstructorExecInit.java"/>
         <run class="ConstructorExecInit"/>
     </ajc-test>
     
     <ajc-test dir="new"
       title="after returning from initialization causes ExceptionInInitializer in aspect">
-        <compile files="ConstructorExecInitFails.java"/>
+        <compile options="-1.4" files="ConstructorExecInitFails.java"/>
         <run class="ConstructorExecInitFails"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="659"
       title="name binding in before cflow containing cflowbelow"
       keywords="from-resolved_104">
-        <compile files="ArgsInCflow.java" options="!eclipse">
+        <compile files="ArgsInCflow.java" options="!eclipse -1.4">
             <message kind="error" line="29"/>
             <message kind="error" line="32"/>
         </compile>
@@ -1859,14 +1859,14 @@
 
      <ajc-test dir="new/pr728" pr="728" title="file order in type searching"
       keywords="from-resolved_105">
-        <compile files="AnotherClass.java,Interface.java"/>
+        <compile options="-1.4" files="AnotherClass.java,Interface.java"/>
         <run class="AnotherClass"/>
     </ajc-test>
 
  
     <ajc-test dir="new" title="simple declare warning (NPE)"
       keywords="from-resolved_105">
-        <compile files="DeclareWarningMain.java">
+        <compile options="-1.4" files="DeclareWarningMain.java">
             <message kind="warning" line="4"/>
         </compile>
         <run class="DeclareWarningMain"/>
@@ -1875,7 +1875,7 @@
     <ajc-test dir="new" pr="755"
       title="ajc dies on cflow into field init anon class see knownbugs.txt"
       keywords="from-resolved_105">
-        <compile files="CflowOfFieldInitAnonMethods.java" options="!eclipse">
+        <compile files="CflowOfFieldInitAnonMethods.java" options="!eclipse -1.4">
         </compile>
         <run class="CflowOfFieldInitAnonMethods" options="!eclipse"/>
     </ajc-test>
@@ -1883,40 +1883,40 @@
  
     <ajc-test dir="new" pr="757" title="Incrementing interface-introduced field"
       keywords="from-resolved_105">
-        <compile files="IntroducedFieldInc.java"/>
+        <compile options="-1.4" files="IntroducedFieldInc.java"/>
         <run class="IntroducedFieldInc"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="The dynamic type, not the static one, should be used in if pcds"
       keywords="from-resolved_105">
-        <compile files="StaticTypeInIf.java"/>
+        <compile options="-1.4" files="StaticTypeInIf.java"/>
         <run class="StaticTypeInIf"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="bad interaction with after returning, around and void methods (from Rich Price)"
       keywords="from-resolved_105">
-        <compile files="AfterReturningResult.java"/>
+        <compile options="-1.4" files="AfterReturningResult.java"/>
         <run class="AfterReturningResult"/>
     </ajc-test>
 
     <ajc-test dir="new"
       title="type pattern matching for inner classes (from Ken Horn)"
       keywords="from-resolved_105">
-        <compile files="TypePat.java"/>
+        <compile options="-1.4" files="TypePat.java"/>
         <run class="test.TypePat"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="771" title="static initializer member name"
       keywords="from-resolved_105">
-        <compile files="StaticInitName.java"/>
+        <compile options="-1.4" files="StaticInitName.java"/>
         <run class="StaticInitName"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="770" title="cflow pcd syntax error"
       keywords="from-resolved_105">
-        <compile files="IllegalCflowCE.java">
+        <compile options="-1.4" files="IllegalCflowCE.java">
             <message kind="error" line="4"/>
         </compile>
     </ajc-test>
@@ -1924,28 +1924,28 @@
     <ajc-test dir="new" pr="764"
       title="binding args with indeterminate prefix and suffix"
       keywords="from-resolved_105">
-        <compile files="IndeterminateArgs.java"/>
+        <compile options="-1.4" files="IndeterminateArgs.java"/>
         <run class="IndeterminateArgs"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="764"
       title="check arg types with indeterminate prefix and suffix"
       keywords="from-resolved_105">
-        <compile files="IndeterminateArgType.java"/>
+        <compile options="-1.4" files="IndeterminateArgType.java"/>
         <run class="IndeterminateArgType"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="764"
       title="testing and binding args with single indeterminate prefix and suffix"
       keywords="from-resolved_105">
-        <compile files="IndeterminateArg.java"/>
+        <compile options="-1.4" files="IndeterminateArg.java"/>
         <run class="IndeterminateArg"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="764"
       title="binding handler args with indeterminate prefix and suffix"
       keywords="from-resolved_105">
-        <compile files="IndeterminateHandlerArg.java"/>
+        <compile options="-1.4" files="IndeterminateHandlerArg.java"/>
         <run class="IndeterminateHandlerArg"/>
     </ajc-test>
 
@@ -1954,20 +1954,20 @@
 	  title="Compiling java.lang.Object with ajc yields non-verifying bytecode"
 	  keywords="from-resolved_105"
 	   comment="XXX weak/bad test">
-	    <compile files="java/lang/Object.java,java/lang/String.java">
+	    <compile options="-1.4" files="java/lang/Object.java,java/lang/String.java">
 	    </compile>
 	</ajc-test>
 
     <ajc-test dir="new"
       title="method-local class defined in around return statement"
       keywords="from-resolved_105">
-        <compile files="MethodLocalAroundReturns.java"/>
+        <compile options="-1.4" files="MethodLocalAroundReturns.java"/>
         <run class="MethodLocalAroundReturns"/>
     </ajc-test>
 
     <ajc-test dir="new" title="CE expected for assignment to arg in if pcd"
       keywords="from-resolved_105">
-        <compile files="IfPCDAssignmentCE.java">
+        <compile options="-1.4" files="IfPCDAssignmentCE.java">
             <message kind="error" line="16"/>
             <message kind="error" line="20"/>
         </compile>
@@ -1975,27 +1975,27 @@
 
     <ajc-test dir="new" title="advising field get/sets when accessing via super"
       keywords="from-resolved_105">
-        <compile files="SuperField.java"/>
+        <compile options="-1.4" files="SuperField.java"/>
         <run class="SuperField"/>
     </ajc-test>
 
     <ajc-test dir="new" title="accessing private members in outer types"
       keywords="from-resolved_105">
-        <compile files="FieldInnerAccess.java"/>
+        <compile options="-1.4" files="FieldInnerAccess.java"/>
         <run class="FieldInnerAccess"/>
     </ajc-test>
 
     <ajc-test dir="new" pr="29934"
       title="can't apply around advice to the execution of around advice"
       keywords="from-resolved_10x">
-        <compile files="CflowCycles.java"/>
+        <compile options="-1.4" files="CflowCycles.java"/>
         <run class="CflowCycles"/>
     </ajc-test>
     
     <ajc-test dir="new"
       title="incompatible advice throws clause are a compile-time error"
       keywords="from-resolved_10x">
-        <compile files="AdviceThrowsCf.java">
+        <compile options="-1.4" files="AdviceThrowsCf.java">
             <message kind="error" line="13"/>
             <message kind="error" line="28"/>
             <message kind="error" line="47"/>
diff --git a/tests/src/org/aspectj/systemtest/ajc11/ajc11-tests.xml b/tests/src/org/aspectj/systemtest/ajc11/ajc11-tests.xml
index e16c31ab1..02b422bb8 100644
--- a/tests/src/org/aspectj/systemtest/ajc11/ajc11-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc11/ajc11-tests.xml
@@ -204,7 +204,7 @@
     </ajc-test>
     
     <ajc-test dir="bugs" pr="28702" title="percflow code hangs compiler">
-        <compile files="CloseConnectionsCflow.java">
+        <compile files="CloseConnectionsCflow.java" options="-1.4">
         </compile>
     </ajc-test>
 
@@ -535,7 +535,7 @@
     <ajc-test dir="new" pr="36778"
       title="can't put around advice on interface static initializer"
       comment="this tests for a nice message given a compiler limitation">
-        <compile files="EmptyInterfaceCE.java">
+        <compile files="EmptyInterfaceCE.java" options="-1.4">
         	<message kind="error" line="20"/>
         	<message kind="error" line="23"/>
         </compile>
@@ -543,7 +543,7 @@
     
     <ajc-test dir="bugs" pr="36803"
       title="cflow concretization causing assertion failure">
-        <compile files="CflowConcrete.java"/>
+        <compile files="CflowConcrete.java" options="-1.4"/>
         <run class="CflowConcrete"/>
     </ajc-test>
 
@@ -810,7 +810,7 @@
 	
     <ajc-test dir="bugs" pr="42652"
    	 title="perthis and signature bad interaction">
-        <compile files="InterPerCall.java"/>
+        <compile files="InterPerCall.java" options="-1.4"/>
         <run class="InterPerCall"/>
     </ajc-test>
     
diff --git a/tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml b/tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml
index 80c234fda..4b51a98dd 100644
--- a/tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml
@@ -75,7 +75,7 @@
 
    <ajc-test dir="bugs/faultingInSource" pr="46671"
       title="Ensure we don't look for source on the classpath when binary not found">
-        <compile files="SimpleTracing.java" classpath="." options="-verbose">
+        <compile files="SimpleTracing.java" classpath="." options="-verbose -1.4">
 		  <message kind="warning" line="4" text="no match for this type name: SampleClass"/>
         </compile>
     </ajc-test>   
@@ -244,31 +244,31 @@
 
     <ajc-test dir="new" pr="42668"
    	 title="after returning with parameter: matching rules">
-        <compile files="AfterReturningParamMatching.java" />
+        <compile files="AfterReturningParamMatching.java" options="-1.4"/>
         <run class="AfterReturningParamMatching"/>
     </ajc-test>
     
     <ajc-test dir="bugs/binaryCompat" pr="50641"
       title="binary compatibility of advice method names - expect no error">
-        <compile files="Main.java,TraceV1.aj"/>
+        <compile files="Main.java,TraceV1.aj" options="-1.4"/>
         <run class="Main"/>
-        <compile files="TraceV2.aj"/>
+        <compile files="TraceV2.aj" options="-1.4"/>
         <run class="Main"/>
     </ajc-test>
    
     <ajc-test dir="bugs/binaryCompat" pr="50641"
       title="binary compatibility of advice method names - expect error">
-        <compile files="Main.java,TraceV1.aj"/>
+        <compile files="Main.java,TraceV1.aj" options="-1.4"/>
         <run class="Main"/>
-        <compile files="TraceRE.aj"/>
+        <compile files="TraceRE.aj" options="-1.4"/>
         <run class="Main"/>
     </ajc-test>
     
      <ajc-test dir="bugs/binaryCompat" pr="50641"
       title="binary compatibility of advice method names - expect no error">
-        <compile files="Main.java,TraceWithInnerV1.aj"/>
+        <compile files="Main.java,TraceWithInnerV1.aj" options="-1.4"/>
         <run class="Main"/>
-        <compile files="TraceWithInnerV2.aj"/>
+        <compile files="TraceWithInnerV2.aj" options="-1.4"/>
         <run class="Main"/>
     </ajc-test>
     
@@ -383,7 +383,7 @@
 
       <ajc-test dir="bugs" pr="44272"
     		title="retitle warning to circular {advice} dependency at ...">
-        <compile files="CircularAdvicePrecedence.java">
+        <compile files="CircularAdvicePrecedence.java" options="-1.4">
             <message kind="error" line="4"/> 
             <message kind="error" line="5"/> 
             <message kind="error" line="6"/> 
@@ -459,7 +459,7 @@
  
  	<ajc-test dir="bugs" 
 		pr="60936" title="error message for constructor-execution pcd">
-        <compile files="InterfaceConstructor.java">
+        <compile files="InterfaceConstructor.java" options="-1.4">
           <message kind="warning" line="10" text="no interface constructor-execution join point"/>
         </compile>
     </ajc-test>
diff --git a/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml b/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
index 0c408a0e9..1d65dc3e1 100644
--- a/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
@@ -74,13 +74,13 @@
    
       <ajc-test dir="new"
       title="if(false) optimisation" pr="48990">
-        <compile files="IfFalse.aj"/>
+        <compile files="IfFalse.aj" options="-1.4"/>
         <run class="IfFalse"/>
     </ajc-test>
    
     <ajc-test dir="new"
       title="if(true) optimisation" pr="48990">
-        <compile files="IfTrue.aj"/>
+        <compile files="IfTrue.aj" options="-1.4"/>
         <run class="IfTrue"/>
     </ajc-test> 
     
@@ -464,7 +464,7 @@
     </ajc-test>
 	
 	<ajc-test dir="cflow" pr="76030" title="Optimization of cflow - shared counters (2)">
-        <compile files="CounterTest02.java"/>
+        <compile files="CounterTest02.java" options="-1.4"/>
 		<run class="CounterTest02"/>
     </ajc-test>
 	
@@ -474,7 +474,7 @@
     </ajc-test>
 	
 	<ajc-test dir="cflow" pr="76030" title="Optimization of cflow - counters (4)">
-        <compile files="CounterTest04.java"/>
+        <compile files="CounterTest04.java" options="-1.4"/>
 		<run class="CounterTest04"/>
     </ajc-test>
 	
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index d0da94ec9..9eda00b0c 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -214,7 +214,7 @@
     </ajc-test>
 
     <ajc-test dir="bugs150/pr120521" pr="120521" title="named pointcut not resolved in pertarget pointcut">
-     <compile files="PerTargetSubaspectError.java"/>
+     <compile files="PerTargetSubaspectError.java" options="-1.4"/>
     </ajc-test>  
 
     <ajc-test dir="bugs150/pr119210" pr="119210" title="autoboxing around advice - 1">
@@ -236,7 +236,7 @@
     </ajc-test> 
    
     <ajc-test dir="bugs150/pr119210" pr="119210" title="autoboxing around advice - 3">
-     <compile files="TestLib2.java,ThreadAspectLib2.java">
+     <compile files="TestLib2.java,ThreadAspectLib2.java" options="-1.4">
        <message kind="error" line="16" text="incompatible return type applying to method-call(java.lang.Integer TestLib2.getFive())"/>
        <message kind="error" line="4" text="incompatible return type applying to method-call(java.lang.Integer TestLib2.getFive())"/>
      </compile>
@@ -315,7 +315,7 @@
     
     <ajc-test dir="bugs150/pr120474" pr="120474" title="Dollar classes">
      <compile files="$ProxyPr120474.java"/>
-     <compile files="X.aj" options="-outxml"/>
+     <compile files="X.aj" options="-outxml -1.4"/>
      <run class="$ProxyPr120474" ltw="aop.xml">
         <stdout>
         </stdout>
@@ -445,7 +445,7 @@
 	</ajc-test>
 	
 	<ajc-test dir="bugs150" pr="103157" title="returning(Object) binding">
-		<compile files="Pr103157.aj"/>
+		<compile files="Pr103157.aj" options="-1.4"/>
 		<run class="Pr103157">
 			<stdout>
 				<line text="returning from staticinit"/>
@@ -473,8 +473,8 @@
 	</ajc-test>
 	    
     <ajc-test dir="bugs150/pr114436" title="ClassFormatError binary weaving perthis">
-     <compile files="SimpleTrace.aj,ConcreteSimpleTracing.aj" outjar="aspects.jar"/>
-     <compile files="TestClass.java" aspectpath="aspects.jar"/>
+     <compile files="SimpleTrace.aj,ConcreteSimpleTracing.aj" outjar="aspects.jar" options="-1.4"/>
+     <compile files="TestClass.java" aspectpath="aspects.jar" options="-1.4"/>
      <run class="TestClass"/>
     </ajc-test>
     
@@ -1038,7 +1038,7 @@
     </ajc-test>
         
     <ajc-test dir="bugs" pr="61568" title="Various kinds of ambiguous bindings">
-        <compile files="AmbiguousBindings.aj">
+        <compile files="AmbiguousBindings.aj" options="-1.4">
             <message line="17" text="ambiguous binding of parameter(s) foo across '||' in pointcut"></message>
             <message line="19" text="ambiguous binding of parameter(s) foo across '||' in pointcut"></message>
             <message line="21" text="ambiguous binding of parameter(s) foo across '||' in pointcut"></message>
@@ -1355,7 +1355,7 @@
     </ajc-test>
     
     <ajc-test dir="bugs150/pr106554" pr="106554" title="Problem in staticinitialization with pertypewithin aspect">
-        <compile files="A.aj" options="-showWeaveInfo">
+        <compile files="A.aj" options="-showWeaveInfo -1.4">
           <message kind="weave" text="Join point 'staticinitialization(void A.&lt;clinit&gt;())' in Type 'A' (A.aj:1) advised by before advice from 'StopsInit' (A.aj:21)"/>
         </compile>
         <run class="A">
@@ -2546,7 +2546,7 @@
    </ajc-test> 
 
     <ajc-test dir="java5/pertypewithin" title="ptw binary">
-       <weave classesFiles="G.java" aspectsFiles="H.java"/>
+       <weave classesFiles="G.java" aspectsFiles="H.java" options="-1.4"/>
        <run class="G">
            <stderr>
                <line text="advice running"/>
@@ -2555,7 +2555,7 @@
    </ajc-test> 
    
    <ajc-test dir="java5/pertypewithin" title="ptw binary aspect">
-       <compile files="H.java" outjar="aspects.jar">
+       <compile files="H.java" outjar="aspects.jar" options="-1.4">
            <message kind="warning" line="1" text="no match for this type name: G"/>
        </compile>
        <compile files="G.java" aspectpath="aspects.jar"/>
@@ -6261,7 +6261,7 @@
    
    <ajc-test dir="bugs150/pr119657" title="IllegalAccessError with around advice on interface method call not self using LTW">
      <compile files="services/account/StockQuoteServiceTest.java, services/accountdata/StockAccount.java, services/stockquote/StockQuoteService.java, services/stockquote/StockQuoteServiceImpl.java, services/account/AccountReport.java"/>
-     <compile files="accounts/recovery/RecoveryNotSelf.aj"/>
+     <compile files="accounts/recovery/RecoveryNotSelf.aj" options="-1.4"/>
      <run class="services.account.StockQuoteServiceTest" ltw="aop-notself.xml">
        <stdout>
            <line text="RecoveryNotSelf.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
@@ -6292,7 +6292,7 @@
    
    <ajc-test dir="bugs150/pr121385" title="override protected pointcut in aop.xml concrete aspect">
      <compile files="Hello.java"/>
-     <compile files="World.aj, ConcreteWorld.aj"/>
+     <compile files="World.aj, ConcreteWorld.aj" options="-1.4"/>
      <run class="Hello" ltw="aop.xml">
        <stdout>
            <line text="around start!"/>
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml b/tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml
index e9617dba0..0dcdbf142 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml
@@ -1,704 +1,670 @@
 
 <!-- Load-time weaving tests -->
-	<ajc-test dir="ltw"
-      title="Ensure 1st aspect is rewoven when weaving 2nd aspect"
-      keywords="reweavable">
-        <compile
-        	files="Main.java, Aspect1.aj"
-			outjar="main1.jar"
-            options="-showWeaveInfo -verbose"
-        >
-        	<message kind="weave" text="method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)"/>
-        </compile>	
-        <compile
-        	classpath="main1.jar"
-        	files="Aspect2.aj"
-        	outjar="aspect2.jar"
-            options="-showWeaveInfo -verbose"
-        >
-        </compile>	
-        <run class="Main" ltw="aop-ltwreweavable.xml">
-        	<stdout>
-                <line text="Main.main"/>
-                <line text="Main.test1"/>
-                <line text="Main.test2"/>
-            </stdout>
-        	<stderr>
-	  	    	<line text="weaveinfo Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)"/>
-				<line text="weaveinfo Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)"/>
-                <line text="Aspect1.before_test1"/>
-                <line text="Aspect2.before_test2"/>
-            </stderr>
-        </run>
-    </ajc-test>
-
-	<ajc-test dir="ltw"
-      title="Ensure valid aop.xml file is generated"
-      keywords="-outxml">
-        <compile
-        	files="Main.java"
-			outjar="main.jar"
-        >
-        </compile>	
-        <compile
-        	classpath="main.jar"
-        	files="Aspect1.aj, Aspect2.aj, pakkage/Aspect3.aj"
-        	outxmlfile="META-INF/aop.xml"
-        >
-        </compile>	
-        <run class="Main" ltw="">
-        	<stdout>
-                <line text="Main.main"/>
-                <line text="Main.test1"/>
-                <line text="Main.test2"/>
-            </stdout>
-        	<stderr>
-                <line text="Aspect1.before_test1"/>
-                <line text="Aspect2.before_test2"/>
-                <line text="pakkage.Aspect3.before_test2"/>
-            </stderr>
-        </run>
-    </ajc-test>
-
-	<ajc-test dir="ltw"
-      title="Ensure valid aop.xml is generated for -outjar"
-      keywords="-outxml">
-        <compile
-        	files="Main.java"
-			outjar="main.jar"
-        >
-        </compile>	
-        <compile
-        	classpath="main.jar"
-        	files="Aspect1.aj, Aspect2.aj, pakkage/Aspect3.aj"
-        	outjar="aspects.jar"
-        	options="-outxml"
-        >
-        </compile>	
-        <run class="Main" ltw="">
-        	<stdout>
-                <line text="Main.main"/>
-                <line text="Main.test1"/>
-                <line text="Main.test2"/>
-            </stdout>
-        	<stderr>
-                <line text="Aspect1.before_test1"/>
-                <line text="Aspect2.before_test2"/>
-                <line text="pakkage.Aspect3.before_test2"/>
-            </stderr>
-        </run>
-    </ajc-test>
-
-	<ajc-test dir="ltw"
-      title="Ensure no weaving without visible aop.xml"
-      keywords="reweavable">
-        <compile
-        	files="TestMain.java, Main.java"
-        >
-        </compile>	
-        <run class="TestMain" ltw="">
-        	<stdout>
-                <line text="Main.main"/>
-                <line text="Main.test1"/>
-                <line text="Main.test2"/>
-            </stdout>
-        	<stderr>
-				<line text="info AspectJ Weaver Version"/>
-				<line text="info register classloader org.aspectj.weaver.loadtime.WeavingURLClassLoader"/>
-				<line text="info no configuration found. Disabling weaver for class loader org.aspectj.weaver.loadtime.WeavingURLClassLoader"/>
-            </stderr>
-        </run>
-    </ajc-test>
-    
-    <!-- type discarding tests, investigating call munging -->
-    
-    <ajc-test dir="ltw/callMunging" title="discarding woven types - 1">
-      <compile files="A.java,B.java,T.java,Main.java" outjar="classes.jar"/>
-      <compile files="X.java" outjar="aspects.jar" classpath="classes.jar" options="-Xlint:ignore"/>
-      <run class="Main" ltw="aop.xml">
-        <stdout>
-          <line text="into:main"/>
-          <line text="A.method() running"/>
-          <line text="advice running"/>
-          <line text="T.m1() running"/>
-          <line text="B.method() running"/>
-          <line text="advice running"/>
-          <line text="T.m2() running"/>
-          <line text="leave:main"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="ltw/callMunging/case1" title="aggressive ltw - decp">
-      <compile files="A.java,T.java,Main.java" outjar="classes.jar"/>
-      <compile files="X.java" outjar="aspects.jar" classpath="classes.jar" options="-Xlint:ignore"/>
-      <run class="Main" ltw="aop.xml">
-        <stdout>
-          <line text="into:main"/>
-          <line text="A.method() running"/>
-          <line text="advice running"/>
-          <line text="T.m1() running"/>
-          <line text="leave:main"/>
-        </stdout>
-      </run>
-    </ajc-test>  
-    
-    <ajc-test dir="ltw/callMunging/case1" title="aggressive ltw - decp - deactivate">
-      <compile files="A.java,T.java,Main.java" outjar="classes.jar"/>
-      <compile files="X.java" outjar="aspects.jar" classpath="classes.jar" options="-Xlint:ignore"/>
-      <run class="Main" ltw="aop2.xml">
-        <stdout>
-          <line text="into:main"/>
-          <line text="A.method() running"/>
-          <line text="T.m1() running"/>
-          <line text="leave:main"/>
-        </stdout>
-      </run>
-    </ajc-test>  
-      
-    <ajc-test dir="ltw/callMunging/case1" title="aggressive ltw - hierarchy">
-      <compile files="T.java,HierMain.java" outjar="classes.jar"/>
-      <compile files="A.java" outjar="sub.hiddenjar" classpath="classes.jar"/>
-      <compile files="X.java" outjar="aspects.jar" classpath="classes.jar" options="-Xlint:ignore"/>
-      <run class="HierMain" ltw="aop.xml">
-        <stdout>
-          <line text="into:main"/>
-          <line text="A.method() running"/>
-          <line text="advice running"/>
-          <line text="T.m1() running"/>
-          <line text="leave:main"/>
-        </stdout>
-      </run>
-    </ajc-test>  
-    
-    <ajc-test dir="ltw/callMunging/case3" title="aggressive ltw - decp - 2">
-      <compile files="A.java,T.java,S.java,Main.java" outjar="classes.jar"/>
-      <compile files="X.java" outjar="aspects.jar" classpath="classes.jar" options="-Xlint:ignore"/>
-      <run class="Main" ltw="aop.xml">
-        <stdout>
-          <line text="into:main"/>
-          <line text="A.method() running"/>
-          <line text="advice running"/>
-          <line text="T.m1() running"/>
-          <line text="leave:main"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="ltw/callMunging/case2" title="aggressive ltw - deca">
-      <compile files="A.java,T.java,Main.java,MarkerAnnotation.java" outjar="classes.jar" options="-1.5"/>
-      <compile files="X.java" outjar="aspects.jar" classpath="classes.jar" options="-1.5 -Xlint:ignore"/>
-      <run class="Main" ltw="aop.xml">
-        <stdout>
-          <line text="into:main"/>
-          <line text="A.method() running"/>
-          <line text="advice running"/>
-          <line text="T.m1() running"/>
-          <line text="leave:main"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    
+<ajc-test dir="ltw"
+	title="Ensure 1st aspect is rewoven when weaving 2nd aspect"
+	keywords="reweavable">
+	<compile files="Main.java, Aspect1.aj" outjar="main1.jar"
+		options="-showWeaveInfo -verbose -1.4">
+		<message kind="weave"
+			text="method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
+	</compile>
+	<compile classpath="main1.jar" files="Aspect2.aj"
+		outjar="aspect2.jar" options="-showWeaveInfo -verbose -1.4">
+	</compile>
+	<run class="Main" ltw="aop-ltwreweavable.xml">
+		<stdout>
+			<line text="Main.main" />
+			<line text="Main.test1" />
+			<line text="Main.test2" />
+		</stdout>
+		<stderr>
+			<line
+				text="weaveinfo Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
+			<line
+				text="weaveinfo Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
+			<line text="Aspect1.before_test1" />
+			<line text="Aspect2.before_test2" />
+		</stderr>
+	</run>
+</ajc-test>
 
-    <!-- end of discarding type tests -->
-
-	<ajc-test dir="ltw"
-      title="Define concrete sub-aspect using aop.xml"
-      keywords="aop.xml">
-        <compile
-        	files="Main.java"
-			outjar="main.jar"
-        >
-        </compile>	
-<!-- was in next section        	classpath="main1.jar" -->
-        <compile
-        	files="AbstractSuperAspect.aj"
-        	outjar="aspect.jar"
-        >
-        </compile>	
-        <run class="Main" ltw="aop-defineaspect.xml">
-        	<stdout>
-                <line text="Main.main"/>
-                <line text="Main.test1"/>
-                <line text="Main.test2"/>
-            </stdout>
-        	<stderr>
-                <line text="info AspectJ Weaver Version"/>
-                <line text="info register classloader"/>
-                <line text="info using"/>
-                <line text="info define aspect ConcreteAspect"/>
-                <line text="debug weaving 'ConcreteAspect'"/>
-                <line text="debug generating class 'ConcreteAspect'"/>
-                <line text="debug weaving 'Main'"/>
-                <line text="AbstractSuperAspect.before_test1"/>
-            </stderr>
-        </run>
-    </ajc-test>
-
-	<ajc-test dir="ltw"
-      title="Use abstract aspect for ITD using aop.xml"
-      keywords="abstract aspect, ITD">
-        <compile
-        	files="TestITDMethod.java"
-        >
-        </compile>	
-        <compile
-        	files="AbstractAspect.aj"
-        >
-        	<message kind="warning" text="this affected type is not exposed to the weaver: TestITDMethod"/>
-        </compile>	
-        <run class="TestITDMethod" options="test" ltw="aop-abstractaspect.xml">
-        	<stdout>
-                <line text="TestITDMethod.main"/>
-            </stdout>
-        	<stderr>
-        		<line text="weaveinfo Type 'TestITDMethod' (TestITDMethod.java) has intertyped method from 'AbstractAspect' (AbstractAspect.aj:'void TestITDMethod.test()')"/>
-                <line text="AbstractAspect_TestITDMethod.test"/>
-            </stderr>
-        </run>
-    </ajc-test>
-
-	<ajc-test dir="ltw"
-      title="Ensure a subset of inherited aspects is used for weaving"
-      keywords="aspects, include">
-        <compile
-        	files="Main.java"
-			outjar="main.jar"
-        >
-        </compile>	
-        <compile
-        	classpath="main.jar"
-        	files="Aspect1.aj, Aspect2.aj, pakkage/Aspect3.aj"
-        	outjar="aspects.jar"
-        	options="-outxml"
-        >
-        </compile>	
-        <run class="Main" ltw="aop-aspectsinclude.xml">
-        	<stdout>
-                <line text="Main.main"/>
-                <line text="Main.test1"/>
-                <line text="Main.test2"/>
-            </stdout>
-        	<stderr>
-                <line text="pakkage.Aspect3.before_test2"/>
-            </stderr>
-        </run>
-    </ajc-test>
-
-	<ajc-test dir="ltw"
-      title="Ensure weaver lint warning issued when an aspect is not used for weaving"
-      keywords="aspects, include, lint">
-        <compile
-        	files="Main.java"
-			outjar="main.jar"
-        >
-        </compile>	
-        <compile
-        	classpath="main.jar"
-        	files="Aspect1.aj, Aspect2.aj, pakkage/Aspect3.aj"
-        	outjar="aspects.jar"
-        	options="-outxml"
-        >
-        </compile>	
-        <run class="Main" ltw="aop-aspectsincludewithlintwarning.xml">
-        	<stdout>
-                <line text="Main.main"/>
-                <line text="Main.test1"/>
-                <line text="Main.test2"/>
-            </stdout>
-        	<stderr ordered="no">
-				<line text="warning aspect Aspect1 exluded for class loader org.aspectj.weaver.loadtime.WeavingURLClassLoader [Xlint:aspectExcludedByConfiguration]"/>
-				<line text="warning aspect Aspect2 exluded for class loader org.aspectj.weaver.loadtime.WeavingURLClassLoader [Xlint:aspectExcludedByConfiguration]"/>
-                <line text="pakkage.Aspect3.before_test2"/>
-            </stderr>
-        </run>
-    </ajc-test>
-    
-	<ajc-test dir="ltw"
-      title="Empty Xlint.properties file"
-      keywords="xlint, ltw">
-        <compile
-        	files="Main.java"
-        >
-        </compile>	
-        <run class="Main" ltw="aop-xlintfile.xml" xlintfile="Xlint-empty.properties">
-        	<stderr>
-        	</stderr>
-        </run>
-    </ajc-test>
-    
-	<ajc-test dir="ltw"
-      title="Set Xset properties enabled"
-      keywords="xSet, ltw">
-        <compile
-        	files="Main.java,Aspect1.aj"
-        >
-        </compile>	
-        <run class="Main" ltw="aop-xset-verbose.xml" xlintfile="Xlint-empty.properties">
-        </run>
-    </ajc-test>
-
-	<ajc-test dir="ltw"
-      title="Set Xset properties disabled"
-      keywords="xSet, ltw">
-        <compile
-        	files="Main.java,Aspect1.aj"
-        >
-        </compile>	
-        <run class="Main" ltw="aop-xset-verbose.xml" xlintfile="Xlint-empty.properties">
-        </run>
-    </ajc-test>
-    
-	<ajc-test dir="ltw"
-      title="Warning with missing Xlint.properties file"
-      keywords="xlint, ltw">
-        <compile
-        	files="Main.java"
-        >
-        </compile>	
-        <run class="Main" ltw="aop-xlintfile.xml">
-        	<stderr>
-        		<line text="warning Cannot access resource for -Xlintfile:Xlint-empty.properties"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    
-	<ajc-test dir="ltw/hier" title="separate compilation with ltw: declare parents and call" keywords="ltw">
-        <compile files="util/A.aj,util/T.aj"/>
-        <compile files="child/Executor.aj,child/Advisor.aj,top/SimpleMain.aj">
-        	<message kind="warning" text="this affected type is not exposed to the weaver: util.A"/>
-		</compile>        
-        <run class="top.SimpleMain" ltw="aop-single.xml">
-        	<stdout>
-                <line text="T call"/>
-        	</stdout>
-        	<stderr>
-				<line text="weaveinfo Join point 'method-call(void util.A.foo())' in Type 'child.Executor' (Executor.aj:18) advised by before advice from 'child.Advisor' (Advisor.aj:20)"/>
-        	    <line text="weaveinfo Extending interface set for type 'util.A' (A.aj) to include 'util.T' (Advisor.aj)"/>
-        	    <line text="weaveinfo Extending interface set for type 'child.Advisor' (Advisor.aj) to include 'util.T' (Advisor.aj)"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    
-	<ajc-test dir="ltw"
-      title="Warning when advice doesn't match suppressed for LTW"
-      keywords="xlint, ltw">
-        <compile
-        	files="Main.java"
-        >
-        </compile>	
-        <compile
-        	files="Aspect3.aj"
-        >
-        </compile>	
-        <run class="Main" ltw="aop-nomatch.xml">
-        	<stderr>
-                <line text="info AspectJ Weaver Version"/>
-                <line text="info register classloader"/>
-                <line text="info using"/>
-	        	<line text="info register aspect Aspect3"/>
-	        	<line text="debug weaving 'Main'"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    
-	<ajc-test dir="ltw"
-      title="Override suppressing of warning when advice doesn't match using -Xlintfile"
-      keywords="xlint, ltw">
-        <compile
-        	files="Main.java"
-        >
-        </compile>	
-        <compile
-        	files="Aspect3.aj"
-        >
-        </compile>	
-        <run class="Main" ltw="aop-nomatchxlintfile.xml" xlintfile="Xlint-nomatch.properties">
-        	<stderr>
-                <line text="info AspectJ Weaver Version"/>
-                <line text="info register classloader"/>
-                <line text="info using"/>
-	        	<line text="info register aspect Aspect3"/>
-        		<line text="can not build thisJoinPoint lazily for this advice"/>
-	        	<line text="debug weaving 'Main'"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    
-	<ajc-test dir="ltw"
-      title="Warning when advice doesn't match using -Xlint:default"
-      keywords="xlint, ltw">
-        <compile
-        	files="Main.java"
-        >
-        </compile>	
-        <compile
-        	files="Aspect3.aj"
-        >
-        </compile>	
-        <run class="Main" ltw="aop-nomatchxlint.xml">
-        	<stderr>
-                <line text="info AspectJ Weaver Version"/>
-                <line text="info register classloader"/>
-                <line text="info using"/>
-	        	<line text="info register aspect Aspect3"/>
-        		<line text="can not build thisJoinPoint lazily for this advice"/>
-	        	<line text="debug weaving 'Main'"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    
-	<ajc-test dir="ltw"
-      title="Override suppressing of warning when advice doesn't match using -Xlint:warning"
-      keywords="xlint, ltw">
-        <compile
-        	files="Main.java"
-        >
-        </compile>	
-        <compile
-        	files="Aspect3.aj"
-        >
-        </compile>	
-        <run class="Main" ltw="aop-nomatchxlint.xml">
-        	<stderr>
-                <line text="info AspectJ Weaver Version"/>
-                <line text="info register classloader"/>
-                <line text="info using"/>
-	        	<line text="info register aspect Aspect3"/>
-        		<line text="can not build thisJoinPoint lazily for this advice"/>
-	        	<line text="debug weaving 'Main'"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-
-	<!-- based on "Ensure 1st aspect is rewoven when weaving 2nd aspect" -->
-	<ajc-test dir="ltw"
-      title="Nonstandard jar file extensions" pr="137235">
-        <compile
-        	files="folder.jar/Main.java, folder.jar/Aspect1.aj"
-			outjar="folder.jar/main1.zip"
-            options="-showWeaveInfo"
-        >
-        	<message kind="weave" text="method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)"/>
-        </compile>	
-        <compile
-        	classpath="$sandbox/folder.jar/main1.zip"
-        	files="Aspect2.aj"
-        	outjar="aspect2Jar"
-            options="-showWeaveInfo"
-        >
-        </compile>	
-        <run class="Main" ltw="aop-ltwreweavable.xml" classpath="$sandbox/folder.jar/main1.zip,$sandbox/aspect2Jar">
-        	<stdout>
-                <line text="Main.main"/>
-                <line text="Main.test1"/>
-                <line text="Main.test2"/>
-            </stdout>
-        	<stderr>
-	  	    	<line text="weaveinfo Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)"/>
-				<line text="weaveinfo Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)"/>
-                <line text="Aspect1.before_test1"/>
-                <line text="Aspect2.before_test2"/>
-            </stderr>
-        </run>
-    </ajc-test>
-
-	<ajc-test dir="ltw"
-      title="Odd zip on classpath" pr="137235">
-        <compile
-        	files="folder.jar/Main.java, folder.jar/Aspect1.aj"
-			outjar="folder.jar/main1.archive"
-            options="-showWeaveInfo"
-        >
-        	<message kind="weave" text="method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)"/>
-        </compile>	
-        <compile
-        	classpath="$sandbox/folder.jar/main1.archive"
-        	files="Aspect2.aj"
-        	outjar="aspect2Jar"
-            options="-showWeaveInfo"
-        >
-        </compile>	
-        <run class="Main" ltw="aop-ltwreweavable.xml" classpath="$sandbox/folder.jar/main1.archive,$sandbox/aspect2Jar">
-        	<stdout>
-                <line text="Main.main"/>
-                <line text="Main.test1"/>
-                <line text="Main.test2"/>
-            </stdout>
-        	<stderr>
-	  	    	<line text="weaveinfo Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)"/>
-				<line text="weaveinfo Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)"/>
-                <line text="Aspect1.before_test1"/>
-                <line text="Aspect2.before_test2"/>
-            </stderr>
-        </run>
-    </ajc-test>
-
-	<ajc-test dir="ltw" title="JDK14 LTW with XML" keywords="ltw">
-        <compile files="HelloWorldWithException.java" options="-outjar hello.jar"/>
-        <compile files="ExceptionHandler.aj" options="-outxml -outjar handler.jar"/>
-		<ant file="ant.xml" target="JDK14 LTW with XML" verbose="true">
-        	<stdout>
-            	<line text="Hello World!"/>
-        	</stdout>
-        	<stderr>
-            	<line text="TraceFactory.instance="/>
-        	</stderr>
-        </ant>
-    </ajc-test>
-    
-	<ajc-test dir="ltw" title="JDK14 LTW with ASPECTPATH" keywords="ltw">
-        <compile files="HelloWorldWithException.java" options="-outjar hello.jar"/>
-        <compile files="ExceptionHandler.aj" options="-outjar handler.jar"/>
-        <ant file="ant.xml" target="JDK14 LTW with ASPECTPATH" verbose="true">
-        	<stdout>
-            	<line text="Hello World!"/>
-        	</stdout>
-        	<stderr>
-            	<line text="TraceFactory.instance="/>
-        	</stderr>
-        </ant>
-    </ajc-test>
-    
-	<ajc-test dir="ltw" title="TestServer with HelloWorld" keywords="ltw,server">
-        <compile files="HelloWorldWithException.java" options="-outjar hello.jar"/>
-        <compile files="ExceptionHandler.aj" options="-outxml -outjar handler.jar"/>
-        <ant file="ant-server.xml" target="TestServer with HelloWorld" verbose="true">
-        	<stdout>
-            	<line text="Starting ..."/>
-            	<line text="Running HelloWorld"/>
-            	<line text="Hello World!"/>
-            	<line text="Stopping ..."/>
-        	</stdout>
-        </ant>
-    </ajc-test>
-<!--    
-	<ajc-test dir="ltw" title="TestServer with Parent and Child" keywords="ltw,server">
-        <compile files="Parent.java" options="-outjar parent.jar"/>
-        <compile files="Child.java" options="-classpath parent.jar -outjar child.jar"/>
-        <ant file="ant-server.xml" target="TestServer with Parent and Child" verbose="true">
-        	<stdout>
-            	<line text="Starting ..."/>
-            	<line text="Running Child"/>
-            	<line text="Parent"/>
-            	<line text="Child"/>
-            	<line text="Stopping ..."/>
-        	</stdout>
-        </ant>
-    </ajc-test>
--->    
-	<ajc-test dir="ltw" title="TestServer with Parent and Child" keywords="ltw,server">
-        <compile files="HelloWorldWithException.java" options="-outjar child.jar"/>
-        <compile files="ExceptionHandler.aj" options="-outxml -outjar parent.jar"/>
-        <ant file="ant-server.xml" target="TestServer with Parent and Child" verbose="true">
-        	<stdout>
-            	<line text="Starting ..."/>
-            	<line text="Running HelloWorld"/>
-            	<line text="Hello World!"/>
-            	<line text="Stopping ..."/>
-        	</stdout>
-        </ant>
-    </ajc-test>
-
-	<ajc-test dir="ltw" title="override default path using -Dorg.aspectj.weaver.loadtime.configuration" keywords="ltw">
-        <compile files="HelloWorldWithException.java" options="-outjar hello.jar"/>
-        <compile files="ExceptionHandler.aj" options="-outxml -outjar handler.jar"/>
-        <compile files="Tracing.aj" options="-outxml -outjar tracing.jar"/>
-		<ant file="ant.xml" target="override default path using -Dorg.aspectj.weaver.loadtime.configuration" verbose="true">
-        	<stdout>
-            	<line text="Hello World!"/>
-        	</stdout>
-        </ant>
-    </ajc-test>
-      
-	<ajc-test dir="ltw/inclExcl" title="Inclusion and patterns" keywords="ltw">
-        <compile
-        	files="pkg/sub/Foo.aj, pkg/Main.aj"
-        	options="-outjar base.jar"
-        />
-        <compile
-        	files="tracing/Tracer.aj"
-        />
-        <run class="pkg.Main" ltw="aop-include.xml">
-            <stderr>
-                <line text="execution(void pkg.Main.foo())"/>
-                <line text="Main.class"/>
-            </stderr>
-        </run>
-    </ajc-test>
-	<ajc-test dir="ltw/inclExcl" title="Exclusion and patterns" keywords="ltw">
-        <compile
-        	files="pkg/sub/Foo.aj, pkg/Main.aj"
-        	options="-outjar base.jar"
-        />
-        <compile
-        	files="tracing/Tracer.aj"
-        />
-        <run class="pkg.Main" ltw="aop-exclude.xml">
-            <stderr>
-                <line text="execution(void pkg.sub.Foo.foo())"/>
-            </stderr>
-        </run>
-    </ajc-test>    
-	<ajc-test dir="ltw/inclExcl" title="And patterns aspects" keywords="ltw">
-        <compile
-        	files="pkg/sub/Foo.aj, pkg/Main.aj"
-        	options="-outjar base.jar"
-        />
-        <compile
-        	files="tracing/Tracer.aj, tracing/staticinit/Tracer.aj, tracing/staticinit/sub/Tracer.aj"
-        />
-        <run class="pkg.Main" ltw="aop-aspectinclexcl.xml">
-            <stderr>
-                <line text="staticinitialization(pkg.Main.&lt;clinit&gt;)"/>
-                <line text="staticinitialization(pkg.sub.Foo.&lt;clinit&gt;)"/>
-            </stderr>
-        </run>
-    </ajc-test>       
-
-	<ajc-test dir="ltw" title="simple LTW" keywords="ltw">
-        <compile files="HelloWorldWithException.java"/>
-        <compile files="ExceptionHandler.aj" options="-outxml"/>
-		<ant file="ant.xml" target="simple LTW" verbose="true">
-        	<stdout>
-            	<line text="Hello World!"/>
-        	</stdout>
-        </ant>
-    </ajc-test>
-
-	<ajc-test dir="ltw" title="dump on error" keywords="ltw">
-        <compile files="HelloWorldWithException.java"/>
-        <compile files="ExceptionHandler.aj" options="-outxml"/>
-		<ant file="ant.xml" target="dump on error" verbose="true">
-        	<stdout>
-            	<line text="Hello World!"/>
-        	</stdout>
-        </ant>
-    </ajc-test>
-
-	<ajc-test dir="bugs153/pr155033" title="multiple dump on error" keywords="ltw">
-        <compile files="Annotation.java" options="-1.5"/>
-        <compile files="MultipleDumpTest.java, Class1.java, Class2.java, Class3.java" options="-1.5"/>
-        <compile files="Aspect.aj" options="-1.5 -outxml -Xlint:ignore"/>
-<!--        
-        <run class="MultipleDumpTest" ltw="aop-multipledumponerror.xml">
-        	<stdout>
-            	<line text="? AbortingMessageHandler.AbortingMessageHandler()"/>
-        	</stdout>
-        </run>
--->        
-		<ant file="ant.xml" target="multiple dump on error" verbose="true">
-        	<stdout>
-            	<line text="? MultipleDumpTest.main()"/>
-            	<line text="? Class1.main()"/>
-            	<line text="? Aspect.before()"/>
-            	<line text="? Class2.main()"/>
-            	<line text="? Aspect.before()"/>
-            	<line text="? Class3.main()"/>
-            	<line text="? Aspect.before()"/>
-        	</stdout>
-        </ant>
-    </ajc-test>
+<ajc-test dir="ltw"
+	title="Ensure valid aop.xml file is generated" keywords="-outxml">
+	<compile files="Main.java" outjar="main.jar">
+	</compile>
+	<compile classpath="main.jar"
+		files="Aspect1.aj, Aspect2.aj, pakkage/Aspect3.aj"
+		outxmlfile="META-INF/aop.xml" options="-1.4">
+	</compile>
+	<run class="Main" ltw="">
+		<stdout>
+			<line text="Main.main" />
+			<line text="Main.test1" />
+			<line text="Main.test2" />
+		</stdout>
+		<stderr>
+			<line text="Aspect1.before_test1" />
+			<line text="Aspect2.before_test2" />
+			<line text="pakkage.Aspect3.before_test2" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="Ensure valid aop.xml is generated for -outjar"
+	keywords="-outxml">
+	<compile files="Main.java" outjar="main.jar">
+	</compile>
+	<compile classpath="main.jar"
+		files="Aspect1.aj, Aspect2.aj, pakkage/Aspect3.aj"
+		outjar="aspects.jar" options="-1.4 -outxml">
+	</compile>
+	<run class="Main" ltw="">
+		<stdout>
+			<line text="Main.main" />
+			<line text="Main.test1" />
+			<line text="Main.test2" />
+		</stdout>
+		<stderr>
+			<line text="Aspect1.before_test1" />
+			<line text="Aspect2.before_test2" />
+			<line text="pakkage.Aspect3.before_test2" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="Ensure no weaving without visible aop.xml" keywords="reweavable">
+	<compile files="TestMain.java, Main.java">
+	</compile>
+	<run class="TestMain" ltw="">
+		<stdout>
+			<line text="Main.main" />
+			<line text="Main.test1" />
+			<line text="Main.test2" />
+		</stdout>
+		<stderr>
+			<line text="info AspectJ Weaver Version" />
+			<line
+				text="info register classloader org.aspectj.weaver.loadtime.WeavingURLClassLoader" />
+			<line
+				text="info no configuration found. Disabling weaver for class loader org.aspectj.weaver.loadtime.WeavingURLClassLoader" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<!-- type discarding tests, investigating call munging -->
+
+<ajc-test dir="ltw/callMunging"
+	title="discarding woven types - 1">
+	<compile files="A.java,B.java,T.java,Main.java"
+		outjar="classes.jar" />
+	<compile files="X.java" outjar="aspects.jar"
+		classpath="classes.jar" options="-Xlint:ignore" />
+	<run class="Main" ltw="aop.xml">
+		<stdout>
+			<line text="into:main" />
+			<line text="A.method() running" />
+			<line text="advice running" />
+			<line text="T.m1() running" />
+			<line text="B.method() running" />
+			<line text="advice running" />
+			<line text="T.m2() running" />
+			<line text="leave:main" />
+		</stdout>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw/callMunging/case1"
+	title="aggressive ltw - decp">
+	<compile files="A.java,T.java,Main.java" outjar="classes.jar" />
+	<compile files="X.java" outjar="aspects.jar"
+		classpath="classes.jar" options="-Xlint:ignore" />
+	<run class="Main" ltw="aop.xml">
+		<stdout>
+			<line text="into:main" />
+			<line text="A.method() running" />
+			<line text="advice running" />
+			<line text="T.m1() running" />
+			<line text="leave:main" />
+		</stdout>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw/callMunging/case1"
+	title="aggressive ltw - decp - deactivate">
+	<compile files="A.java,T.java,Main.java" outjar="classes.jar" />
+	<compile files="X.java" outjar="aspects.jar"
+		classpath="classes.jar" options="-Xlint:ignore" />
+	<run class="Main" ltw="aop2.xml">
+		<stdout>
+			<line text="into:main" />
+			<line text="A.method() running" />
+			<line text="T.m1() running" />
+			<line text="leave:main" />
+		</stdout>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw/callMunging/case1"
+	title="aggressive ltw - hierarchy">
+	<compile files="T.java,HierMain.java" outjar="classes.jar" />
+	<compile files="A.java" outjar="sub.hiddenjar"
+		classpath="classes.jar" />
+	<compile files="X.java" outjar="aspects.jar"
+		classpath="classes.jar" options="-Xlint:ignore" />
+	<run class="HierMain" ltw="aop.xml">
+		<stdout>
+			<line text="into:main" />
+			<line text="A.method() running" />
+			<line text="advice running" />
+			<line text="T.m1() running" />
+			<line text="leave:main" />
+		</stdout>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw/callMunging/case3"
+	title="aggressive ltw - decp - 2">
+	<compile files="A.java,T.java,S.java,Main.java"
+		outjar="classes.jar" />
+	<compile files="X.java" outjar="aspects.jar"
+		classpath="classes.jar" options="-Xlint:ignore" />
+	<run class="Main" ltw="aop.xml">
+		<stdout>
+			<line text="into:main" />
+			<line text="A.method() running" />
+			<line text="advice running" />
+			<line text="T.m1() running" />
+			<line text="leave:main" />
+		</stdout>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw/callMunging/case2"
+	title="aggressive ltw - deca">
+	<compile files="A.java,T.java,Main.java,MarkerAnnotation.java"
+		outjar="classes.jar" options="-1.5" />
+	<compile files="X.java" outjar="aspects.jar"
+		classpath="classes.jar" options="-1.5 -Xlint:ignore" />
+	<run class="Main" ltw="aop.xml">
+		<stdout>
+			<line text="into:main" />
+			<line text="A.method() running" />
+			<line text="advice running" />
+			<line text="T.m1() running" />
+			<line text="leave:main" />
+		</stdout>
+	</run>
+</ajc-test>
+
+
+
+<!-- end of discarding type tests -->
+
+<ajc-test dir="ltw"
+	title="Define concrete sub-aspect using aop.xml" keywords="aop.xml">
+	<compile files="Main.java" outjar="main.jar">
+	</compile>
+	<!-- was in next section classpath="main1.jar" -->
+	<compile files="AbstractSuperAspect.aj" outjar="aspect.jar"
+		options="-1.4">
+	</compile>
+	<run class="Main" ltw="aop-defineaspect.xml">
+		<stdout>
+			<line text="Main.main" />
+			<line text="Main.test1" />
+			<line text="Main.test2" />
+		</stdout>
+		<stderr>
+			<line text="info AspectJ Weaver Version" />
+			<line text="info register classloader" />
+			<line text="info using" />
+			<line text="info define aspect ConcreteAspect" />
+			<line text="debug weaving 'ConcreteAspect'" />
+			<line text="debug generating class 'ConcreteAspect'" />
+			<line text="debug weaving 'Main'" />
+			<line text="AbstractSuperAspect.before_test1" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="Use abstract aspect for ITD using aop.xml"
+	keywords="abstract aspect, ITD">
+	<compile files="TestITDMethod.java">
+	</compile>
+	<compile files="AbstractAspect.aj" options="-1.4">
+		<message kind="warning"
+			text="this affected type is not exposed to the weaver: TestITDMethod" />
+	</compile>
+	<run class="TestITDMethod" options="test"
+		ltw="aop-abstractaspect.xml">
+		<stdout>
+			<line text="TestITDMethod.main" />
+		</stdout>
+		<stderr>
+			<line
+				text="weaveinfo Type 'TestITDMethod' (TestITDMethod.java) has intertyped method from 'AbstractAspect' (AbstractAspect.aj:'void TestITDMethod.test()')" />
+			<line text="AbstractAspect_TestITDMethod.test" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="Ensure a subset of inherited aspects is used for weaving"
+	keywords="aspects, include">
+	<compile files="Main.java" outjar="main.jar">
+	</compile>
+	<compile classpath="main.jar"
+		files="Aspect1.aj, Aspect2.aj, pakkage/Aspect3.aj"
+		outjar="aspects.jar" options="-outxml -1.4">
+	</compile>
+	<run class="Main" ltw="aop-aspectsinclude.xml">
+		<stdout>
+			<line text="Main.main" />
+			<line text="Main.test1" />
+			<line text="Main.test2" />
+		</stdout>
+		<stderr>
+			<line text="pakkage.Aspect3.before_test2" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="Ensure weaver lint warning issued when an aspect is not used for weaving"
+	keywords="aspects, include, lint">
+	<compile files="Main.java" outjar="main.jar">
+	</compile>
+	<compile classpath="main.jar"
+		files="Aspect1.aj, Aspect2.aj, pakkage/Aspect3.aj"
+		outjar="aspects.jar" options="-outxml -1.4">
+	</compile>
+	<run class="Main" ltw="aop-aspectsincludewithlintwarning.xml">
+		<stdout>
+			<line text="Main.main" />
+			<line text="Main.test1" />
+			<line text="Main.test2" />
+		</stdout>
+		<stderr ordered="no">
+			<line
+				text="warning aspect Aspect1 exluded for class loader org.aspectj.weaver.loadtime.WeavingURLClassLoader [Xlint:aspectExcludedByConfiguration]" />
+			<line
+				text="warning aspect Aspect2 exluded for class loader org.aspectj.weaver.loadtime.WeavingURLClassLoader [Xlint:aspectExcludedByConfiguration]" />
+			<line text="pakkage.Aspect3.before_test2" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw" title="Empty Xlint.properties file"
+	keywords="xlint, ltw">
+	<compile files="Main.java">
+	</compile>
+	<run class="Main" ltw="aop-xlintfile.xml"
+		xlintfile="Xlint-empty.properties">
+		<stderr>
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw" title="Set Xset properties enabled"
+	keywords="xSet, ltw">
+	<compile files="Main.java,Aspect1.aj">
+	</compile>
+	<run class="Main" ltw="aop-xset-verbose.xml"
+		xlintfile="Xlint-empty.properties">
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw" title="Set Xset properties disabled"
+	keywords="xSet, ltw">
+	<compile files="Main.java,Aspect1.aj">
+	</compile>
+	<run class="Main" ltw="aop-xset-verbose.xml"
+		xlintfile="Xlint-empty.properties">
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="Warning with missing Xlint.properties file"
+	keywords="xlint, ltw">
+	<compile files="Main.java">
+	</compile>
+	<run class="Main" ltw="aop-xlintfile.xml">
+		<stderr>
+			<line
+				text="warning Cannot access resource for -Xlintfile:Xlint-empty.properties" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw/hier"
+	title="separate compilation with ltw: declare parents and call"
+	keywords="ltw">
+	<compile files="util/A.aj,util/T.aj" />
+	<compile
+		files="child/Executor.aj,child/Advisor.aj,top/SimpleMain.aj"
+		options="-1.4">
+		<message kind="warning"
+			text="this affected type is not exposed to the weaver: util.A" />
+	</compile>
+	<run class="top.SimpleMain" ltw="aop-single.xml">
+		<stdout>
+			<line text="T call" />
+		</stdout>
+		<stderr>
+			<line
+				text="weaveinfo Join point 'method-call(void util.A.foo())' in Type 'child.Executor' (Executor.aj:18) advised by before advice from 'child.Advisor' (Advisor.aj:20)" />
+			<line
+				text="weaveinfo Extending interface set for type 'util.A' (A.aj) to include 'util.T' (Advisor.aj)" />
+			<line
+				text="weaveinfo Extending interface set for type 'child.Advisor' (Advisor.aj) to include 'util.T' (Advisor.aj)" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="Warning when advice doesn't match suppressed for LTW"
+	keywords="xlint, ltw">
+	<compile files="Main.java">
+	</compile>
+	<compile files="Aspect3.aj" options="-1.4">
+	</compile>
+	<run class="Main" ltw="aop-nomatch.xml">
+		<stderr>
+			<line text="info AspectJ Weaver Version" />
+			<line text="info register classloader" />
+			<line text="info using" />
+			<line text="info register aspect Aspect3" />
+			<line text="debug weaving 'Main'" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="Override suppressing of warning when advice doesn't match using -Xlintfile"
+	keywords="xlint, ltw">
+	<compile files="Main.java">
+	</compile>
+	<compile files="Aspect3.aj" options="-1.4">
+	</compile>
+	<run class="Main" ltw="aop-nomatchxlintfile.xml"
+		xlintfile="Xlint-nomatch.properties">
+		<stderr>
+			<line text="info AspectJ Weaver Version" />
+			<line text="info register classloader" />
+			<line text="info using" />
+			<line text="info register aspect Aspect3" />
+			<line text="can not build thisJoinPoint lazily for this advice" />
+			<line text="debug weaving 'Main'" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="Warning when advice doesn't match using -Xlint:default"
+	keywords="xlint, ltw">
+	<compile files="Main.java">
+	</compile>
+	<compile files="Aspect3.aj" options="-1.4">
+	</compile>
+	<run class="Main" ltw="aop-nomatchxlint.xml">
+		<stderr>
+			<line text="info AspectJ Weaver Version" />
+			<line text="info register classloader" />
+			<line text="info using" />
+			<line text="info register aspect Aspect3" />
+			<line text="can not build thisJoinPoint lazily for this advice" />
+			<line text="debug weaving 'Main'" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="Override suppressing of warning when advice doesn't match using -Xlint:warning"
+	keywords="xlint, ltw">
+	<compile files="Main.java">
+	</compile>
+	<compile files="Aspect3.aj" options="-1.4">
+	</compile>
+	<run class="Main" ltw="aop-nomatchxlint.xml">
+		<stderr>
+			<line text="info AspectJ Weaver Version" />
+			<line text="info register classloader" />
+			<line text="info using" />
+			<line text="info register aspect Aspect3" />
+			<line text="can not build thisJoinPoint lazily for this advice" />
+			<line text="debug weaving 'Main'" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<!-- based on "Ensure 1st aspect is rewoven when weaving 2nd aspect" -->
+<ajc-test dir="ltw" title="Nonstandard jar file extensions"
+	pr="137235">
+	<compile files="folder.jar/Main.java, folder.jar/Aspect1.aj"
+		outjar="folder.jar/main1.zip" options="-showWeaveInfo -1.4">
+		<message kind="weave"
+			text="method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
+	</compile>
+	<compile classpath="$sandbox/folder.jar/main1.zip"
+		files="Aspect2.aj" outjar="aspect2Jar" options="-showWeaveInfo -1.4">
+	</compile>
+	<run class="Main" ltw="aop-ltwreweavable.xml"
+		classpath="$sandbox/folder.jar/main1.zip,$sandbox/aspect2Jar">
+		<stdout>
+			<line text="Main.main" />
+			<line text="Main.test1" />
+			<line text="Main.test2" />
+		</stdout>
+		<stderr>
+			<line
+				text="weaveinfo Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
+			<line
+				text="weaveinfo Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
+			<line text="Aspect1.before_test1" />
+			<line text="Aspect2.before_test2" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw" title="Odd zip on classpath" pr="137235">
+	<compile files="folder.jar/Main.java, folder.jar/Aspect1.aj"
+		outjar="folder.jar/main1.archive" options="-showWeaveInfo">
+		<message kind="weave"
+			text="method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
+	</compile>
+	<compile classpath="$sandbox/folder.jar/main1.archive"
+		files="Aspect2.aj" outjar="aspect2Jar" options="-showWeaveInfo -1.4">
+	</compile>
+	<run class="Main" ltw="aop-ltwreweavable.xml"
+		classpath="$sandbox/folder.jar/main1.archive,$sandbox/aspect2Jar">
+		<stdout>
+			<line text="Main.main" />
+			<line text="Main.test1" />
+			<line text="Main.test2" />
+		</stdout>
+		<stderr>
+			<line
+				text="weaveinfo Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
+			<line
+				text="weaveinfo Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
+			<line text="Aspect1.before_test1" />
+			<line text="Aspect2.before_test2" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw" title="JDK14 LTW with XML" keywords="ltw">
+	<compile files="HelloWorldWithException.java"
+		options="-outjar hello.jar" />
+	<compile files="ExceptionHandler.aj"
+		options="-outxml -outjar handler.jar -1.4" />
+	<ant file="ant.xml" target="JDK14 LTW with XML" verbose="true">
+		<stdout>
+			<line text="Hello World!" />
+		</stdout>
+		<stderr>
+			<line text="TraceFactory.instance=" />
+		</stderr>
+	</ant>
+</ajc-test>
+
+<ajc-test dir="ltw" title="JDK14 LTW with ASPECTPATH"
+	keywords="ltw">
+	<compile files="HelloWorldWithException.java"
+		options="-outjar hello.jar" />
+	<compile files="ExceptionHandler.aj"
+		options="-outjar handler.jar" />
+	<ant file="ant.xml" target="JDK14 LTW with ASPECTPATH"
+		verbose="true">
+		<stdout>
+			<line text="Hello World!" />
+		</stdout>
+		<stderr>
+			<line text="TraceFactory.instance=" />
+		</stderr>
+	</ant>
+</ajc-test>
+
+<ajc-test dir="ltw" title="TestServer with HelloWorld"
+	keywords="ltw,server">
+	<compile files="HelloWorldWithException.java"
+		options="-outjar hello.jar" />
+	<compile files="ExceptionHandler.aj"
+		options="-outxml -outjar handler.jar -1.4" />
+	<ant file="ant-server.xml" target="TestServer with HelloWorld"
+		verbose="true">
+		<stdout>
+			<line text="Starting ..." />
+			<line text="Running HelloWorld" />
+			<line text="Hello World!" />
+			<line text="Stopping ..." />
+		</stdout>
+	</ant>
+</ajc-test>
+<!-- <ajc-test dir="ltw" title="TestServer with Parent and Child" keywords="ltw,server"> 
+	<compile files="Parent.java" options="-outjar parent.jar"/> <compile files="Child.java" 
+	options="-classpath parent.jar -outjar child.jar"/> <ant file="ant-server.xml" 
+	target="TestServer with Parent and Child" verbose="true"> <stdout> <line 
+	text="Starting ..."/> <line text="Running Child"/> <line text="Parent"/> 
+	<line text="Child"/> <line text="Stopping ..."/> </stdout> </ant> </ajc-test> -->
+<ajc-test dir="ltw" title="TestServer with Parent and Child"
+	keywords="ltw,server">
+	<compile files="HelloWorldWithException.java"
+		options="-outjar child.jar" />
+	<compile files="ExceptionHandler.aj"
+		options="-outxml -outjar parent.jar -1.4" />
+	<ant file="ant-server.xml"
+		target="TestServer with Parent and Child" verbose="true">
+		<stdout>
+			<line text="Starting ..." />
+			<line text="Running HelloWorld" />
+			<line text="Hello World!" />
+			<line text="Stopping ..." />
+		</stdout>
+	</ant>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="override default path using -Dorg.aspectj.weaver.loadtime.configuration"
+	keywords="ltw">
+	<compile files="HelloWorldWithException.java"
+		options="-outjar hello.jar" />
+	<compile files="ExceptionHandler.aj"
+		options="-outxml -outjar handler.jar -1.4" />
+	<compile files="Tracing.aj"
+		options="-outxml -outjar tracing.jar -1.4" />
+	<ant file="ant.xml"
+		target="override default path using -Dorg.aspectj.weaver.loadtime.configuration"
+		verbose="true">
+		<stdout>
+			<line text="Hello World!" />
+		</stdout>
+	</ant>
+</ajc-test>
+
+<ajc-test dir="ltw/inclExcl" title="Inclusion and patterns"
+	keywords="ltw">
+	<compile files="pkg/sub/Foo.aj, pkg/Main.aj"
+		options="-outjar base.jar" />
+	<compile files="tracing/Tracer.aj" options="-1.4" />
+	<run class="pkg.Main" ltw="aop-include.xml">
+		<stderr>
+			<line text="execution(void pkg.Main.foo())" />
+			<line text="Main.class" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw/inclExcl" title="Exclusion and patterns"
+	keywords="ltw">
+	<compile files="pkg/sub/Foo.aj, pkg/Main.aj"
+		options="-outjar base.jar" />
+	<compile files="tracing/Tracer.aj" options="-1.4" />
+	<run class="pkg.Main" ltw="aop-exclude.xml">
+		<stderr>
+			<line text="execution(void pkg.sub.Foo.foo())" />
+		</stderr>
+	</run>
+</ajc-test>
+<ajc-test dir="ltw/inclExcl" title="And patterns aspects"
+	keywords="ltw">
+	<compile files="pkg/sub/Foo.aj, pkg/Main.aj"
+		options="-outjar base.jar" />
+	<compile
+		files="tracing/Tracer.aj, tracing/staticinit/Tracer.aj, tracing/staticinit/sub/Tracer.aj"
+		options="-1.4" />
+	<run class="pkg.Main" ltw="aop-aspectinclexcl.xml">
+		<stderr>
+			<line text="staticinitialization(pkg.Main.&lt;clinit&gt;)" />
+			<line text="staticinitialization(pkg.sub.Foo.&lt;clinit&gt;)" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw" title="simple LTW" keywords="ltw">
+	<compile files="HelloWorldWithException.java" />
+	<compile files="ExceptionHandler.aj" options="-outxml -1.4" />
+	<ant file="ant.xml" target="simple LTW" verbose="true">
+		<stdout>
+			<line text="Hello World!" />
+		</stdout>
+	</ant>
+</ajc-test>
+
+<ajc-test dir="ltw" title="dump on error" keywords="ltw">
+	<compile files="HelloWorldWithException.java" />
+	<compile files="ExceptionHandler.aj" options="-outxml -1.4" />
+	<ant file="ant.xml" target="dump on error" verbose="true">
+		<stdout>
+			<line text="Hello World!" />
+		</stdout>
+	</ant>
+</ajc-test>
+
+<ajc-test dir="bugs153/pr155033" title="multiple dump on error"
+	keywords="ltw">
+	<compile files="Annotation.java" options="-1.5" />
+	<compile
+		files="MultipleDumpTest.java, Class1.java, Class2.java, Class3.java"
+		options="-1.5" />
+	<compile files="Aspect.aj" options="-1.5 -outxml -Xlint:ignore" />
+	<!-- <run class="MultipleDumpTest" ltw="aop-multipledumponerror.xml"> <stdout> 
+		<line text="? AbortingMessageHandler.AbortingMessageHandler()"/> </stdout> 
+		</run> -->
+	<ant file="ant.xml" target="multiple dump on error" verbose="true">
+		<stdout>
+			<line text="? MultipleDumpTest.main()" />
+			<line text="? Class1.main()" />
+			<line text="? Aspect.before()" />
+			<line text="? Class2.main()" />
+			<line text="? Aspect.before()" />
+			<line text="? Class3.main()" />
+			<line text="? Aspect.before()" />
+		</stdout>
+	</ant>
+</ajc-test>
     
     
\ No newline at end of file
diff --git a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
index 978e6b607..c7a917688 100644
--- a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
+++ b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
@@ -439,7 +439,7 @@
     
    <ajc-test dir="bugs152/pr144465" title="ltw with serialversionUID creation">
       <compile files="BigHorribleClass.java"/>
-      <compile files="AnAspect.java"/>
+      <compile files="AnAspect.java" options="-1.4"/>
       <run class="BigHorribleClass" ltw="aop1.xml">
         <stderr>
           <line text="weaveinfo Join point 'staticinitialization(void BigHorribleClass.&lt;clinit&gt;())'"/>
@@ -550,9 +550,9 @@
     
     <ajc-test dir="bugs152/pr137235"  pr="137235"
 		title="directory with .jar extension"  >
-	    <compile files="directory.jar/Before.java" outjar="directory.jar/inOne.custom"/>
-	    <compile files="directory.jar/BeforeExec.aj" outjar="directory.jar/inTwo"/>
-	    <compile files="directory.jar/Rename.aj" outjar="directory.jar/weave.jar"/>
+	    <compile files="directory.jar/Before.java" outjar="directory.jar/inOne.custom" options="-1.4"/>
+	    <compile files="directory.jar/BeforeExec.aj" outjar="directory.jar/inTwo" options="-1.4"/>
+	    <compile files="directory.jar/Rename.aj" outjar="directory.jar/weave.jar" options="-1.4"/>
 	    <compile files="directory.jar/Hello.java" inpath="directory.jar/inOne.custom,directory.jar/inTwo" aspectpath="directory.jar/weave.jar" outjar="directory.jar/outJar.jar"/>
         <run class="Hello" classpath="$sandbox/directory.jar/outJar.jar,$sandbox/directory.jar/weave.jar">
           <stdout>
diff --git a/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml b/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml
index 9b6ed3270..c4300e9c7 100644
--- a/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml
+++ b/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml
@@ -29,7 +29,7 @@
     </ajc-test>
 
     <ajc-test dir="bugs153/pr162657" title="complex pointcut">
-      <compile files="TestAspect.aj"/>
+      <compile files="TestAspect.aj" options="-1.4"/>
     </ajc-test>
     
     <ajc-test dir="bugs153/pr164633" title="incompatibleclasschange">
@@ -352,7 +352,7 @@
     
     <ajc-test dir="bugs153/pr145693" title="verifyErrNoTypeCflowField">
       <compile files="Event.java" outjar="cpath.jar"/>
-      <compile files="Monitor.aj" outjar="apath.jar" classpath="cpath.jar"/>
+      <compile files="Monitor.aj" outjar="apath.jar" classpath="cpath.jar" options="-1.4"/>
       <compile files="Sample.java" options="-Xlint:ignore" aspectpath="apath.jar" outjar="run.jar">
         <message kind="warning" line="8" text="Unable to determine match at this join point because the type 'Event' cannot be found"/>
       </compile>
@@ -365,14 +365,14 @@
 
     <ajc-test dir="bugs153/pr145693" title="verifyErrInpathNoTypeCflowField">
       <compile files="Event.java" outjar="cpath.jar"/>
-      <compile files="Monitor.aj" outjar="apath.jar" classpath="cpath.jar"/>
+      <compile files="Monitor.aj" outjar="apath.jar" classpath="cpath.jar" options="-1.4"/>
       <compile files="Sample.java" options="-Xlint:ignore" inpath="cpath.jar" aspectpath="apath.jar" outjar="run.jar"/>
       <run class="Sample" classpath="run.jar,apath.jar"/>
     </ajc-test>    
 
     <ajc-test dir="bugs153/pr145693" title="cpathNoTypeCflowField">
       <compile files="Event.java" outjar="cpath.jar"/>
-      <compile files="Monitor.aj" outjar="apath.jar" classpath="cpath.jar"/>
+      <compile files="Monitor.aj" outjar="apath.jar" classpath="cpath.jar" options="-1.4"/>
       <compile files="Sample.java" options="-Xlint:ignore" classpath="cpath.jar" aspectpath="apath.jar" outjar="run.jar"/>
       <run class="Sample" classpath="run.jar,apath.jar"/>
     </ajc-test>    
@@ -550,7 +550,7 @@
         <compile files="HelloWorld.java"/>
         <compile files="MessageHandler.java"/>
 <!--        <compile files="Aspect.aj" options="-outxml"/> -->
-        <compile files="Aspect.aj" options="-outxml -outjar aspects.jar"/>
+        <compile files="Aspect.aj" options="-outxml -outjar aspects.jar -1.4"/>
         <ant file="ajc-ant.xml" target="Duplicate JVMTI agents" verbose="true"/>
     </ajc-test>
     
@@ -695,7 +695,7 @@
     </ajc-test>
 
     <ajc-test dir="bugs153/pr156904/inDiffPkgWithoutImport" title="ensure no invalidAbsoluteTypeName when do match - 4">
-      <compile files="A.aj,Outer.java">
+      <compile files="A.aj,Outer.java" options="-1.4">
 		<message kind="warning" line="5" text="no match for this type name: Outer [Xlint:invalidAbsoluteTypeName]"/>
 	  </compile>
     </ajc-test>
@@ -740,8 +740,8 @@
         	files="HelloWorld.java"
         >
         </compile>	
-        <compile files="AbstractSuperAspect.aj"/>
-        <compile files="TestAdvice.aj"/>
+        <compile files="AbstractSuperAspect.aj" options="-1.4"/>
+        <compile files="TestAdvice.aj" options="-1.4"/>
         <run class="HelloWorld" ltw="aop-advice.xml">
         	<stdout>
                 <line text="? ConcreteAspectWithAdvice()"/>
@@ -787,8 +787,8 @@
 		keywords="aop.xml">
 
         <compile files="HelloWorld.java"/>
-        <compile files="AbstractSuperAspect.aj"/>
-        <compile files="TestAroundClosure.aj"/>
+        <compile files="AbstractSuperAspect.aj" options="-1.4"/>
+        <compile files="TestAroundClosure.aj" options="-1.4"/>
         <run class="HelloWorld" ltw="aop-aroundclosure.xml">
         	<stdout>
                 <line text="&rt; ConcreteAspectWithAroundClosure()"/>
diff --git a/tests/src/org/aspectj/systemtest/ajc153/jdtlikehandleprovider.xml b/tests/src/org/aspectj/systemtest/ajc153/jdtlikehandleprovider.xml
index 2ba1b993b..215240fe4 100644
--- a/tests/src/org/aspectj/systemtest/ajc153/jdtlikehandleprovider.xml
+++ b/tests/src/org/aspectj/systemtest/ajc153/jdtlikehandleprovider.xml
@@ -12,7 +12,7 @@
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="advice handle">
-      <compile files="A2.aj" options="-emacssym"/>
+      <compile files="A2.aj" options="-emacssym -1.4"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="pointcut handle">
@@ -28,7 +28,7 @@
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="two pieces of advice with the same signature and pointcut">
-      <compile files="A5.aj" options="-emacssym"/>
+      <compile files="A5.aj" options="-emacssym -1.4"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="pointcut handle with args">
@@ -44,7 +44,7 @@
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="advice handle with args">
-      <compile files="A8.aj" options="-emacssym"/>
+      <compile files="A8.aj" options="-emacssym -1.4"/>
     </ajc-test>
 
     <ajc-test dir="features153/jdtlikehandleprovider" title="field itd handle">
diff --git a/tests/src/org/aspectj/systemtest/ajc160/newfeatures-tests.xml b/tests/src/org/aspectj/systemtest/ajc160/newfeatures-tests.xml
index b01d26957..3b00c8d15 100644
--- a/tests/src/org/aspectj/systemtest/ajc160/newfeatures-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc160/newfeatures-tests.xml
@@ -5,7 +5,7 @@
 
     <ajc-test dir="features160/weavingJavaxPackage" title="weave javax classes - no">
       <compile files="A.java B.java" />
-      <compile files="X.aj" outjar="code.jar"/>
+      <compile files="X.aj" outjar="code.jar" options="-1.4"/>
       <run class="javax.foo.A" classpath="code.jar" ltw="aop1.xml">
       <stderr>
       <line text="AspectJ Weaver Version"/>
@@ -23,7 +23,7 @@
     
     <ajc-test dir="features160/weavingJavaxPackage" title="weave javax classes - yes">
       <compile files="A.java B.java" />
-      <compile files="X.aj" outjar="code.jar"/>
+      <compile files="X.aj" outjar="code.jar" options="-1.4"/>
       <run class="javax.foo.A" classpath="code.jar" ltw="aop2.xml">
         <stdout>
            <line text="advised"/>
diff --git a/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml b/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml
index 0f1b58af3..abc3e058e 100644
--- a/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml
+++ b/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml
@@ -274,7 +274,7 @@
     
     <ajc-test dir="bugs161/pr230134" title="ltw inherited cflow">
       <compile files="HW.java"/>
-      <compile files="SimpleTracing.java Tracing.java HelloWorldTracing.java" outjar="foo.jar"/>
+      <compile files="SimpleTracing.java Tracing.java HelloWorldTracing.java" outjar="foo.jar" options="-1.4"/>
       <run class="hello.HW" classpath="$sandbox/foo.jar" ltw="aop.xml">
         <stdout>
           <line text="Hello World"/>
diff --git a/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java b/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
index 1c857eb82..de0c20a89 100644
--- a/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
@@ -12,13 +12,13 @@ package org.aspectj.systemtest.ajc1611;
 
 import java.io.File;
 
-import junit.framework.Test;
-
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.classfile.Method;
 import org.aspectj.systemtest.ajc150.GenericsTests;
 import org.aspectj.testing.XMLBasedAjcTestCase;
 
+import junit.framework.Test;
+
 /**
  * @author Andy Clement
  */
diff --git a/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml b/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml
index db5fd041c..beb922924 100644
--- a/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml
+++ b/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml
@@ -57,19 +57,19 @@
   
 
   <ajc-test dir="bugs1611/pr335682" title="pr335682">
-    <compile inpath="foo.jar" outjar="bar.jar"/>
+    <compile inpath="foo.jar" options="-1.4" outjar="bar.jar"/>
   </ajc-test>
 
   <ajc-test dir="bugs1611/pr335682" title="pr335682 - 2">
-    <compile inpath="case2.jar" outjar="bar.jar"/>
+    <compile inpath="case2.jar" options="-1.4" outjar="bar.jar"/>
   </ajc-test>
   
   <ajc-test dir="bugs1611/pr335682" title="pr335682 - 3">
-    <compile inpath="case3.jar" outjar="bar.jar"/>
+    <compile inpath="case3.jar" options="-1.4" outjar="bar.jar"/>
   </ajc-test>  
   
   <ajc-test dir="bugs1611/pr335682" title="pr335682 - 5">
-    <compile inpath="case5.jar" outjar="bar.jar"/>
+    <compile inpath="case5.jar" options="-1.4" outjar="bar.jar"/>
   </ajc-test>  
 
   <ajc-test dir="bugs1611/pr335783" title="pr335783">
diff --git a/tests/src/org/aspectj/systemtest/ajc174/ajc174.xml b/tests/src/org/aspectj/systemtest/ajc174/ajc174.xml
index 2ee09c456..456fb412f 100644
--- a/tests/src/org/aspectj/systemtest/ajc174/ajc174.xml
+++ b/tests/src/org/aspectj/systemtest/ajc174/ajc174.xml
@@ -117,7 +117,7 @@
 	</ajc-test>
 	
 	<ajc-test dir="bugs174/pr368046" title="classloader exclusion - 1">
-	  <compile files="Azpect.java" outjar="foo.jar"/>
+	  <compile files="Azpect.java" outjar="foo.jar" options="-1.4"/>
       <compile files="Code.java" classpath="$sandbox/foo.jar"/>
       <run class="Code" classpath="$sandbox/foo.jar" ltw="aop1.xml">
         <stdout>
@@ -135,7 +135,7 @@
 	</ajc-test>
 	
 	<ajc-test dir="bugs174/pr368046" title="classloader exclusion - 2">
-	  <compile files="Azpect.java" outjar="foo.jar"/>
+	  <compile files="Azpect.java" outjar="foo.jar" options="-1.4"/>
       <compile files="Code.java" classpath="$sandbox/foo.jar"/>
       <run class="Code" classpath="$sandbox/foo.jar" ltw="aop1.xml">
         <stdout>
@@ -154,7 +154,7 @@
 	</ajc-test>
 	
 	<ajc-test dir="bugs174/pr368046" title="classloader exclusion - 3">
-	  <compile files="Azpect.java" outjar="foo.jar"/>
+	  <compile files="Azpect.java" outjar="foo.jar" options="-1.4"/>
       <compile files="Code.java" classpath="$sandbox/foo.jar"/>
       <run class="Code" classpath="$sandbox/foo.jar" ltw="aop1.xml">
         <stdout>
@@ -172,7 +172,7 @@
 	</ajc-test>
 	
 	<ajc-test dir="bugs174/pr368046" title="classloader exclusion - 4">
-	  <compile files="Azpect.java" outjar="foo.jar"/>
+	  <compile files="Azpect.java" outjar="foo.jar" options="-1.4"/>
       <compile files="Code.java" classpath="$sandbox/foo.jar"/>
       <run class="Code" classpath="$sandbox/foo.jar" ltw="aop2.xml">
         <stdout>
@@ -191,7 +191,7 @@
 	</ajc-test>
 	
 	<ajc-test dir="bugs174/pr368046" title="classloader exclusion - 5">
-	  <compile files="Azpect.java" outjar="foo.jar"/>
+	  <compile files="Azpect.java" outjar="foo.jar" options="-1.4"/>
       <compile files="Code.java" classpath="$sandbox/foo.jar"/>
       <run class="Code" classpath="$sandbox/foo.jar" ltw="aop3.xml">
         <stdout>
diff --git a/tests/src/org/aspectj/systemtest/ajc192/Ajc192Tests.java b/tests/src/org/aspectj/systemtest/ajc192/Ajc192Tests.java
index 84e0f9d39..148e3030d 100644
--- a/tests/src/org/aspectj/systemtest/ajc192/Ajc192Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc192/Ajc192Tests.java
@@ -24,6 +24,10 @@ import junit.framework.Test;
  */
 public class Ajc192Tests extends XMLBasedAjcTestCase {
 
+	public void test11Flags() throws Exception {
+		runTest("11flags");
+	}
+
 	public void testNestmates() throws Exception {
 		runTest("nestmates");
 		JavaClass outer = getClassFrom(ajc.getSandboxDirectory(), "Outer");
diff --git a/tests/src/org/aspectj/systemtest/ajc192/ajc192.xml b/tests/src/org/aspectj/systemtest/ajc192/ajc192.xml
index eb846e7cf..304d522aa 100644
--- a/tests/src/org/aspectj/systemtest/ajc192/ajc192.xml
+++ b/tests/src/org/aspectj/systemtest/ajc192/ajc192.xml
@@ -2,12 +2,17 @@
 
 <suite>
 
+  <ajc-test dir="bugs192/11flags" title="11flags">
+    <compile files="A.java" options="-11 -showWeaveInfo">
+    <message kind="weave" text="Join point 'method-execution(void A.foo())' in Type 'A' (A.java:8) advised by before advice from 'X' (A.java:12)"/>
+	</compile>
+  </ajc-test>
+  
   <ajc-test dir="bugs192/nestmates" title="nestmates">
     <compile files="Outer.java" options="-11">
 	</compile>
   </ajc-test>
   
-  
   <ajc-test dir="bugs192/nestmates" title="nestmates 2">
     <compile files="Outer2.java" options="-11">
 	</compile>
diff --git a/tests/src/org/aspectj/systemtest/base/baseTests-tests.xml b/tests/src/org/aspectj/systemtest/base/baseTests-tests.xml
index 014a7e64c..b47682f51 100644
--- a/tests/src/org/aspectj/systemtest/base/baseTests-tests.xml
+++ b/tests/src/org/aspectj/systemtest/base/baseTests-tests.xml
@@ -210,7 +210,7 @@
 
     <ajc-test dir="base/test136" title="supers, supers, supers"
       keywords="from-base">
-        <compile files="Driver.java"/>
+        <compile files="Driver.java" options="-1.4"/>
         <run class="Driver"/>
     </ajc-test>
 
diff --git a/tests/src/org/aspectj/systemtest/design/designtest.xml b/tests/src/org/aspectj/systemtest/design/designtest.xml
index d3b70d9ec..21be1943c 100644
--- a/tests/src/org/aspectj/systemtest/design/designtest.xml
+++ b/tests/src/org/aspectj/systemtest/design/designtest.xml
@@ -13,7 +13,7 @@
 
     <ajc-test dir="design/intro"
       title="within and introductions behaves correctly" keywords="from-design">
-        <compile files="Within.java"/>
+        <compile files="Within.java" options="-1.4"/>
         <run class="Within"/>
     </ajc-test>
 
@@ -66,7 +66,7 @@
     <ajc-test dir="design/eachobject"
       title="more tests of eachobject with some difficult typing issues"
       keywords="from-design">
-        <compile files="Tricky3.java"/>
+        <compile files="Tricky3.java" options="-1.4"/>
         <run class="Tricky3"/>
     </ajc-test>
 
diff --git a/tests/src/org/aspectj/systemtest/incremental/incremental-junit-tests.xml b/tests/src/org/aspectj/systemtest/incremental/incremental-junit-tests.xml
index 48a6183ff..659abff47 100644
--- a/tests/src/org/aspectj/systemtest/incremental/incremental-junit-tests.xml
+++ b/tests/src/org/aspectj/systemtest/incremental/incremental-junit-tests.xml
@@ -374,7 +374,7 @@
       pr="90806"
       keywords="incremental-test"
    	  title="NPE in genHandleIdentifier">
-        <compile staging="true"	options="-incremental,-verbose,-emacssym" sourceroots="src"/>
+        <compile staging="true"	options="-incremental,-verbose,-emacssym,-1.4" sourceroots="src"/>
         <!--inc-compile tag="20"/-->
     </ajc-test>
     	 
diff --git a/tests/src/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml b/tests/src/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml
index 71e706209..ae9e6be31 100644
--- a/tests/src/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml
+++ b/tests/src/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml
@@ -75,7 +75,7 @@
     <ajc-test dir="incremental/model/sourcefiles_updating" 
     	title="Testing incremental structure model: Updating files"
     	keywords="incremental-test,model-test" >
-        <compile staging="true" options="-incremental,-emacssym,-Xset:minimalModel=false" sourceroots="src"/>
+        <compile staging="true" options="-incremental,-emacssym,-Xset:minimalModel=false,-1.4" sourceroots="src"/>
         <!-- On first compile, 5 source files in model, 'root','Alpha','Beta','Gamma','Delta' -->
         <inc-compile tag="20" checkModel="java source file=5,method=4,class=3,FileMapSize=4"/> <!-- Beta changed, method added -->
         <inc-compile tag="30" checkModel="java source file=5,method=4,class=4,advice=1"/> <!-- Delta changed, class added -->
diff --git a/tests/src/org/aspectj/systemtest/pre10x/pre10x-tests.xml b/tests/src/org/aspectj/systemtest/pre10x/pre10x-tests.xml
index 52531e59b..9b0837dbe 100644
--- a/tests/src/org/aspectj/systemtest/pre10x/pre10x-tests.xml
+++ b/tests/src/org/aspectj/systemtest/pre10x/pre10x-tests.xml
@@ -127,7 +127,7 @@
     <ajc-test dir="errors" pr="244"
       title="decent errors for around return type not matching target point"
       keywords="from-errors">
-        <compile files="AroundReturnType.java">
+        <compile files="AroundReturnType.java" options="-1.4">
             <message kind="error" line="2"/>
             <message kind="error" line="6"/>
             <message kind="error" line="7"/>
@@ -395,7 +395,7 @@
     <ajc-test dir="errors"
       title="circular dominates leading to irresolvable advice precedence"
       keywords="from-errors">
-        <compile files="CircularDominates.java">
+        <compile files="CircularDominates.java" options="-1.4">
             <message kind="error" line="12"/>
             <message kind="error" line="16"/>
             <message kind="error" line="20"/>
diff --git a/tests/src/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml b/tests/src/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml
index 1fafc783e..d6346ceac 100644
--- a/tests/src/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml
+++ b/tests/src/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml
@@ -57,7 +57,7 @@
 		pr="41181">
 		<compile files="ClinitTest.java, Util.java"/>
         <run class="ClinitTest"/>
-		<compile files="ClinitTest.java, Util.java, TJP.aj" options="-Xlint:warning">
+		<compile files="ClinitTest.java, Util.java, TJP.aj" options="-Xlint:warning -1.4">
 		  <message kind="warning" line="24" text="can not build"/>
 		  <message kind="warning" line="31" text="can not build"/>
 		</compile>
diff --git a/tests/src/org/aspectj/systemtest/tracing/tracing.xml b/tests/src/org/aspectj/systemtest/tracing/tracing.xml
index 42b61823c..8a6409183 100644
--- a/tests/src/org/aspectj/systemtest/tracing/tracing.xml
+++ b/tests/src/org/aspectj/systemtest/tracing/tracing.xml
@@ -65,7 +65,7 @@
         <compile
         	files="HelloWorld.java"
         />
-        <compile files="Aspect.aj" options="-outxml"/>
+        <compile files="Aspect.aj" options="-outxml -1.4"/>
 		<ant file="ant.xml" target="Trace everything" verbose="true">
         	<stdout>
                 <line text="Hello World!"/>
@@ -77,7 +77,7 @@
         <compile
         	files="HelloWorld.java"
         />
-        <compile files="Aspect.aj" options="-outxml"/>
+        <compile files="Aspect.aj" options="-outxml -1.4"/>
 		<ant file="ant.xml" target="JDK 1.4 tracing" verbose="true">
         	<stdout>
                 <line text="Hello World!"/>
@@ -89,7 +89,7 @@
         <compile
         	files="HelloWorld.java"
         />
-        <compile files="Aspect.aj" options="-outxml"/>
+        <compile files="Aspect.aj" options="-outxml -1.4"/>
 		<ant file="ant.xml" target="Tracing file System Property" verbose="true">
         	<stdout>
                 <line text="Hello World!"/>
diff --git a/tests/src/org/aspectj/systemtest/xlint/xlint-tests.xml b/tests/src/org/aspectj/systemtest/xlint/xlint-tests.xml
index 30ef5dea4..4bbf23841 100644
--- a/tests/src/org/aspectj/systemtest/xlint/xlint-tests.xml
+++ b/tests/src/org/aspectj/systemtest/xlint/xlint-tests.xml
@@ -184,7 +184,7 @@
  
     <ajc-test dir="harness" 
         title="valid XLintWarningTest file, default level of warning">
-        <compile files="XLintWarningTest.java">
+        <compile files="XLintWarningTest.java" options="-1.4">
         	<message kind="warning" line="5"
         		 text="Xlint:invalidAbsoluteTypeName"/> 
         </compile>
-- 
2.39.5