Switch to Java 8
Continue porting to deltaspike