Updates to better cope with future JDKs

The version handling in LangUtil has been overhauled
to cope better with post 1.8 releases (JDK9 and JDK10 or 18.3
or whatever they call it). As part of this moved
to treating JDK9 as '9' rather than '1.9'. Also removed
duplicate version processing logic and had that defer to
the one place in LangUtil where we now deal with it.

Includes some generics tidyup in ajdoc. More ajdoc work
is necessary for Java10 because it removes the standard doclet
(old style). However trying to invoke the internal Javadoc
handler in Java10 is failing due to module visibility rules.

ajdoc/src/org/aspectj/tools/ajdoc/HtmlDecorator.java

@@ -48,7 +48,7 @@ class HtmlDecorator {
 	private static final String ITD_FIELD_SUMMARY = "Inter-Type Field Summary";
 	private static final String ITD_CONSTRUCTOR_SUMMARY = "Inter-Type Constructor Summary";
 
-	static List visibleFileList = new ArrayList();
+	static List<String> visibleFileList = new ArrayList<String>();
 	static Hashtable declIDTable = null;
 	static File rootDir = null;
 	static String docVisibilityModifier;
@@ -291,22 +291,22 @@ class HtmlDecorator {
 	}
 
 	static void addAspectDocumentation(IProgramElement node, StringBuffer fileBuffer, int index) {
-		List pointcuts = new ArrayList();
-		List advice = new ArrayList();
-		List declares = new ArrayList();
-		List methodsDeclaredOn = StructureUtil.getDeclareInterTypeTargets(node, IProgramElement.Kind.INTER_TYPE_METHOD);
+		List<IProgramElement> pointcuts = new ArrayList<IProgramElement>();
+		List<IProgramElement> advice = new ArrayList<IProgramElement>();
+		List<IProgramElement> declares = new ArrayList<IProgramElement>();
+		List<IProgramElement> methodsDeclaredOn = StructureUtil.getDeclareInterTypeTargets(node, IProgramElement.Kind.INTER_TYPE_METHOD);
 		if (methodsDeclaredOn != null && !methodsDeclaredOn.isEmpty()) {
 			insertDeclarationsSummary(fileBuffer, methodsDeclaredOn, ITD_METHOD_SUMMARY, index);
 		}
-		List fieldsDeclaredOn = StructureUtil.getDeclareInterTypeTargets(node, IProgramElement.Kind.INTER_TYPE_FIELD);
+		List<IProgramElement> fieldsDeclaredOn = StructureUtil.getDeclareInterTypeTargets(node, IProgramElement.Kind.INTER_TYPE_FIELD);
 		if (fieldsDeclaredOn != null && !fieldsDeclaredOn.isEmpty()) {
 			insertDeclarationsSummary(fileBuffer, fieldsDeclaredOn, ITD_FIELD_SUMMARY, index);
 		}
-		List constDeclaredOn = StructureUtil.getDeclareInterTypeTargets(node, IProgramElement.Kind.INTER_TYPE_CONSTRUCTOR);
+		List<IProgramElement> constDeclaredOn = StructureUtil.getDeclareInterTypeTargets(node, IProgramElement.Kind.INTER_TYPE_CONSTRUCTOR);
 		if (fieldsDeclaredOn != null && !constDeclaredOn.isEmpty()) {
 			insertDeclarationsSummary(fileBuffer, constDeclaredOn, ITD_CONSTRUCTOR_SUMMARY, index);
 		}
-		for (Iterator it = node.getChildren().iterator(); it.hasNext();) {
+		for (Iterator<IProgramElement> it = node.getChildren().iterator(); it.hasNext();) {
 			IProgramElement member = (IProgramElement) it.next();
 			if (member.getKind().equals(IProgramElement.Kind.POINTCUT)) {
 				pointcuts.add(member);
@@ -329,17 +329,17 @@ class HtmlDecorator {
 			insertDeclarationsDetails(fileBuffer, advice, ADVICE_DETAIL, index);
 		}
 		// add the 'aspect declarations' information against the type
-		List parentsDeclaredOn = StructureUtil.getDeclareInterTypeTargets(node, IProgramElement.Kind.DECLARE_PARENTS);
+		List<IProgramElement> parentsDeclaredOn = StructureUtil.getDeclareInterTypeTargets(node, IProgramElement.Kind.DECLARE_PARENTS);
 		if (parentsDeclaredOn != null && parentsDeclaredOn.size() > 0) {
 			decorateDocWithRel(node, fileBuffer, index, parentsDeclaredOn, HtmlRelationshipKind.ASPECT_DECLARATIONS);
 		}
 		// add the 'annotated by' information against the type
-		List annotatedBy = StructureUtil.getTargets(node, IRelationship.Kind.DECLARE_INTER_TYPE, "annotated by");
+		List<String> annotatedBy = StructureUtil.getTargets(node, IRelationship.Kind.DECLARE_INTER_TYPE, "annotated by");
 		if (annotatedBy != null && annotatedBy.size() > 0) {
 			decorateDocWithRel(node, fileBuffer, index, annotatedBy, HtmlRelationshipKind.ANNOTATED_BY);
 		}
 		// add the 'advised by' information against the type
-		List advisedBy = StructureUtil.getTargets(node, IRelationship.Kind.ADVICE);
+		List<String> advisedBy = StructureUtil.getTargets(node, IRelationship.Kind.ADVICE);
 		if (advisedBy != null && advisedBy.size() > 0) {
 			decorateDocWithRel(node, fileBuffer, index, advisedBy, HtmlRelationshipKind.ADVISED_BY);
 		}
@@ -621,16 +621,16 @@ class HtmlDecorator {
 	}
 
 	static void decorateMemberDocumentation(IProgramElement node, StringBuffer fileContentsBuffer, int index) {
-		List targets = StructureUtil.getTargets(node, IRelationship.Kind.ADVICE);
+		List<String> targets = StructureUtil.getTargets(node, IRelationship.Kind.ADVICE);
 		decorateDocWithRel(node, fileContentsBuffer, index, targets, HtmlRelationshipKind.ADVISED_BY);
 
-		List warnings = StructureUtil.getTargets(node, IRelationship.Kind.DECLARE, "matches declare");
+		List<String> warnings = StructureUtil.getTargets(node, IRelationship.Kind.DECLARE, "matches declare");
 		decorateDocWithRel(node, fileContentsBuffer, index, warnings, HtmlRelationshipKind.MATCHES_DECLARE);
 
-		List softenedBy = StructureUtil.getTargets(node, IRelationship.Kind.DECLARE, "softened by");
+		List<String> softenedBy = StructureUtil.getTargets(node, IRelationship.Kind.DECLARE, "softened by");
 		decorateDocWithRel(node, fileContentsBuffer, index, softenedBy, HtmlRelationshipKind.SOFTENED_BY);
 
-		List annotatedBy = StructureUtil.getTargets(node, IRelationship.Kind.DECLARE_INTER_TYPE, "annotated by");
+		List<String> annotatedBy = StructureUtil.getTargets(node, IRelationship.Kind.DECLARE_INTER_TYPE, "annotated by");
 		decorateDocWithRel(node, fileContentsBuffer, index, annotatedBy, HtmlRelationshipKind.ANNOTATED_BY);
 	}
 

ajdoc/src/org/aspectj/tools/ajdoc/JavadocRunner.java

@@ -14,9 +14,12 @@
 
 package org.aspectj.tools.ajdoc;
 
+import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import org.aspectj.util.LangUtil;
+
 /**
  * @author Mik Kersten
  */
@@ -62,7 +65,12 @@ class JavadocRunner {
 		// defaultSecurityManager.checkPermission( permission, context );
 		// }
 		// } );
-
+		
+		// Need to do something different on Java > 9 due to removal of standard doclet I think
+//		if (LangUtil.is19VMOrGreater()) {
+//			// Not visible according to module rules...
+//			clazz = Class.forName("jdk.javadoc.internal.tool.Main");
+//		}
 		try {
 			// for JDK 1.4 and above call the execute method...
 			Class jdMainClass = com.sun.tools.javadoc.Main.class;

ajdoc/src/org/aspectj/tools/ajdoc/Main.java

@@ -47,24 +47,24 @@ public class Main implements Config {
 	private static final String FAIL_MESSAGE = "> compile failed, exiting ajdoc";
 
 	/** Command line options. */
-	static Vector options;
+	static Vector<String> options;
 
 	/** Options to pass to ajc. */
-	static Vector ajcOptions;
+	static Vector<String> ajcOptions;
 
 	/** All of the files to be processed by ajdoc. */
-	static Vector filenames;
+	static Vector<String> filenames;
 
 	/** List of files to pass to javadoc. */
-	static Vector fileList;
+	static Vector<String> fileList;
 
 	/** List of packages to pass to javadoc. */
-	static Vector packageList;
+	static Vector<String> packageList;
 
 	/** Default to package visiblity. */
 	static String docModifier = "package";
 
-	static Vector sourcepath;
+	static Vector<String> sourcepath;
 
 	static boolean verboseMode = false;
 	static boolean packageMode = false;
@@ -85,13 +85,13 @@ public class Main implements Config {
 	private static String outputWorkingDir = Config.WORKING_DIR;
 
 	public static void clearState() {
-		options = new Vector();
-		ajcOptions = new Vector();
-		filenames = new Vector();
-		fileList = new Vector();
-		packageList = new Vector();
+		options = new Vector<String>();
+		ajcOptions = new Vector<String>();
+		filenames = new Vector<String>();
+		fileList = new Vector<String>();
+		packageList = new Vector<String>();
 		docModifier = "package";
-		sourcepath = new Vector();
+		sourcepath = new Vector<String>();
 		verboseMode = false;
 		packageMode = false;
 		rootDir = null;
@@ -169,7 +169,7 @@ public class Main implements Config {
 	 * package-summary properly.
 	 */
 	private static void packageHTML(AsmManager model, File[] inputFiles) throws IOException {
-		ArrayList dirList = new ArrayList();
+		ArrayList<String> dirList = new ArrayList<String>();
 		for (int i = 0; i < inputFiles.length; i++) {
 			String packageName = StructureUtil.getPackageDeclarationFromFile(model, inputFiles[i]);
 			// Only copy the package.html file once.
@@ -192,7 +192,7 @@ public class Main implements Config {
 				String pathName = outputWorkingDir + File.separator + packageName.replace('.', File.separatorChar);
 				File packageDir = new File(pathName);
 				if (!packageDir.exists()) {
-					dirList.add(packageDir);
+					dirList.add(packageName);
 					continue;
 				}
 				packageName = packageName.replace('.', '/'); // !!!
@@ -273,7 +273,6 @@ public class Main implements Config {
 				javadocargs[options.size() + k] = StructureUtil.translateAjPathName(signatureFiles[k].getCanonicalPath());
 			}
 		}
-
 		JavadocRunner.callJavadoc(javadocargs);
 	}
 
@@ -345,8 +344,8 @@ public class Main implements Config {
 		}
 	}
 
-	static Vector getSourcePath() {
-		Vector sourcePath = new Vector();
+	static Vector<String> getSourcePath() {
+		Vector<String> sourcePath = new Vector<String>();
 		boolean found = false;
 		for (int i = 0; i < options.size(); i++) {
 			String currOption = (String) options.elementAt(i);
@@ -455,14 +454,14 @@ public class Main implements Config {
 				String line = "";
 				line = br.readLine();
 				StringTokenizer st = new StringTokenizer(line, " ");
-				List argList = new ArrayList();
+				List<String> argList = new ArrayList<String>();
 				while (st.hasMoreElements()) {
-					argList.add(st.nextElement());
+					argList.add(st.nextToken());
 				}
 				// System.err.println(argList);
 				args = new String[argList.size()];
 				int counter = 0;
-				for (Iterator it = argList.iterator(); it.hasNext();) {
+				for (Iterator<String> it = argList.iterator(); it.hasNext();) {
 					args[counter] = (String) it.next();
 					counter++;
 				}
@@ -474,7 +473,7 @@ public class Main implements Config {
 				ioe.printStackTrace();
 			}
 		}
-		List vargs = new LinkedList(Arrays.asList(args));
+		List<String> vargs = new LinkedList<String>(Arrays.asList(args));
 		vargs.add("-Xset:minimalModel=false");
 		parseArgs(vargs, new File(".")); // !!!
 
@@ -488,7 +487,7 @@ public class Main implements Config {
 		arg = arg + File.pathSeparator; // makes things easier for ourselves
 		StringTokenizer tokenizer = new StringTokenizer(arg, File.pathSeparator);
 		while (tokenizer.hasMoreElements()) {
-			sourcepath.addElement(tokenizer.nextElement());
+			sourcepath.addElement(tokenizer.nextToken());
 		}
 	}
 
@@ -705,7 +704,7 @@ public class Main implements Config {
 	}
 
 	static void expandAtSignFile(String filename, File currentWorkingDir) {
-		List result = new LinkedList();
+		List<String> result = new LinkedList<String>();
 
 		File atFile = qualifiedFile(filename, currentWorkingDir);
 		String atFileParent = atFile.getParent();
@@ -730,6 +729,7 @@ public class Main implements Config {
 					continue;
 				result.add(line);
 			}
+			stream.close();
 		} catch (IOException e) {
 			System.err.println("Error while reading the @ file " + atFile.getPath() + ".\n" + e);
 			System.exit(-1);

ajdoc/src/org/aspectj/tools/ajdoc/StructureUtil.java

@@ -31,7 +31,7 @@ public class StructureUtil {
 	 * 
 	 * @return null if a relationship of that kind is not found
 	 */
-	public static List /* String */getTargets(IProgramElement node, IRelationship.Kind kind) {
+	public static List<String> getTargets(IProgramElement node, IRelationship.Kind kind) {
 		return getTargets(node, kind, null);
 	}
 
@@ -41,21 +41,21 @@ public class StructureUtil {
 	 * 
 	 * @return null if a relationship of that kind is not found
 	 */
-	public static List /* String */getTargets(IProgramElement node, IRelationship.Kind kind, String relName) {
-		List relations = new ArrayList();
-		List rels = node.getModel().getRelationshipMap().get(node);
+	public static List<String> getTargets(IProgramElement node, IRelationship.Kind kind, String relName) {
+		List<IRelationship> relations = new ArrayList<IRelationship>();
+		List<IRelationship> rels = node.getModel().getRelationshipMap().get(node);
 		if (rels != null) {
 			relations.addAll(rels);
 		}
-		for (Iterator iter = node.getChildren().iterator(); iter.hasNext();) {
+		for (Iterator<IProgramElement> iter = node.getChildren().iterator(); iter.hasNext();) {
 			IProgramElement child = (IProgramElement) iter.next();
 			// if we're not a type, or if we are and the child is code, then
 			// we want to get the relationships for this child - this means that the
 			// correct relationships appear against the type in the ajdoc
 			if (!node.getKind().isType() || child.getKind().equals(IProgramElement.Kind.CODE)) {
-				List childRelations = node.getModel().getRelationshipMap().get(child);
+				List<IRelationship> childRelations = node.getModel().getRelationshipMap().get(child);
 				if (childRelations != null) {
-					for (Iterator iterator = childRelations.iterator(); iterator.hasNext();) {
+					for (Iterator<IRelationship> iterator = childRelations.iterator(); iterator.hasNext();) {
 						IRelationship rel = (IRelationship) iterator.next();
 						if (!relations.contains(rel)) {
 							relations.add(rel);
@@ -66,13 +66,12 @@ public class StructureUtil {
 		}
 		if (relations == null || relations.isEmpty())
 			return null;
-		List targets = new ArrayList();
-		for (Iterator it = relations.iterator(); it.hasNext();) {
+		List<String> targets = new ArrayList<String>();
+		for (Iterator<IRelationship> it = relations.iterator(); it.hasNext();) {
 			IRelationship rtn = (IRelationship) it.next();
 			if (rtn.getKind().equals(kind) && ((relName != null && relName.equals(rtn.getName())) || relName == null)) {
-				List targs = rtn.getTargets();
-				for (Iterator iter = targs.iterator(); iter.hasNext();) {
-					String element = (String) iter.next();
+				List<String> targs = rtn.getTargets();
+				for (String element: targs) {
 					if (!targets.contains(element)) {
 						targets.add(element);
 					}
@@ -82,14 +81,13 @@ public class StructureUtil {
 		return targets;
 	}
 
-	static List /* IProgramElement */getDeclareInterTypeTargets(IProgramElement node, IProgramElement.Kind kind) {
-		List targets = new ArrayList();
-		List stringTargets = StructureUtil.getTargets(node, IRelationship.Kind.DECLARE_INTER_TYPE);
+	static List<IProgramElement> getDeclareInterTypeTargets(IProgramElement node, IProgramElement.Kind kind) {
+		List<IProgramElement> targets = new ArrayList<IProgramElement>();
+		List<String> stringTargets = StructureUtil.getTargets(node, IRelationship.Kind.DECLARE_INTER_TYPE);
 		if (stringTargets == null) {
 			return null;
 		}
-		for (Iterator iter = stringTargets.iterator(); iter.hasNext();) {
-			String element = (String) iter.next();
+		for (String element: stringTargets) {
 			IProgramElement ipe = node.getModel().getHierarchy().findElementForHandle(element);
 			if (ipe != null && ipe.getKind().equals(kind)) {
 				targets.add(ipe);
@@ -98,13 +96,12 @@ public class StructureUtil {
 		return targets;
 	}
 
-	public static List/* String */getDeclareTargets(IProgramElement node) {
-		List relations = node.getModel().getRelationshipMap().get(node);
-		List targets = null;
+	public static List<String> getDeclareTargets(IProgramElement node) {
+		List<IRelationship> relations = node.getModel().getRelationshipMap().get(node);
+		List<String> targets = null;
 		if (relations == null)
 			return null;
-		for (Iterator it = relations.iterator(); it.hasNext();) {
-			IRelationship rtn = (IRelationship) it.next();
+		for (IRelationship rtn: relations) {
 			if (rtn.getKind().isDeclareKind()) {
 				targets = rtn.getTargets();
 			}

ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocTestCase.java

@@ -198,8 +198,10 @@ public class AjdocTestCase extends TestCase {
 			!sourceLevel.equals("1.6") && 
 			!sourceLevel.equals("1.7") && 
 			!sourceLevel.equals("1.8") && 
-			!sourceLevel.equals("1.9")) {
-			fail("need to pass ajdoc '1.3' > '1.9' as the source level");
+			!sourceLevel.equals("1.9") &&
+			!sourceLevel.startsWith("9") &&
+			!sourceLevel.startsWith("10")) {
+			fail("need to pass suitable version to ajdoc as the source level");
 		}
 		if (inputFiles.length == 0) {
 			fail("need to pass some files into ajdoc");

ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java

@@ -55,7 +55,7 @@ public class CoverageTestCase extends AjdocTestCase {
 	 */
     public void testCoveragePublicMode() throws Exception {
     	File[] files = {file3,file9};
-    	runAjdoc("public","1.6",files);
+    	runAjdoc("public","9",files);
         
         // have passed the "public" modifier as well as
         // one public and one package visible class. There

org.aspectj.matcher/src/org/aspectj/weaver/World.java

@@ -462,6 +462,9 @@ public abstract class World implements Dump.INode {
 		} else if (ty.isGenericType()) {
 			// ======= generic types ======================
 			ResolvedType rt = resolveGenericTypeFor(ty, false);
+			if (rt.isMissing()) {
+				return rt;
+			}
 			ReferenceType genericType = (ReferenceType) rt;
 			return genericType;
 

testing/newsrc/org/aspectj/testing/AjcTest.java

@@ -12,6 +12,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.aspectj.tools.ajc.AjcTestCase;
+import org.aspectj.util.LangUtil;
 
 /**
  * @author Adrian Colyer
@@ -28,32 +29,12 @@ public class AjcTest {
 	private static boolean is19VMOrGreater = false;
 	
 	static { // matching logic is also in org.aspectj.util.LangUtil
-        String vm = System.getProperty("java.version"); // JLS 20.18.7
-        if (vm==null) vm = System.getProperty("java.runtime.version");
-		if (vm==null) vm = System.getProperty("java.vm.version");
-		if (vm.startsWith("1.3")) {
-			is14VMOrGreater = false;
-		} else if (vm.startsWith("1.5")) {
-			is15VMOrGreater = true;
-		} else if (vm.startsWith("1.6")) {
-			is15VMOrGreater = true;
-			is16VMOrGreater = true;
-		} else if (vm.startsWith("1.7")) {
-			is15VMOrGreater = true;
-			is16VMOrGreater = true;
-			is17VMOrGreater = true;
-		} else if (vm.startsWith("1.8")) {
-			is15VMOrGreater = true;
-			is16VMOrGreater = true;
-			is17VMOrGreater = true;
-			is18VMOrGreater = true;
-		} else if (vm.startsWith("1.9") || vm.startsWith("9")) {
-			is15VMOrGreater = true;
-			is16VMOrGreater = true;
-			is17VMOrGreater = true;
-			is18VMOrGreater = true;
-			is19VMOrGreater = true;
-		}
+		is14VMOrGreater = LangUtil.is14VMOrGreater();
+		is15VMOrGreater = LangUtil.is15VMOrGreater();
+		is16VMOrGreater = LangUtil.is16VMOrGreater();
+		is17VMOrGreater = LangUtil.is17VMOrGreater();
+		is18VMOrGreater = LangUtil.is18VMOrGreater();
+		is19VMOrGreater = LangUtil.is19VMOrGreater();
 	}
 
 	private List<ITestStep> testSteps = new ArrayList<ITestStep>();

testing/newsrc/org/aspectj/testing/OutputSpec.java

@@ -23,11 +23,31 @@ public class OutputSpec {
 	private List<String> expectedOutputLines = new ArrayList<String>();
 
 	public void addLine(OutputLine line) {
-		if (line.getVm() == null || line.getVm().contains(LangUtil.getVmVersionString())) {
+		if (line.getVm() == null || matchesThisVm(line.getVm())) {
 			expectedOutputLines.add(line.getText());
 		}
 	}
 	
+	/**
+	 * For a test output line that has specified a vm version, check if it matches the vm we are running on.
+	 * vm might be "1.2,1.3,1.4,1.5" or simply "9" or it may be a version with a '+' suffix indicating that
+	 * level or later, e.g. "9+" should be ok on Java 10
+	 * @return true if the current vm version matches the spec
+	 */
+	private boolean matchesThisVm(String vm) {
+		// vm might be 1.2, 1.3, 1.4, 1.5 or 1.9 possibly with a '+' in there
+		// For now assume + is attached to there only being one version, like "9+"
+		if (vm.contains(LangUtil.getVmVersionString())) {
+			return true;
+		}
+		if (vm.endsWith("+")) {
+			double vmVersion = LangUtil.getVmVersion();
+			double vmSpecified = Double.parseDouble(vm.substring(0,vm.length()-1));
+			return vmVersion >= vmSpecified;
+		}
+		return false;
+	}
+
 	public void matchAgainst(String output) {
 		matchAgainst(output, "yes");
 	}

tests/src/org/aspectj/systemtest/ajc150/ajc150.xml

@@ -2809,7 +2809,7 @@
               <line text="1 @Foo()"/>
               <line text="1 @Foo()"/>
               <line text="1 @Classified(classification=TOP-SECRET)" vm="1.5,1.6,1.7,1.8"/>
-              <line text="1 @Classified(classification=&quot;TOP-SECRET&quot;)" vm="1.9"/>
+              <line text="1 @Classified(classification=&quot;TOP-SECRET&quot;)" vm="9+"/>
               <line text="This information is TOP-SECRET"/>
               <line text="Entering critical join point with priority 3"/>
               <line text="Entering critical join point with reflectively obtained priority 3"/>
@@ -3813,46 +3813,46 @@
        <stdout>
          <line text="target-ok an X execution(void X.foo())"/>
          <line text="@this-ok @MyAnnotation(value=my-value) execution(void X.foo())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@this-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.foo())" vm="1.9"/>
+         <line text="@this-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.foo())" vm="9+"/>
          <line text="@target-ok @MyAnnotation(value=my-value) execution(void X.foo())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@target-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.foo())" vm="1.9"/>
+         <line text="@target-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.foo())" vm="9+"/>
          <line text="@within-ok @MyAnnotation(value=my-value) execution(void X.foo())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@within-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.foo())" vm="1.9"/>
+         <line text="@within-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.foo())" vm="9+"/>
          <line text="cflow-ok an X a Y set(Y X.y)"/>
          <line text="@annotation-ok-sub @MyAnnotation(value=bar) execution(void X.bar())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@annotation-ok-sub @MyAnnotation(value=&quot;bar&quot;) execution(void X.bar())" vm="1.9"/>
+         <line text="@annotation-ok-sub @MyAnnotation(value=&quot;bar&quot;) execution(void X.bar())" vm="9+"/>
          <line text="@annotation-ok @MyAnnotation(value=bar) execution(void X.bar())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@annotation-ok @MyAnnotation(value=&quot;bar&quot;) execution(void X.bar())" vm="1.9"/>
+         <line text="@annotation-ok @MyAnnotation(value=&quot;bar&quot;) execution(void X.bar())" vm="9+"/>
          <line text="target-ok an X execution(void X.bar())"/>
          <line text="@this-ok @MyAnnotation(value=my-value) execution(void X.bar())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@this-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.bar())" vm="1.9"/>
+         <line text="@this-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.bar())" vm="9+"/>
          <line text="@target-ok @MyAnnotation(value=my-value) execution(void X.bar())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@target-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.bar())" vm="1.9"/>
+         <line text="@target-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.bar())" vm="9+"/>
          <line text="@within-ok @MyAnnotation(value=my-value) execution(void X.bar())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@within-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.bar())" vm="1.9"/>
+         <line text="@within-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.bar())" vm="9+"/>
          <line text="@args-ok @MyAnnotation(value=my-value) execution(void Y.foo(X))" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@args-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void Y.foo(X))" vm="1.9"/>
+         <line text="@args-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void Y.foo(X))" vm="9+"/>
          <line text="args-ok an X execution(void Y.foo(X))"/>
          <line text="this-ok a Y execution(void Y.foo(X))"/>
          <line text="@this-ok @MyAnnotation(value=on Y) execution(void Y.foo(X))" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@this-ok @MyAnnotation(value=&quot;on Y&quot;) execution(void Y.foo(X))" vm="1.9"/>
+         <line text="@this-ok @MyAnnotation(value=&quot;on Y&quot;) execution(void Y.foo(X))" vm="9+"/>
          <line text="@target-ok @MyAnnotation(value=on Y) execution(void Y.foo(X))" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@target-ok @MyAnnotation(value=&quot;on Y&quot;) execution(void Y.foo(X))" vm="1.9"/>
+         <line text="@target-ok @MyAnnotation(value=&quot;on Y&quot;) execution(void Y.foo(X))" vm="9+"/>
          <line text="@within-ok @MyAnnotation(value=on Y) execution(void Y.foo(X))" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@within-ok @MyAnnotation(value=&quot;on Y&quot;) execution(void Y.foo(X))" vm="1.9"/>
+         <line text="@within-ok @MyAnnotation(value=&quot;on Y&quot;) execution(void Y.foo(X))" vm="9+"/>
          <line text="@annotation-ok-sub @MyAnnotation(value=my-value) execution(X Y.bar())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@annotation-ok-sub @MyAnnotation(value=&quot;my-value&quot;) execution(X Y.bar())" vm="1.9"/>
+         <line text="@annotation-ok-sub @MyAnnotation(value=&quot;my-value&quot;) execution(X Y.bar())" vm="9+"/>
          <line text="@annotation-ok @MyAnnotation(value=my-value) execution(X Y.bar())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@annotation-ok @MyAnnotation(value=&quot;my-value&quot;) execution(X Y.bar())" vm="1.9"/>
+         <line text="@annotation-ok @MyAnnotation(value=&quot;my-value&quot;) execution(X Y.bar())" vm="9+"/>
          <line text="this-ok a Y execution(X Y.bar())"/>
          <line text="@this-ok @MyAnnotation(value=on Y) execution(X Y.bar())" vm="1.5,1.6,1.7,1.8"/> 
-         <line text="@this-ok @MyAnnotation(value=&quot;on Y&quot;) execution(X Y.bar())" vm="1.9"/> 
+         <line text="@this-ok @MyAnnotation(value=&quot;on Y&quot;) execution(X Y.bar())" vm="9+"/> 
          <line text="@target-ok @MyAnnotation(value=on Y) execution(X Y.bar())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@target-ok @MyAnnotation(value=&quot;on Y&quot;) execution(X Y.bar())" vm="1.9"/>
+         <line text="@target-ok @MyAnnotation(value=&quot;on Y&quot;) execution(X Y.bar())" vm="9+"/>
          <line text="@within-ok @MyAnnotation(value=on Y) execution(X Y.bar())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@within-ok @MyAnnotation(value=&quot;on Y&quot;) execution(X Y.bar())" vm="1.9"/>
+         <line text="@within-ok @MyAnnotation(value=&quot;on Y&quot;) execution(X Y.bar())" vm="9+"/>
          <line text="@withincode-ok @MyAnnotation(value=my-value) get(X Y.x)" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@withincode-ok @MyAnnotation(value=&quot;my-value&quot;) get(X Y.x)" vm="1.9"/>
+         <line text="@withincode-ok @MyAnnotation(value=&quot;my-value&quot;) get(X Y.x)" vm="9+"/>
        </stdout>
      </run>
    </ajc-test>

tests/src/org/aspectj/systemtest/ajc154/ajc154.xml

@@ -28,7 +28,7 @@
      <run class="c.d.DistantResource">
      <stdout>
        <line text="Annotation is @a.b.SimpleAnnotation(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="Annotation is @a.b.SimpleAnnotation(classname=&quot;oranges&quot;)" vm="1.9"/>
+       <line text="Annotation is @a.b.SimpleAnnotation(classname=&quot;oranges&quot;)" vm="9+"/>
      </stdout>
      </run>
    </ajc-test>
@@ -41,7 +41,7 @@
       <run class="c.d.DistantResource">
      <stdout>       
        <line text="Annotation is @a.b.SimpleAnnotation(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="Annotation is @a.b.SimpleAnnotation(classname=&quot;oranges&quot;)" vm="1.9"/>
+       <line text="Annotation is @a.b.SimpleAnnotation(classname=&quot;oranges&quot;)" vm="9+"/>
      </stdout>
      </run>
    </ajc-test>
@@ -54,7 +54,7 @@
      <run class="c.d.DistantResource">
      <stdout>
        <line text="Annotation is @e.f.SimpleAnnotation2(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="Annotation is @e.f.SimpleAnnotation2(classname=&quot;oranges&quot;)" vm="1.9"/>       
+       <line text="Annotation is @e.f.SimpleAnnotation2(classname=&quot;oranges&quot;)" vm="9+"/>       
      </stdout>
      </run>
    </ajc-test>
@@ -67,7 +67,7 @@
      <run class="c.d.DistantResource">
      <stdout>
        <line text="Annotation is @e.f.SimpleAnnotation2(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="Annotation is @e.f.SimpleAnnotation2(classname=&quot;oranges&quot;)" vm="1.9"/>       
+       <line text="Annotation is @e.f.SimpleAnnotation2(classname=&quot;oranges&quot;)" vm="9+"/>       
      </stdout>
      </run>
    </ajc-test>
@@ -81,7 +81,7 @@
      <run class="c.d.DistantResource">
      <stdout>
        <line text="Annotation is @e.f.SimpleAnnotation2(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="Annotation is @e.f.SimpleAnnotation2(classname=&quot;oranges&quot;)" vm="1.9"/>       
+       <line text="Annotation is @e.f.SimpleAnnotation2(classname=&quot;oranges&quot;)" vm="9+"/>       
      </stdout>
      </run>
    </ajc-test>
@@ -96,7 +96,7 @@
      <run class="c.d.DistantResource">
      <stdout>
        <line text="Annotation is @e.f.SimpleAnnotation2(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="Annotation is @e.f.SimpleAnnotation2(classname=&quot;oranges&quot;)" vm="1.9"/>              
+       <line text="Annotation is @e.f.SimpleAnnotation2(classname=&quot;oranges&quot;)" vm="9+"/>              
      </stdout>
      </run>
    </ajc-test>

tests/src/org/aspectj/systemtest/ajc1611/newfeatures-tests.xml

@@ -110,7 +110,7 @@
     <stdout>
     <line text="i does not have Anno"/>
     <line text="j has Banno:@Banno(hoo=abc)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-    <line text="j has Banno:@Banno(hoo=&quot;abc&quot;)" vm="1.9"/>
+    <line text="j has Banno:@Banno(hoo=&quot;abc&quot;)" vm="9+"/>
     <line text="j does not have Anno"/>
     </stdout></run>
   </ajc-test>

tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml

@@ -258,9 +258,9 @@
 <run class="AnnoBinding2">
 <stdout>
 <line text="get(int AnnoBinding2.field1) @Marker(message=foo)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-<line text="get(int AnnoBinding2.field1) @Marker(message=&quot;foo&quot;)" vm="1.9"/>
+<line text="get(int AnnoBinding2.field1) @Marker(message=&quot;foo&quot;)" vm="9+"/>
 <line text="get(int AnnoBinding2.field2) @Marker(message=bar)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-<line text="get(int AnnoBinding2.field2) @Marker(message=&quot;bar&quot;)" vm="1.9"/>
+<line text="get(int AnnoBinding2.field2) @Marker(message=&quot;bar&quot;)" vm="9+"/>
 <line text="2 ajc$anno$NNN fields"/>
 </stdout>
 </run>

tests/src/org/aspectj/systemtest/ajc169/intertype.xml

@@ -71,7 +71,7 @@
        <stdout>
        <line text="wibble"/>
        <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="1.9"/>
+       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9+"/>
        </stdout>
      </run>
    </ajc-test>
@@ -82,7 +82,7 @@
        <stdout>
        <line text="wibble"/>
        <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="1.9"/>
+       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9+"/>
        </stdout>
      </run>
    </ajc-test>
@@ -93,7 +93,7 @@
        <stdout>
        <line text="wibble"/>
        <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="1.9"/>
+       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9+"/>
        </stdout>
      </run>
    </ajc-test>
@@ -104,7 +104,7 @@
        <stdout>
        <line text="wibble"/>
        <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="1.9"/>
+       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9+"/>
        </stdout>
      </run>
    </ajc-test>
@@ -115,7 +115,7 @@
        <stdout>
        <line text="wibble"/>
        <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="1.9"/>
+       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9+"/>
        </stdout>
      </run>
    </ajc-test>
@@ -126,7 +126,7 @@
        <stdout>
        <line text="wibble"/>
        <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="1.9"/>
+       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9+"/>
        </stdout>
      </run>
    </ajc-test>
@@ -137,7 +137,7 @@
        <stdout>
        <line text="wibble"/>
        <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_.class)" vm="1.9"/>
+       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_.class)" vm="9+"/>
        </stdout>
      </run>
    </ajc-test>

tests/src/org/aspectj/systemtest/ajc170/ajc170.xml

@@ -183,14 +183,14 @@
            <line text="Annotation count is 4"/>
            <line text="@AnnoBoolean(value=true, zzz=false)"/>
            <line text="@AnnoClass(value=class java.lang.Integer, ccc=class java.lang.String)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-           <line text="@AnnoClass(value=java.lang.Integer.class, ccc=java.lang.String.class)" vm="1.9"/>
+           <line text="@AnnoClass(value=java.lang.Integer.class, ccc=java.lang.String.class)" vm="9+"/>
            <line text="@AnnoLong(value=999, jjj=111)"/>
            <line text="@AnnoString(value=set from xml, sss=xyz)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-           <line text="@AnnoString(value=&quot;set from xml&quot;, sss=&quot;xyz&quot;)" vm="1.9"/>
+           <line text="@AnnoString(value=&quot;set from xml&quot;, sss=&quot;xyz&quot;)" vm="9+"/>
            <line text="Annotations on field2? true"/>
            <line text="Annotation count is 1"/>
            <line text="@AnnoClass(value=class java.lang.String, ccc=class java.lang.String)"  vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-           <line text="@AnnoClass(value=java.lang.String.class, ccc=java.lang.String.class)" vm="1.9"/>
+           <line text="@AnnoClass(value=java.lang.String.class, ccc=java.lang.String.class)" vm="9+"/>
        </stdout>
      </run>
    </ajc-test>
@@ -202,10 +202,10 @@
            <line text="Annotations on field1? true"/>
            <line text="Annotation count is 4"/>
            <line text="@AnnoChar(value=z, ccc=a)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-           <line text="@AnnoChar(value='z', ccc='a')" vm="1.9"/>
+           <line text="@AnnoChar(value='z', ccc='a')" vm="9+"/>
            <line text="@AnnoDouble(value=99.0, ddd=3.0)"/>
            <line text="@AnnoFloat(value=6.0, fff=4.0)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-           <line text="@AnnoFloat(value=6.0f, fff=4.0f)" vm="1.9"/>
+           <line text="@AnnoFloat(value=6.0f, fff=4.0f)" vm="9+"/>
            <line text="@AnnoShort(value=8, sss=3)"/>
            <line text="Annotations on field2? true"/>
            <line text="Annotation count is 2"/>
@@ -222,7 +222,7 @@
            <line text="Annotations on field1? true"/>
            <line text="Annotation count is 1"/>
            <line text="@Annot(a=a, fred=false, value=abc)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-           <line text="@Annot(a='a', fred=false, value=&quot;abc&quot;)" vm="1.9"/>
+           <line text="@Annot(a='a', fred=false, value=&quot;abc&quot;)" vm="9+"/>
        </stdout>
      </run>
    </ajc-test>
@@ -234,7 +234,7 @@
            <line text="Annotations on field1? true"/>
            <line text="Annotation count is 1"/>
            <line text="@Annot(a=a, fred=false, value=abc)" vm="1.4,1.5,1.6,1.7,1.8"/>
-           <line text="@Annot(a='a', fred=false, value=&quot;abc&quot;)" vm="1.9"/>
+           <line text="@Annot(a='a', fred=false, value=&quot;abc&quot;)" vm="9+"/>
        </stdout>
      </run>
    </ajc-test>

tests/src/org/aspectj/systemtest/ajc173/ajc173.xml

@@ -10,7 +10,7 @@
 		<run class="Hello">
 		<stdout>
 		<line text="@MyAnnotation(dummy1=, dummy2=korte)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-		<line text="@MyAnnotation(dummy1=&quot;&quot;, dummy2=&quot;korte&quot;)" vm="1.9"/>
+		<line text="@MyAnnotation(dummy1=&quot;&quot;, dummy2=&quot;korte&quot;)" vm="9+"/>
 		</stdout>
 		</run>
 	</ajc-test>

tests/src/org/aspectj/systemtest/ajc190/Ajc190Tests.java

@@ -21,10 +21,6 @@ import junit.framework.Test;
  */
 public class Ajc190Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
-	public void testVarious_SettingFinalStatic() {
-		runTest("setting static final outside clinit");
-	}
-
 	public void testAnnotMethodHasMember_pr156962_1() { // From similar in Ajc153Tests
 		runTest("Test Annot Method Has Member 1");
 	}

tests/src/org/aspectj/systemtest/ajc190/ajc190_from150.xml

@@ -2809,7 +2809,7 @@
               <line text="1 @Foo()"/>
               <line text="1 @Foo()"/>
               <line text="1 @Classified(classification=TOP-SECRET)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-              <line text="1 @Classified(classification=&quot;TOP-SECRET&quot;)" vm="1.9"/>
+              <line text="1 @Classified(classification=&quot;TOP-SECRET&quot;)" vm="9+"/>
               <line text="This information is TOP-SECRET"/>
               <line text="Entering critical join point with priority 3"/>
               <line text="Entering critical join point with reflectively obtained priority 3"/>

util/src/org/aspectj/util/LangUtil.java

@@ -49,6 +49,10 @@ public class LangUtil {
 		return Double.toString(vmVersion);
 	}
 	
+	public static double getVmVersion() {
+		return vmVersion;
+	}
+	
 	static {
 		StringWriter buf = new StringWriter();
 		PrintWriter writer = new PrintWriter(buf);
@@ -66,6 +70,8 @@ public class LangUtil {
 	}
 
 	static {
+		// http://www.oracle.com/technetwork/java/javase/versioning-naming-139433.html
+		// http://openjdk.java.net/jeps/223 "New Version-String Scheme"
 		try {
 			String vm = System.getProperty("java.version"); // JLS 20.18.7
 			if (vm == null) {
@@ -80,17 +86,21 @@ public class LangUtil {
 						.printStackTrace(System.err);
 				vmVersion = 1.5;
 			} else {
-				if (vm.startsWith("9")) {
-					// JDK 9 beta 99 starts using 9-ea as the version string.
-					vmVersion = 1.9;
-				} else {
-					try {
-						String versionString = vm.substring(0, 3);
-						Double temp = new Double(Double.parseDouble(versionString));
-						vmVersion = temp.doubleValue();
-					} catch (Exception e) {
-						vmVersion = 1.4;
+				// Version: [1-9][0-9]*((\.0)*\.[1-9][0-9]*)* 
+				// Care about the first set of digits and second set if first digit is 1
+				try {
+					List<Integer> numbers = getFirstNumbers(vm);
+					if (numbers.get(0) == 1) {
+						// Old school for 1.0 > 1.8
+						vmVersion = numbers.get(0)+(numbers.get(1)/10d);
+					} else {
+						// numbers.get(0) is the major version (9 and above)
+						// Note here the number will be 9 (or 10), *not* 1.9 or 1.10
+						vmVersion = numbers.get(0);
 					}
+				} catch (Throwable t) {
+					// Give up
+					vmVersion = 1.5;
 				}
 			}
 		} catch (Throwable t) {
@@ -100,6 +110,19 @@ public class LangUtil {
 			vmVersion = 1.5;
 		}
 	}
+	
+	private static List<Integer> getFirstNumbers(String vm) {
+		List<Integer> result = new ArrayList<Integer>();
+		StringTokenizer st = new StringTokenizer(vm,".-_");
+		try {
+			result.add(Integer.parseInt(st.nextToken()));
+			result.add(Integer.parseInt(st.nextToken()));
+		} catch (Exception e) {
+			// NoSuchElementException if no more tokens
+			// NumberFormatException if not a number
+		}
+		return result;
+	}
 
 	public static boolean is13VMOrGreater() {
 		return 1.3 <= vmVersion;
@@ -126,7 +149,7 @@ public class LangUtil {
 	}
 	
 	public static boolean is19VMOrGreater() {
-		return 1.9 <= vmVersion;
+		return 9 <= vmVersion;
 	}
 
 	/**