modified *.java files and pom.xml