upgrade lombok for jdk 1.7 support
fix oracle and 2.9 issues