Bump to Java 1.7
Make it work with tomcat 8