Remove spring version numbers from xml config.
Update spring version.
Update Jetty version. Stop using Java 7 diamond <> to retain limited
backwards compatibility with Java 6.