Fix and clean up pom.xml