Fix in build
fix in build 2
Removed dirty pom hack for a more suitable solution