Updated spring, groovy, and tweaked some code generation