modified to use newer spring projects