[osgi] Solutions for eclipse/microprofile#33

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

api/bnd.bnd

@@ -1,8 +1,19 @@
 -exportcontents: \
     org.eclipse.microprofile.*
+
 Import-Package: \
-    javax.enterprise.util;version="[1.1,3)", \
+    javax.enterprise.util;-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=JavaInterceptor;\
+        filter:="(&(osgi.contract=JavaInterceptor)(version=${interceptor.api.version}))"
+
 Bundle-SymbolicName: org.eclipse.microprofile.fault.tolerance
 Bundle-Name: MicroProfile Fault Tolerance Bundle
 Bundle-License: Apache License, Version 2.0

pom.xml

@@ -37,6 +37,8 @@
         <autorelease>false</autorelease>
         <!-- keeping closed repos with failure - default is false because the errors are visible in the maven output, but true will leave the repo open for investigation in Sonatype Nexus -->
         <keepStagingReposOnFailure>false</keepStagingReposOnFailure>
+        <cdi.api.version>1.2</cdi.api.version>
+        <interceptor.api.version>1.1</interceptor.api.version>
     </properties>
 
     <licenses>
@@ -100,7 +102,7 @@
             <dependency>
                 <groupId>javax.enterprise</groupId>
                 <artifactId>cdi-api</artifactId>
-                <version>1.2</version>
+                <version>${cdi.api.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>