fix #4515: removing the legacy usage of model.properties

fabric8io · Nov 21, 2022 · 1f8e3fe · 1f8e3fe
1 parent 97f53c7
commit 1f8e3fe
Show file tree

Hide file tree

Showing 63 changed files with 1 addition and 299 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@
 * Fix #4582: updated [client.secrets] createOrReplace document
 
 #### _**Note**_: Breaking changes in the API
+* Fix #4515: files located at the root of jars named model.properties, e.g. core.properties, have been removed
 
 ### 6.2.0 (2022-10-20)
 

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

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

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

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

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

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

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

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

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

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

diff --git a/extensions/open-cluster-management/model-agent/pom.xml b/extensions/open-cluster-management/model-agent/pom.xml
@@ -38,11 +38,6 @@
     <osgi.export>
       io.fabric8.openclustermanagement.api.model.*
     </osgi.export>
-    <osgi.include.resources>
-      ${osgi.include.resources.default},
-      /model-agent.properties=target/classes/model.properties
-    </osgi.include.resources>
-
     <clone-kube>true</clone-kube>
   </properties>
 

diff --git a/extensions/open-cluster-management/model-apps/pom.xml b/extensions/open-cluster-management/model-apps/pom.xml
@@ -38,11 +38,6 @@
     <osgi.export>
       io.fabric8.openclustermanagement.api.model.*
     </osgi.export>
-    <osgi.include.resources>
-      ${osgi.include.resources.default},
-      /model-apps.properties=target/classes/model.properties
-    </osgi.include.resources>
-
     <clone-kube>true</clone-kube>
   </properties>
 

diff --git a/extensions/open-cluster-management/model-cluster/pom.xml b/extensions/open-cluster-management/model-cluster/pom.xml
@@ -38,11 +38,6 @@
     <osgi.export>
       io.fabric8.openclustermanagement.api.model.*
     </osgi.export>
-    <osgi.include.resources>
-      ${osgi.include.resources.default},
-      /model-cluster.properties=target/classes/model.properties
-    </osgi.include.resources>
-
     <clone-kube>true</clone-kube>
   </properties>
 

diff --git a/extensions/open-cluster-management/model-discovery/pom.xml b/extensions/open-cluster-management/model-discovery/pom.xml
@@ -38,11 +38,6 @@
     <osgi.export>
       io.fabric8.openclustermanagement.api.model.*
     </osgi.export>
-    <osgi.include.resources>
-      ${osgi.include.resources.default},
-      /model-discovery.properties=target/classes/model.properties
-    </osgi.include.resources>
-
     <clone-kube>true</clone-kube>
   </properties>
 

diff --git a/extensions/open-cluster-management/model-observability/pom.xml b/extensions/open-cluster-management/model-observability/pom.xml
@@ -38,11 +38,6 @@
     <osgi.export>
       io.fabric8.openclustermanagement.api.model.*
     </osgi.export>
-    <osgi.include.resources>
-      ${osgi.include.resources.default},
-      /model-observability.properties=target/classes/model.properties
-    </osgi.include.resources>
-
     <clone-kube>true</clone-kube>
   </properties>
 

diff --git a/extensions/open-cluster-management/model-operator/pom.xml b/extensions/open-cluster-management/model-operator/pom.xml
@@ -38,11 +38,6 @@
     <osgi.export>
       io.fabric8.openclustermanagement.api.model.*
     </osgi.export>
-    <osgi.include.resources>
-      ${osgi.include.resources.default},
-      /model-operator.properties=target/classes/model.properties
-    </osgi.include.resources>
-
     <clone-kube>true</clone-kube>
   </properties>
 

diff --git a/extensions/open-cluster-management/model-placementruleapps/pom.xml b/extensions/open-cluster-management/model-placementruleapps/pom.xml
@@ -38,11 +38,6 @@
     <osgi.export>
       io.fabric8.openclustermanagement.api.model.*
     </osgi.export>
-    <osgi.include.resources>
-      ${osgi.include.resources.default},
-      /model-placementruleapps.properties=target/classes/model.properties
-    </osgi.include.resources>
-
     <clone-kube>true</clone-kube>
   </properties>
 

diff --git a/extensions/open-cluster-management/model-policy/pom.xml b/extensions/open-cluster-management/model-policy/pom.xml
@@ -38,11 +38,6 @@
     <osgi.export>
       io.fabric8.openclustermanagement.api.model.*
     </osgi.export>
-    <osgi.include.resources>
-      ${osgi.include.resources.default},
-      /model-policy.properties=target/classes/model.properties
-    </osgi.include.resources>
-
     <clone-kube>true</clone-kube>
   </properties>
 

diff --git a/extensions/open-cluster-management/model-search/pom.xml b/extensions/open-cluster-management/model-search/pom.xml
@@ -38,11 +38,6 @@
     <osgi.export>
       io.fabric8.openclustermanagement.api.model.*
     </osgi.export>
-    <osgi.include.resources>
-      ${osgi.include.resources.default},
-      /model-search.properties=target/classes/model.properties
-    </osgi.include.resources>
-
     <clone-kube>true</clone-kube>
   </properties>
 

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

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

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

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

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

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

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

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

diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/pom.xml b/kubernetes-model-generator/kubernetes-model-admissionregistration/pom.xml
@@ -32,10 +32,6 @@
 
   <properties>
     <clone-kube>true</clone-kube>
-    <osgi.include.resources>
-      ${osgi.include.resources.default},
-      /admissionregistration.properties=target/classes/admissionregistration.properties,
-    </osgi.include.resources>
     <osgi.import>*</osgi.import>
     <osgi.export>
       io.fabric8.kubernetes.api.model.admission**,

diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/pom.xml b/kubernetes-model-generator/kubernetes-model-apiextensions/pom.xml
@@ -30,10 +30,6 @@
 
   <properties>
     <clone-kube>true</clone-kube>
-    <osgi.include.resources>
-      ${osgi.include.resources.default},
-      /apiextensions.properties=target/classes/apiextensions.properties,
-    </osgi.include.resources>
     <osgi.import>*</osgi.import>
     <osgi.export>
       io.fabric8.kubernetes.api.model.apiextensions**

diff --git a/kubernetes-model-generator/kubernetes-model-apps/pom.xml b/kubernetes-model-generator/kubernetes-model-apps/pom.xml
@@ -30,10 +30,6 @@
 
   <properties>
     <clone-kube>true</clone-kube>
-    <osgi.include.resources>
-      ${osgi.include.resources.default},
-      /apps.properties=target/classes/apps.properties,
-    </osgi.include.resources>
     <osgi.import>*</osgi.import>
     <osgi.export>
       io.fabric8.kubernetes.api.model.apps**

diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/pom.xml b/kubernetes-model-generator/kubernetes-model-autoscaling/pom.xml
@@ -30,10 +30,6 @@
 
   <properties>
     <clone-kube>true</clone-kube>
-    <osgi.include.resources>
-      ${osgi.include.resources.default},
-      /autoscaling.properties=target/classes/autoscaling.properties,
-    </osgi.include.resources>
     <osgi.import>*</osgi.import>
     <osgi.export>
       io.fabric8.kubernetes.api.model.autoscaling**

diff --git a/kubernetes-model-generator/kubernetes-model-batch/pom.xml b/kubernetes-model-generator/kubernetes-model-batch/pom.xml
@@ -30,10 +30,6 @@
 
   <properties>
     <clone-kube>true</clone-kube>
-    <osgi.include.resources>
-      ${osgi.include.resources.default},
-      /batch.properties=target/classes/batch.properties,
-    </osgi.include.resources>
     <osgi.import>*</osgi.import>
     <osgi.export>
       io.fabric8.kubernetes.api.model.batch**

diff --git a/kubernetes-model-generator/kubernetes-model-certificates/pom.xml b/kubernetes-model-generator/kubernetes-model-certificates/pom.xml
@@ -30,10 +30,6 @@
 
   <properties>
     <clone-kube>true</clone-kube>
-    <osgi.include.resources>
-      ${osgi.include.resources.default},
-      /certificates.properties=target/classes/certificates.properties,
-    </osgi.include.resources>
     <osgi.import>*</osgi.import>
     <osgi.export>
       io.fabric8.kubernetes.api.model.certificates**

diff --git a/kubernetes-model-generator/kubernetes-model-coordination/pom.xml b/kubernetes-model-generator/kubernetes-model-coordination/pom.xml
@@ -30,10 +30,6 @@
 
   <properties>
     <clone-kube>true</clone-kube>
-    <osgi.include.resources>
-      ${osgi.include.resources.default},
-      /coordination.properties=target/classes/coordination.properties,
-    </osgi.include.resources>
     <osgi.import>*</osgi.import>
     <osgi.export>
       io.fabric8.kubernetes.api.model.coordination**