#351560 fixed annotations and removed datasource from pom.xml