CDI-339 OSGi headers, updated dependencies