Migrate to jdk6

@petter-fidesmo ready to review