Make project Java 9-proof
15 files changed