fix(extensions): Extension Jars don't contain META-INF/jandex.idx f…

…ile (#3761) Unlike `kubernetes-client`/`openshift-client` modules whose jars are generated via maven jar plugin; Extension jars seem to be generated via maven bundle plugin. Add an entry for `jandex.idx` file to extension parent pom which would be included by client and model modules' `Include-Resource` properties. Signed-off-by: Rohan Kumar <rohaan@redhat.com>
fabric8io · Jan 19, 2022 · a235fc6 · a235fc6
1 parent 28151ed
commit a235fc6
Show file tree

Hide file tree

Showing 29 changed files with 34 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * Fix #3679: output additionalProperties field with correct value type for map-like fields (CRD Generator)
 * Fix #3648: `Serialization.unmarshal` fails to deserialize YAML with single document in presence of document delimiter(`---`)
 * Fix #3568: Pod file upload fails if the path is `/`
+* Fix #3761: Extension Jar packages don't contain the META-INF/jandex.idx index file
 
 #### Improvements
 * Fix #3674: allows the connect and websocket timeouts to apply to watches instead of a hardcoded timeout

diff --git a/extensions/camel-k/client/pom.xml b/extensions/camel-k/client/pom.xml
@@ -42,6 +42,7 @@
       io.fabric8.camelk.client.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       /META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter=target/classes/META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter
     </osgi.include.resources>
   </properties>

diff --git a/extensions/camel-k/model-v1/pom.xml b/extensions/camel-k/model-v1/pom.xml
@@ -40,6 +40,7 @@
       io.fabric8.camelk.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       {maven-resources},
       /camel-k-v1.properties=target/classes/model.properties
     </osgi.include.resources>

diff --git a/extensions/camel-k/model-v1alpha1/pom.xml b/extensions/camel-k/model-v1alpha1/pom.xml
@@ -38,6 +38,7 @@
             io.fabric8.camelk.*
         </osgi.export>
         <osgi.include.resources>
+          ${osgi.include.resources.default},
           {maven-resources},
           /camel-k-v1alpha1.properties=target/classes/model.properties
         </osgi.include.resources>

diff --git a/extensions/certmanager/client/pom.xml b/extensions/certmanager/client/pom.xml
@@ -43,6 +43,7 @@
       io.fabric8.certmanager.client.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       /META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter=target/classes/META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter
     </osgi.include.resources>
   </properties>

diff --git a/extensions/certmanager/model-v1/pom.xml b/extensions/certmanager/model-v1/pom.xml
@@ -39,6 +39,7 @@
       io.fabric8.certmanager.api.model.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       {maven-resources},
       /model-v1.properties=target/classes/model.properties
     </osgi.include.resources>

diff --git a/extensions/certmanager/model-v1alpha2/pom.xml b/extensions/certmanager/model-v1alpha2/pom.xml
@@ -39,6 +39,7 @@
       io.fabric8.certmanager.api.model.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       {maven-resources},
       /model-v1alpha2.properties=target/classes/model.properties
     </osgi.include.resources>

diff --git a/extensions/certmanager/model-v1alpha3/pom.xml b/extensions/certmanager/model-v1alpha3/pom.xml
@@ -39,6 +39,7 @@
       io.fabric8.certmanager.api.model.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       {maven-resources},
       /model-v1alpha3.properties=target/classes/model.properties
     </osgi.include.resources>

diff --git a/extensions/certmanager/model-v1beta1/pom.xml b/extensions/certmanager/model-v1beta1/pom.xml
@@ -39,6 +39,7 @@
       io.fabric8.certmanager.api.model.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       {maven-resources},
       /model-v1beta1.properties=target/classes/model.properties
     </osgi.include.resources>

diff --git a/extensions/chaosmesh/client/pom.xml b/extensions/chaosmesh/client/pom.xml
@@ -44,6 +44,7 @@
       io.fabric8.chaosmesh.client.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       /META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter=target/classes/META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter
     </osgi.include.resources>
   </properties>

diff --git a/extensions/chaosmesh/model/pom.xml b/extensions/chaosmesh/model/pom.xml
@@ -39,6 +39,7 @@
       io.fabric8.chaosmesh.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       {maven-resources},
       /model.properties=target/classes/model.properties
     </osgi.include.resources>

diff --git a/extensions/istio/client/pom.xml b/extensions/istio/client/pom.xml
@@ -38,6 +38,7 @@
       io.fabric8.istio.client.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       /META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter=target/classes/META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter,
     </osgi.include.resources>
   </properties>

diff --git a/extensions/istio/model-v1alpha3/pom.xml b/extensions/istio/model-v1alpha3/pom.xml
@@ -40,6 +40,7 @@
       io.fabric8.istio.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       {maven-resources},
       /model.properties=target/classes/model.properties
     </osgi.include.resources>

diff --git a/extensions/istio/model-v1beta1/pom.xml b/extensions/istio/model-v1beta1/pom.xml
@@ -40,6 +40,7 @@
       io.fabric8.istio.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       {maven-resources},
       /model.properties=target/classes/model.properties
     </osgi.include.resources>

diff --git a/extensions/knative/client/pom.xml b/extensions/knative/client/pom.xml
@@ -38,6 +38,7 @@
       io.fabric8.knative.client.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       /META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter=target/classes/META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter,
     </osgi.include.resources>
   </properties>

diff --git a/extensions/knative/model/pom.xml b/extensions/knative/model/pom.xml
@@ -40,6 +40,7 @@
       io.fabric8.knative.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       {maven-resources},
       /model.properties=target/classes/model.properties
     </osgi.include.resources>

diff --git a/extensions/pom.xml b/extensions/pom.xml
@@ -28,6 +28,12 @@
   <packaging>pom</packaging>
   <name>Fabric8 :: Kubernetes :: Extensions</name>
 
+  <properties>
+    <osgi.include.resources.default>
+      /META-INF/jandex.idx=target/classes/META-INF/jandex.idx
+    </osgi.include.resources.default>
+  </properties>
+
   <modules>
     <module>knative</module>
     <module>tekton</module>

diff --git a/extensions/service-catalog/client/pom.xml b/extensions/service-catalog/client/pom.xml
@@ -43,6 +43,7 @@
       io.fabric8.servicecatalog.client.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       /META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter=target/classes/META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter
     </osgi.include.resources>
   </properties>

diff --git a/extensions/service-catalog/model/pom.xml b/extensions/service-catalog/model/pom.xml
@@ -38,6 +38,7 @@
       io.fabric8.servicecatalog.api.model.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       {maven-resources},
       /model.properties=target/classes/model.properties
     </osgi.include.resources>

diff --git a/extensions/tekton/client/pom.xml b/extensions/tekton/client/pom.xml
@@ -42,6 +42,7 @@
       io.fabric8.tekton.client.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       /META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter=target/classes/META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter
     </osgi.include.resources>
   </properties>

diff --git a/extensions/tekton/model-triggers/pom.xml b/extensions/tekton/model-triggers/pom.xml
@@ -40,6 +40,7 @@
       io.fabric8.tekton.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       {maven-resources},
       /tekton-triggers.properties=target/classes/model.properties
     </osgi.include.resources>

diff --git a/extensions/tekton/model-v1alpha1/pom.xml b/extensions/tekton/model-v1alpha1/pom.xml
@@ -38,6 +38,7 @@
             io.fabric8.tekton.*
         </osgi.export>
         <osgi.include.resources>
+          ${osgi.include.resources.default},
           {maven-resources},
           /tekton-v1alpha1.properties=target/classes/model.properties
         </osgi.include.resources>

diff --git a/extensions/tekton/model-v1beta1/pom.xml b/extensions/tekton/model-v1beta1/pom.xml
@@ -40,6 +40,7 @@
       io.fabric8.tekton.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       {maven-resources},
       /tekton-v1beta1.properties=target/classes/model.properties
     </osgi.include.resources>

diff --git a/extensions/verticalpodautoscaler/client/pom.xml b/extensions/verticalpodautoscaler/client/pom.xml
@@ -43,6 +43,7 @@
       io.fabric8.verticalpodautoscaler.client.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       /META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter=target/classes/META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter
     </osgi.include.resources>
   </properties>

diff --git a/extensions/verticalpodautoscaler/model-v1/pom.xml b/extensions/verticalpodautoscaler/model-v1/pom.xml
@@ -39,6 +39,7 @@
       io.fabric8.verticalpodautoscaler.api.model.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       {maven-resources},
       /model-v1.properties=target/classes/model.properties
     </osgi.include.resources>

diff --git a/extensions/volcano/client/pom.xml b/extensions/volcano/client/pom.xml
@@ -43,6 +43,7 @@
       io.fabric8.volcano.client.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       /META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter=target/classes/META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter
     </osgi.include.resources>
   </properties>

diff --git a/extensions/volcano/model-v1beta1/pom.xml b/extensions/volcano/model-v1beta1/pom.xml
@@ -39,6 +39,7 @@
       io.fabric8.volcano.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       {maven-resources},
       /model-v1beta1.properties=target/classes/model.properties
     </osgi.include.resources>

diff --git a/extensions/volumesnapshot/client/pom.xml b/extensions/volumesnapshot/client/pom.xml
@@ -44,6 +44,7 @@
       io.fabric8.volumesnapshot.client.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       /META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter=target/classes/META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter
     </osgi.include.resources>
   </properties>

diff --git a/extensions/volumesnapshot/model/pom.xml b/extensions/volumesnapshot/model/pom.xml
@@ -39,6 +39,7 @@
       io.fabric8.volumesnapshot.api.model.*
     </osgi.export>
     <osgi.include.resources>
+      ${osgi.include.resources.default},
       {maven-resources},
       /model.properties=target/classes/model.properties
     </osgi.include.resources>