swichted to Java 8 and added apache Commons-lang