[osgi] Solutions for eclipse/microprofile#33

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

api/bnd.bnd

@@ -1,5 +1,23 @@
 -exportcontents: \
     org.eclipse.microprofile.*
+
+Import-Package: \
+    javax.enterprise.*;-remove-attribute:=version, \
+    javax.inject;-remove-attribute:=version,\
+    javax.interceptor;-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.contract;\
+        osgi.contract=JavaInterceptor;\
+        filter:="(&(osgi.contract=JavaInterceptor)(version=${interceptor.api.version}))"
+
 Bundle-SymbolicName: org.eclipse.microprofile.metrics
 Bundle-Name: MicroProfile Metrics Bundle
 Bundle-License: Apache License, Version 2.0

pom.xml

@@ -32,8 +32,10 @@
 
         <checkstyle.version>2.17</checkstyle.version>
         <checkstyle.methodNameFormat>^_?[a-z][a-zA-Z0-9]*$</checkstyle.methodNameFormat>
-        <cdi-version>1.2</cdi-version>
         <autorelease>false</autorelease>
+        <cdi.api.version>1.1</cdi.api.version>
+        <inject.api.version>1</inject.api.version>
+        <interceptor.api.version>1.1</interceptor.api.version>
     </properties>
 
     <licenses>
@@ -92,7 +94,7 @@
             <dependency>
                 <groupId>javax.enterprise</groupId>
                 <artifactId>cdi-api</artifactId>
-                <version>${cdi-version}</version>
+                <version>${cdi.api.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.arquillian</groupId>