migrate to xtend 2.5 release