Migrating to Vaadin 7 pom and source mod