Improve pom.xml and assembli.xml