CDI-3105 support compiling on jdk 8