preparing jdk 8 support