Improve Pom files, java 7