Consistent use of JDK 7 and 8 rather than 1.7 and 1.8