Make the build work with Java 7