pom.xml packaging update, maven and gradle code cleaning