Upgraded to CDI 1.1 and Weld 2.0.0.Final