Removed useless non-javadoc and updated spring dependency versions.
Fixed a javadoc.