[CDI] cleanup build and update to official OSGi releases Signed-off-by: Raymond Auge <rotty3000@apache.org>