[osgi] Solutions for microprofile/microprofile#33

Signed-off-by: Raymond Auge <[email protected]>

api/bnd.bnd

@@ -2,9 +2,23 @@
     org.eclipse.microprofile.*
 
 Import-Package: \
-    javax.enterprise.util;version="[1.1,3)", \
+    javax.enterprise.*;-remove-attribute:=version, \
+    javax.inject;-remove-attribute:=version,\
     *
 
+Require-Capability: \
+    osgi.contract;\
+        osgi.contract=JavaCDI;\
+        filter:="(&(osgi.contract=JavaCDI)(version=${cdi.api.version}))",\
+    osgi.contract;\
+        osgi.contract=JavaInject;\
+        filter:="(&(osgi.contract=JavaInject)(version=${inject.api.version}))",\
+    osgi.serviceloader;\
+        filter:="(osgi.serviceloader=org.eclipse.microprofile.config.spi.ConfigProviderResolver)";\
+        cardinality:=multiple,\
+    osgi.extender;\
+        filter:="(osgi.extender=osgi.serviceloader.processor)"
+
 Bundle-SymbolicName: org.eclipse.microprofile.config
 Bundle-Name: MicroProfile Config Bundle
 Bundle-License: Apache License, Version 2.0

pom.xml

@@ -33,6 +33,8 @@
 
         <checkstyle.version>2.17</checkstyle.version>
         <checkstyle.methodNameFormat>^_?[a-z][a-zA-Z0-9]*$</checkstyle.methodNameFormat>
+        <cdi.api.version>2.0</cdi.api.version>
+        <inject.api.version>1</inject.api.version>
     </properties>
 
     <licenses>
@@ -105,7 +107,7 @@
             <dependency>
                 <groupId>javax.enterprise</groupId>
                 <artifactId>cdi-api</artifactId>
-                <version>1.2</version>
+                <version>${cdi.api.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.arquillian</groupId>