upgrade to spring RC2