Change to war and newer version of spring