fix maven build and test
8 files changed