Change to use new SPI
WELD-1089 Resource type is not checked against matching object in the Java EE component environment