Update to support build/test with Java17
4 files changed