Working towards 1.8.13

Updated version message for compiler to 1.8.13

Added poor mans version of new version processing in latest 1.9 RC2, this
version will just fall back to 1.5 instead of 1.4 when it gets confused
(so it will tolerate Java 10 a little more).

Debug message added for problems found when parameterizing a type
and there is a mismatch in number of expected type variables (which
can occur when you haven't fully updated your dependencies across
your project). This debug info should at least tell you the type
involved rather than a generic message about their being an issue.

org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties

@@ -4,7 +4,7 @@
      The -Xlintfile:lint.properties allows fine-grained control. In tools.jar, see
      org/aspectj/weaver/XlintDefault.properties for the default behavior and a template to copy. 
 ### AspectJ-specific messages 
-compiler.name = AspectJ Compiler 1.8.12
+compiler.name = AspectJ Compiler 1.8.13
 compiler.version = Eclipse Compiler Neon.2 #75dbfad0, 3.12
 compiler.copyright = 
 

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

@@ -966,12 +966,31 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl
 		}
 		TypeVariable[] tvs = getGenericType().getTypeVariables();
 		Map<String, UnresolvedType> parameterizationMap = new HashMap<String, UnresolvedType>();
+		if (tvs.length != typeParameters.length) {
+			throw new IllegalStateException("Unexpected mismatch when building parameterization map. For type "+this.signature+" expecting "+tvs.length+": "+toString(tvs)+" type parameters but found "+typeParameters.length+":"+toString(typeParameters));
+		}
 		for (int i = 0; i < tvs.length; i++) {
 			parameterizationMap.put(tvs[i].getName(), typeParameters[i]);
 		}
 		return parameterizationMap;
 	}
 
+	private String toString(UnresolvedType[] typeParameters) {
+		StringBuilder s = new StringBuilder();
+		for (UnresolvedType tv: typeParameters) {
+			s.append(tv.getSignature()).append(" ");
+		}
+		return s.toString();
+	}
+
+	private String toString(TypeVariable[] tvs) {
+		StringBuilder s = new StringBuilder();
+		for (TypeVariable tv: tvs) {
+			s.append(tv.getName()).append(" ");
+		}
+		return s.toString();
+	}
+
 	public List<ShadowMunger> getDeclaredAdvice() {
 		List<ShadowMunger> l = new ArrayList<ShadowMunger>();
 		ResolvedMember[] methods = getDeclaredMethods();

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

@@ -82,7 +82,7 @@ public class LangUtil {
 						Double temp = new Double(Double.parseDouble(versionString));
 						vmVersion = temp.doubleValue();
 					} catch (Exception e) {
-						vmVersion = 1.4;
+						vmVersion = 1.5;
 					}
 				}
 			}