Some refactoring, forgot to set the correct class in pom.xml