No need to soft-line
Upgraded to current Java 7
Fix the Java 8 tagging