[osgi] Solutions for microprofile/microprofile#33

Signed-off-by: Raymond Auge <raymond.auge@liferay.com>

Author: Raymond Auge

api/bnd.bnd

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

pom.xml

@@ -33,6 +33,9 @@
         <checkstyle.version>2.17</checkstyle.version>
         <checkstyle.methodNameFormat>^_?[a-z][a-zA-Z0-9]*$</checkstyle.methodNameFormat>
         <autorelease>false</autorelease>
+        <cdi.api.version>1.1</cdi.api.version>
+        <inject.api.version>1</inject.api.version>
+        <jsonp.api.version>1.0</jsonp.api.version>
     </properties>
 
     <licenses>
@@ -93,11 +96,14 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>javax</groupId>
-                <artifactId>javaee-api</artifactId>
-                <type>pom</type>
-                <version>7.0</version>
-                <scope>import</scope>
+                <groupId>javax.enterprise</groupId>
+                <artifactId>cdi-api</artifactId>
+                <version>${cdi.api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.json</groupId>
+                <artifactId>json-api</artifactId>
+                <version>${jsonp.api.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.arquillian</groupId>