Upgrade CDI API to 1.1