Make Java 1.5 compatible.  Fixed pom issues.