Remove jdk 1.7 syntax to fix commons-serengeti build failure