Spring+Vaadin upgrade