Revert surfire changes and use maven-enforcer-plugin