Upgrade Spring to 4.1.1 and m-javadoc-p to 2.10.1