Upgrade to Spring Framework 4.0