Restore XML config and drop java config
Remove unnecessary and deprecated bean config
Bump spring and spring security patch versions