change spring version + move velocity-toolbox.xml