Upgrade Spring from 3.2.4 to 4.1.3