Changed to groovy 2.3.6 & java 8