fix (osgi): Add Provide-Capability field in extension bundle configur…

…ations + Add Provide-Capability field in openshift-client + extensions bundle configurations in order to resolve SPIFly related NPE (reported in #3890) Signed-off-by: Rohan Kumar <[email protected]>
fabric8io · Oct 5, 2022 · e899d91 · e899d91
1 parent 21b5014
commit e899d91
Show file tree

Hide file tree

Showing 16 changed files with 73 additions and 0 deletions.
diff --git a/extensions/camel-k/client/pom.xml b/extensions/camel-k/client/pom.xml
@@ -33,6 +33,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)"
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.camelk.client.*,

diff --git a/extensions/certmanager/client/pom.xml b/extensions/certmanager/client/pom.xml
@@ -34,6 +34,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)"
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.certmanager.client.*,

diff --git a/extensions/chaosmesh/client/pom.xml b/extensions/chaosmesh/client/pom.xml
@@ -35,6 +35,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)"
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.chaosmesh.client.*,

diff --git a/extensions/istio/client/pom.xml b/extensions/istio/client/pom.xml
@@ -29,6 +29,14 @@
   <name>Fabric8 :: Istio :: Client</name>
 
   <properties>
+    <osgi.require-capability>
+      osgi.extender;
+      filter:="(osgi.extender=osgi.serviceloader.registrar)"
+    </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.istio.client.*,

diff --git a/extensions/knative/client/pom.xml b/extensions/knative/client/pom.xml
@@ -29,6 +29,14 @@
   <name>Fabric8 :: Knative :: Client</name>
 
   <properties>
+    <osgi.require-capability>
+      osgi.extender;
+      filter:="(osgi.extender=osgi.serviceloader.registrar)"
+    </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.knative.client.*,

diff --git a/extensions/open-cluster-management/client/pom.xml b/extensions/open-cluster-management/client/pom.xml
@@ -35,6 +35,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)"
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.openclustermanagement.client.*,

diff --git a/extensions/service-catalog/client/pom.xml b/extensions/service-catalog/client/pom.xml
@@ -34,6 +34,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)"
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.servicecatalog.client.*,

diff --git a/extensions/tekton/client/pom.xml b/extensions/tekton/client/pom.xml
@@ -33,6 +33,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)"
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.tekton.client.*,

diff --git a/extensions/verticalpodautoscaler/client/pom.xml b/extensions/verticalpodautoscaler/client/pom.xml
@@ -34,6 +34,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)"
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.verticalpodautoscaler.client.*,

diff --git a/extensions/volcano/client/pom.xml b/extensions/volcano/client/pom.xml
@@ -34,6 +34,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)"
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.volcano.client.*,

diff --git a/extensions/volumesnapshot/client/pom.xml b/extensions/volumesnapshot/client/pom.xml
@@ -35,6 +35,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)"
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.volumesnapshot.client.*,

diff --git a/httpclient-jdk/pom.xml b/httpclient-jdk/pom.xml
@@ -34,6 +34,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)",
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.http.HttpClient$Factory
+    </osgi.provide-capability>
     <osgi.import>
       !android.util*,
       *,

diff --git a/httpclient-jetty/pom.xml b/httpclient-jetty/pom.xml
@@ -34,6 +34,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)",
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.http.HttpClient$Factory
+    </osgi.provide-capability>
     <osgi.import>
       !android.util*,
       *,

diff --git a/httpclient-okhttp/pom.xml b/httpclient-okhttp/pom.xml
@@ -33,6 +33,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)",
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.http.HttpClient$Factory
+    </osgi.provide-capability>
     <osgi.import>
       !android.util*,
       *,

diff --git a/kubernetes-client/pom.xml b/kubernetes-client/pom.xml
@@ -33,6 +33,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.processor)",
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.ServiceToURLProvider
+    </osgi.provide-capability>
     <osgi.import>
       !android.util*,
       *,

diff --git a/openshift-client/pom.xml b/openshift-client/pom.xml
@@ -33,6 +33,11 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)"
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter,
+      io.fabric8.kubernetes.client.ServiceToURLProvider
+    </osgi.provide-capability>
     <osgi.import>
       !org.junit*,
       *