multiple maven and spring fixes