Update product and pom to avoid dependencies cycle