Rebuild ensuring Java 1.5 compatible