generation tool refinement
added source jars to build
Merged pom conflict