use JDK 1.6 rather than 1.7, and remove the version-suffix separator logic to force the use of '-' as it's not clear what the advantage is for sometimes using '.'