Use spring 4 release and fix some package names that have changed