fix fabric8io#3923: cleaning up leftovers and adding osgi handling

shawkins · Oct 19, 2022 · 84ffd1e · 84ffd1e
1 parent 7903a9a
commit 84ffd1e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/kubernetes-model-generator/kubernetes-model-core/pom.xml b/kubernetes-model-generator/kubernetes-model-core/pom.xml
@@ -109,17 +109,20 @@
     <osgi.private>
       io.fabric8.kubernetes.internal
     </osgi.private>
+    <osgi.require-capability>
+      osgi.extender;
+	  filter:="(osgi.extender=osgi.serviceloader.processor)", 
+	  osgi.serviceloader;
+	  filter:="(osgi.serviceloader=io.fabric8.kubernetes.api.model.KubernetesResource)"; 
+	  cardinality:=multiple
+    </osgi.require-capability>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-model-common</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jandex</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

diff --git a/...r/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java b/...r/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java
@@ -48,7 +48,7 @@
     "items",
 })
 @TemplateTransformations({
-  @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true),
+    @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true),
 })
 @Version("v1")
 @Group("")

diff --git a/kubernetes-model-generator/pom.xml b/kubernetes-model-generator/pom.xml
@@ -77,6 +77,14 @@
 
     <skipTests>false</skipTests>
     <testExclusionPattern>**/*KubernetesTest.java</testExclusionPattern>
+    <osgi.require-capability>
+      osgi.extender;
+      filter:="(osgi.extender=osgi.serviceloader.registrar)"
+    </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.api.model.KubernetesResource
+    </osgi.provide-capability>
   </properties>
 
   <dependencies>

diff --git a/platforms/karaf/features/src/main/resources/feature.xml b/platforms/karaf/features/src/main/resources/feature.xml
@@ -36,7 +36,6 @@
     <bundle dependency='true'>mvn:org.ow2.asm/asm-commons/${asm.bundle.version}</bundle>
     <bundle dependency='true'>mvn:org.ow2.asm/asm-tree/${asm.bundle.version}</bundle>
     <bundle dependency='true'>mvn:org.ow2.asm/asm-util/${asm.bundle.version}</bundle>
-    <bundle dependency='true'>mvn:org.jboss/jandex/${jandex.version}</bundle>
     <bundle dependency='true'>mvn:io.fabric8/kubernetes-model-common/${project.version}</bundle>
     <bundle>mvn:io.fabric8/zjsonpatch/${zjsonpatch.version}</bundle>
 

diff --git a/pom.xml b/pom.xml
@@ -677,11 +677,6 @@
       </dependency>
 
       <!-- Dependencies -->
-      <dependency>
-        <groupId>org.jboss</groupId>
-        <artifactId>jandex</artifactId>
-        <version>${jandex.version}</version>
-      </dependency>
       <dependency>
         <groupId>io.sundr</groupId>
         <artifactId>builder-annotations</artifactId>