Improve pom.xml and modify classpath