fix(extensions): Extension Jars don't contain META-INF/jandex.idx file (#3761)

CHANGELOG.md

@@ -12,6 +12,7 @@
 * 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 #3756 prevent modifications by standard operations to user objects
+* 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

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>

extensions/camel-k/model-v1/pom.xml

@@ -40,7 +40,7 @@
       io.fabric8.camelk.*
     </osgi.export>
     <osgi.include.resources>
-      {maven-resources},
+      ${osgi.include.resources.default},
       /camel-k-v1.properties=target/classes/model.properties
     </osgi.include.resources>
   </properties>

extensions/camel-k/model-v1alpha1/pom.xml

@@ -38,7 +38,7 @@
             io.fabric8.camelk.*
         </osgi.export>
         <osgi.include.resources>
-          {maven-resources},
+          ${osgi.include.resources.default},
           /camel-k-v1alpha1.properties=target/classes/model.properties
         </osgi.include.resources>
     </properties>

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>

extensions/certmanager/model-v1/pom.xml

@@ -39,7 +39,7 @@
       io.fabric8.certmanager.api.model.*
     </osgi.export>
     <osgi.include.resources>
-      {maven-resources},
+      ${osgi.include.resources.default},
       /model-v1.properties=target/classes/model.properties
     </osgi.include.resources>
 

extensions/certmanager/model-v1alpha2/pom.xml

@@ -39,7 +39,7 @@
       io.fabric8.certmanager.api.model.*
     </osgi.export>
     <osgi.include.resources>
-      {maven-resources},
+      ${osgi.include.resources.default},
       /model-v1alpha2.properties=target/classes/model.properties
     </osgi.include.resources>
 

extensions/certmanager/model-v1alpha3/pom.xml

@@ -39,7 +39,7 @@
       io.fabric8.certmanager.api.model.*
     </osgi.export>
     <osgi.include.resources>
-      {maven-resources},
+      ${osgi.include.resources.default},
       /model-v1alpha3.properties=target/classes/model.properties
     </osgi.include.resources>
 

extensions/certmanager/model-v1beta1/pom.xml

@@ -39,7 +39,7 @@
       io.fabric8.certmanager.api.model.*
     </osgi.export>
     <osgi.include.resources>
-      {maven-resources},
+      ${osgi.include.resources.default},
       /model-v1beta1.properties=target/classes/model.properties
     </osgi.include.resources>
 

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>

extensions/chaosmesh/model/pom.xml

@@ -39,7 +39,7 @@
       io.fabric8.chaosmesh.*
     </osgi.export>
     <osgi.include.resources>
-      {maven-resources},
+      ${osgi.include.resources.default},
       /model.properties=target/classes/model.properties
     </osgi.include.resources>
 

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>

extensions/istio/model-v1alpha3/pom.xml

@@ -40,7 +40,7 @@
       io.fabric8.istio.*
     </osgi.export>
     <osgi.include.resources>
-      {maven-resources},
+      ${osgi.include.resources.default},
       /model.properties=target/classes/model.properties
     </osgi.include.resources>
   </properties>

extensions/istio/model-v1beta1/pom.xml

@@ -40,7 +40,7 @@
       io.fabric8.istio.*
     </osgi.export>
     <osgi.include.resources>
-      {maven-resources},
+      ${osgi.include.resources.default},
       /model.properties=target/classes/model.properties
     </osgi.include.resources>
   </properties>

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>

extensions/knative/model/pom.xml

@@ -40,7 +40,7 @@
       io.fabric8.knative.*
     </osgi.export>
     <osgi.include.resources>
-      {maven-resources},
+      ${osgi.include.resources.default},
       /model.properties=target/classes/model.properties
     </osgi.include.resources>
   </properties>

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>

extensions/service-catalog/model/pom.xml

@@ -38,7 +38,7 @@
       io.fabric8.servicecatalog.api.model.*
     </osgi.export>
     <osgi.include.resources>
-      {maven-resources},
+      ${osgi.include.resources.default},
       /model.properties=target/classes/model.properties
     </osgi.include.resources>
 

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>

extensions/tekton/model-triggers/pom.xml

@@ -40,7 +40,7 @@
       io.fabric8.tekton.*
     </osgi.export>
     <osgi.include.resources>
-      {maven-resources},
+      ${osgi.include.resources.default},
       /tekton-triggers.properties=target/classes/model.properties
     </osgi.include.resources>
   </properties>

extensions/tekton/model-v1alpha1/pom.xml

@@ -38,7 +38,7 @@
             io.fabric8.tekton.*
         </osgi.export>
         <osgi.include.resources>
-          {maven-resources},
+          ${osgi.include.resources.default},
           /tekton-v1alpha1.properties=target/classes/model.properties
         </osgi.include.resources>
     </properties>

extensions/tekton/model-v1beta1/pom.xml

@@ -40,7 +40,7 @@
       io.fabric8.tekton.*
     </osgi.export>
     <osgi.include.resources>
-      {maven-resources},
+      ${osgi.include.resources.default},
       /tekton-v1beta1.properties=target/classes/model.properties
     </osgi.include.resources>
   </properties>

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>

extensions/verticalpodautoscaler/model-v1/pom.xml

@@ -39,7 +39,7 @@
       io.fabric8.verticalpodautoscaler.api.model.*
     </osgi.export>
     <osgi.include.resources>
-      {maven-resources},
+      ${osgi.include.resources.default},
       /model-v1.properties=target/classes/model.properties
     </osgi.include.resources>
 

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>

extensions/volcano/model-v1beta1/pom.xml

@@ -39,7 +39,7 @@
       io.fabric8.volcano.*
     </osgi.export>
     <osgi.include.resources>
-      {maven-resources},
+      ${osgi.include.resources.default},
       /model-v1beta1.properties=target/classes/model.properties
     </osgi.include.resources>
 

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>

extensions/volumesnapshot/model/pom.xml

@@ -39,7 +39,7 @@
       io.fabric8.volumesnapshot.api.model.*
     </osgi.export>
     <osgi.include.resources>
-      {maven-resources},
+      ${osgi.include.resources.default},
       /model.properties=target/classes/model.properties
     </osgi.include.resources>
 

pom.xml

@@ -166,12 +166,15 @@
     <osgi.bundles />
     <osgi.activator />
     <osgi.export.service />
-    <osgi.include.resources>{maven-resources}</osgi.include.resources>
+    <osgi.include.resources.default>
+      {maven-resources},
+      /META-INF/jandex.idx=target/classes/META-INF/jandex.idx
+    </osgi.include.resources.default>
+    <osgi.include.resources>${osgi.include.resources.default}</osgi.include.resources>
     <karaf.itest.skip>false</karaf.itest.skip>
     <project.build.outputTimestamp>2020-11-14T12:24:00Z</project.build.outputTimestamp>
     <validation-api.version>2.0.1.Final</validation-api.version>
   </properties>
-
   <modules>
     <module>model-annotator</module>
     <module>kubernetes-model-generator</module>