Updated the repo to support JDK 17