[osgi] Solutions for eclipse/microprofile#33

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

api/bnd.bnd

@@ -1,5 +1,28 @@
 -exportcontents: \
     org.eclipse.microprofile.*
+
+Import-Package: \
+    javax.enterprise.util;-remove-attribute:=version,\
+    javax.interceptor;-remove-attribute:=version,\
+    javax.ws.rs.client;-remove-attribute:=version,\
+    *
+
+Require-Capability: \
+    osgi.contract;\
+        osgi.contract=JavaCDI;\
+        filter:="(&(osgi.contract=JavaCDI)(version=${cdi.api.version}))",\
+    osgi.contract;\
+        osgi.contract=JavaInterceptor;\
+        filter:="(&(osgi.contract=JavaInterceptor)(version=${interceptor.api.version}))",\
+    osgi.contract;\
+        osgi.contract=JavaJAXRS;\
+        filter:="(&(osgi.contract=JavaJAXRS)(version=${jaxrs.api.version}))",\
+    osgi.serviceloader;\
+        filter:="(osgi.serviceloader=org.eclipse.microprofile.opentracing.ClientTracingRegistrarProvider)";\
+        cardinality:=multiple,\
+    osgi.extender;\
+        filter:="(osgi.extender=osgi.serviceloader.processor)"
+
 Bundle-SymbolicName: org.eclipse.microprofile.opentracing
 Bundle-Name: MicroProfile OpenTracing Bundle
 Bundle-License: Apache License, Version 2.0

api/pom.xml

@@ -60,7 +60,7 @@
             <plugin>
                 <groupId>biz.aQute.bnd</groupId>
                 <artifactId>bnd-maven-plugin</artifactId>
-                <version>2.4.1</version>
+                <version>3.4.0</version>
 
                 <executions>
                     <execution>

pom.xml

@@ -36,7 +36,9 @@
         <version.mp.config>1.3</version.mp.config>
         <!-- Versions of API dependencies -->
         <osgi-annotation.version>1.0.0</osgi-annotation.version>
-
+        <cdi.api.version>1.2</cdi.api.version>
+        <interceptor.api.version>1.1</interceptor.api.version>
+        <jaxrs.api.version>2.0</jaxrs.api.version>
     </properties>
 
     <licenses>
@@ -99,13 +101,13 @@
             <dependency>
                 <groupId>javax.enterprise</groupId>
                 <artifactId>cdi-api</artifactId>
-                <version>1.2</version>
+                <version>${cdi.api.version}</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>javax.ws.rs</groupId>
                 <artifactId>javax.ws.rs-api</artifactId>
-                <version>2.0.1</version>
+                <version>${jaxrs.api.version}</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>