Replace Java 7 support with Java 8