[osgi] Solutions for eclipse/microprofile#33

Signed-off-by: Raymond Auge <[email protected]>
rotty3000 · Aug 30, 2018 · 1beb751 · 1beb751
1 parent 05c282f
commit 1beb751
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 14 deletions.
diff --git a/api/bnd.bnd b/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
diff --git a/api/pom.xml b/api/pom.xml
@@ -74,7 +74,7 @@
             <plugin>
                 <groupId>biz.aQute.bnd</groupId>
                 <artifactId>bnd-maven-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.5.0</version>
 
                 <executions>
                     <execution>

diff --git a/api/src/main/java/org/eclipse/microprofile/config/spi/ConfigProviderResolver.java b/api/src/main/java/org/eclipse/microprofile/config/spi/ConfigProviderResolver.java
@@ -146,19 +146,27 @@ public ClassLoader run() {
         ConfigProviderResolver instance = loadSpi(parentcl);
 
         if (instance == null) {
-            ServiceLoader<ConfigProviderResolver> sl = ServiceLoader.load(
-                            ConfigProviderResolver.class, cl);
-            for (ConfigProviderResolver spi : sl) {
-                if (instance != null) {
-                    throw new IllegalStateException(
-                                    "Multiple ConfigResolverProvider implementations found: "
-                                                    + spi.getClass().getName() + " and "
-                                                    + instance.getClass().getName());
-                }
-                else {
-                    instance = spi;
+            Thread thread = Thread.currentThread();
+            ClassLoader original = thread.getContextClassLoader();
+
+            try {
+                thread.setContextClassLoader(cl);
+
+                for (ConfigProviderResolver spi : ServiceLoader.load(ConfigProviderResolver.class)) {
+                    if (instance != null) {
+                        throw new IllegalStateException(
+                            "Multiple ConfigResolverProvider implementations found: "
+                            + spi.getClass().getName() + " and "
+                            + instance.getClass().getName());
+                    }
+                    else {
+                        instance = spi;
+                    }
                 }
             }
+            finally {
+                thread.setContextClassLoader(original);
+            }
         }
         return instance;
     }

diff --git a/pom.xml b/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>1.1</cdi.api.version>
+        <inject.api.version>1.0</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>