-Added the maven-compiler-plugin to stop m2e to defaulting to JRE 1.5
-Sorted some version mapping