Upgraded to

1) Spring Java Configuration
2) Servlet 3