Upgrade to Spring 4 and Servlet 3.0.1