Upgrading DBCP
Upgrading DBCP, Jetty, Servlet & JSP APIs
Cleanup
Fix