fix references to the old monolithic spring jar.

The breakage was caused by a few places where Steve is creating new entity providers, and he added dependencies to the old standalone Spring jar.

I went ahead and bumped up to the up-to-date Spring release. I set Tomcat version to 7.0.40 for no reason in particular.

There was also a stray tag in `warehouse/pom.xml`