upgrade springframework, change to jetty instead of tomcat