Update for java 9
5 files changed