Remove maven and upgrade to spring 4