More cleanup (#967)

Changes:
* update maven-wrapper to 3.3.0
* do not override parent versions
* use properties where appropriate
6 files changed