Upgrade to spring 4.0

Signed-off-by: Régis Caspar <regis.caspar@gmail.com>