Prefer CDI annotations
Correctly exclude the client package
Add typing for cdi services
Braid: Update mirror 'vendor/plugins/domgen' to '9f357c9'