Minor clean up
Upgrade scala-maven-plugin 3.1.1, close #897