Revert "sync with repo"

This reverts commit bc50ace2ba3bb74431dc45ff3170e3bed929a787.

Conflicts:
springmvc/pom.xml