Use InjectionTarget builder SPI (WELD-1612)
Remove workaround for JANDEX-20
Use the right composite index for a sub-deployment
Upgrade to Weld 2.2.0-SNAPSHOT (to be changed to Beta2)