diff --git a/CHANGELOG.md b/CHANGELOG.md index 176aef9d522..c85197c96a6 100644 --- 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 index d0d5589cde7..9c136d6d04d 100644 --- a/extensions/camel-k/model-v1/pom.xml +++ b/extensions/camel-k/model-v1/pom.xml @@ -39,10 +39,6 @@ io.fabric8.camelk.* - - ${osgi.include.resources.default}, - /camel-k-v1.properties=target/classes/model.properties - diff --git a/extensions/camel-k/model-v1alpha1/pom.xml b/extensions/camel-k/model-v1alpha1/pom.xml index 15829fb5bf4..4c80a429f5e 100644 --- a/extensions/camel-k/model-v1alpha1/pom.xml +++ b/extensions/camel-k/model-v1alpha1/pom.xml @@ -37,10 +37,6 @@ io.fabric8.camelk.* - - ${osgi.include.resources.default}, - /camel-k-v1alpha1.properties=target/classes/model.properties - diff --git a/extensions/certmanager/model-v1/pom.xml b/extensions/certmanager/model-v1/pom.xml index 813223e0007..e2e4cf45ddb 100755 --- a/extensions/certmanager/model-v1/pom.xml +++ b/extensions/certmanager/model-v1/pom.xml @@ -38,11 +38,6 @@ io.fabric8.certmanager.api.model.* - - ${osgi.include.resources.default}, - /model-v1.properties=target/classes/model.properties - - true diff --git a/extensions/certmanager/model-v1alpha2/pom.xml b/extensions/certmanager/model-v1alpha2/pom.xml index ac998978e89..6b00b87ea96 100755 --- a/extensions/certmanager/model-v1alpha2/pom.xml +++ b/extensions/certmanager/model-v1alpha2/pom.xml @@ -38,11 +38,6 @@ io.fabric8.certmanager.api.model.* - - ${osgi.include.resources.default}, - /model-v1alpha2.properties=target/classes/model.properties - - true diff --git a/extensions/certmanager/model-v1alpha3/pom.xml b/extensions/certmanager/model-v1alpha3/pom.xml index 7dc080bbe05..1ce5c31bc0a 100755 --- a/extensions/certmanager/model-v1alpha3/pom.xml +++ b/extensions/certmanager/model-v1alpha3/pom.xml @@ -38,11 +38,6 @@ io.fabric8.certmanager.api.model.* - - ${osgi.include.resources.default}, - /model-v1alpha3.properties=target/classes/model.properties - - true diff --git a/extensions/certmanager/model-v1beta1/pom.xml b/extensions/certmanager/model-v1beta1/pom.xml index eed11fecb5c..f20ed1b2544 100755 --- a/extensions/certmanager/model-v1beta1/pom.xml +++ b/extensions/certmanager/model-v1beta1/pom.xml @@ -38,11 +38,6 @@ io.fabric8.certmanager.api.model.* - - ${osgi.include.resources.default}, - /model-v1beta1.properties=target/classes/model.properties - - true diff --git a/extensions/chaosmesh/model/pom.xml b/extensions/chaosmesh/model/pom.xml index 59f5f1092b2..ce73d16ce5f 100755 --- a/extensions/chaosmesh/model/pom.xml +++ b/extensions/chaosmesh/model/pom.xml @@ -38,11 +38,6 @@ io.fabric8.chaosmesh.* - - ${osgi.include.resources.default}, - /model.properties=target/classes/model.properties - - true diff --git a/extensions/istio/model-v1alpha3/pom.xml b/extensions/istio/model-v1alpha3/pom.xml index 4fdd6a3c242..ca577497622 100644 --- a/extensions/istio/model-v1alpha3/pom.xml +++ b/extensions/istio/model-v1alpha3/pom.xml @@ -39,10 +39,6 @@ io.fabric8.istio.* - - ${osgi.include.resources.default}, - /model.properties=target/classes/model.properties - diff --git a/extensions/istio/model-v1beta1/pom.xml b/extensions/istio/model-v1beta1/pom.xml index 4107a84d698..bc7f8a58710 100644 --- a/extensions/istio/model-v1beta1/pom.xml +++ b/extensions/istio/model-v1beta1/pom.xml @@ -39,10 +39,6 @@ io.fabric8.istio.* - - ${osgi.include.resources.default}, - /model.properties=target/classes/model.properties - diff --git a/extensions/knative/model/pom.xml b/extensions/knative/model/pom.xml index 67239bc0a2b..2159453d8c5 100644 --- a/extensions/knative/model/pom.xml +++ b/extensions/knative/model/pom.xml @@ -39,10 +39,6 @@ io.fabric8.knative.* - - ${osgi.include.resources.default}, - /model.properties=target/classes/model.properties - diff --git a/extensions/open-cluster-management/model-agent/pom.xml b/extensions/open-cluster-management/model-agent/pom.xml index 3ee126adb16..798773fb116 100755 --- a/extensions/open-cluster-management/model-agent/pom.xml +++ b/extensions/open-cluster-management/model-agent/pom.xml @@ -38,11 +38,6 @@ io.fabric8.openclustermanagement.api.model.* - - ${osgi.include.resources.default}, - /model-agent.properties=target/classes/model.properties - - true diff --git a/extensions/open-cluster-management/model-apps/pom.xml b/extensions/open-cluster-management/model-apps/pom.xml index 2494c749752..34bb4aa1d44 100755 --- a/extensions/open-cluster-management/model-apps/pom.xml +++ b/extensions/open-cluster-management/model-apps/pom.xml @@ -38,11 +38,6 @@ io.fabric8.openclustermanagement.api.model.* - - ${osgi.include.resources.default}, - /model-apps.properties=target/classes/model.properties - - true diff --git a/extensions/open-cluster-management/model-cluster/pom.xml b/extensions/open-cluster-management/model-cluster/pom.xml index 3656464d369..59326b5628b 100755 --- a/extensions/open-cluster-management/model-cluster/pom.xml +++ b/extensions/open-cluster-management/model-cluster/pom.xml @@ -38,11 +38,6 @@ io.fabric8.openclustermanagement.api.model.* - - ${osgi.include.resources.default}, - /model-cluster.properties=target/classes/model.properties - - true diff --git a/extensions/open-cluster-management/model-discovery/pom.xml b/extensions/open-cluster-management/model-discovery/pom.xml index 328f3846d7d..1effd6df375 100755 --- a/extensions/open-cluster-management/model-discovery/pom.xml +++ b/extensions/open-cluster-management/model-discovery/pom.xml @@ -38,11 +38,6 @@ io.fabric8.openclustermanagement.api.model.* - - ${osgi.include.resources.default}, - /model-discovery.properties=target/classes/model.properties - - true diff --git a/extensions/open-cluster-management/model-observability/pom.xml b/extensions/open-cluster-management/model-observability/pom.xml index 359224fbe27..ca036c5f37e 100755 --- a/extensions/open-cluster-management/model-observability/pom.xml +++ b/extensions/open-cluster-management/model-observability/pom.xml @@ -38,11 +38,6 @@ io.fabric8.openclustermanagement.api.model.* - - ${osgi.include.resources.default}, - /model-observability.properties=target/classes/model.properties - - true diff --git a/extensions/open-cluster-management/model-operator/pom.xml b/extensions/open-cluster-management/model-operator/pom.xml index 0f2b55d18f3..4970417a9e1 100755 --- a/extensions/open-cluster-management/model-operator/pom.xml +++ b/extensions/open-cluster-management/model-operator/pom.xml @@ -38,11 +38,6 @@ io.fabric8.openclustermanagement.api.model.* - - ${osgi.include.resources.default}, - /model-operator.properties=target/classes/model.properties - - true diff --git a/extensions/open-cluster-management/model-placementruleapps/pom.xml b/extensions/open-cluster-management/model-placementruleapps/pom.xml index 955022e6385..ff1da9608fd 100755 --- a/extensions/open-cluster-management/model-placementruleapps/pom.xml +++ b/extensions/open-cluster-management/model-placementruleapps/pom.xml @@ -38,11 +38,6 @@ io.fabric8.openclustermanagement.api.model.* - - ${osgi.include.resources.default}, - /model-placementruleapps.properties=target/classes/model.properties - - true diff --git a/extensions/open-cluster-management/model-policy/pom.xml b/extensions/open-cluster-management/model-policy/pom.xml index 296b3d99149..0a08315483c 100755 --- a/extensions/open-cluster-management/model-policy/pom.xml +++ b/extensions/open-cluster-management/model-policy/pom.xml @@ -38,11 +38,6 @@ io.fabric8.openclustermanagement.api.model.* - - ${osgi.include.resources.default}, - /model-policy.properties=target/classes/model.properties - - true diff --git a/extensions/open-cluster-management/model-search/pom.xml b/extensions/open-cluster-management/model-search/pom.xml index 49e5463ae8c..47ea3b729dc 100755 --- a/extensions/open-cluster-management/model-search/pom.xml +++ b/extensions/open-cluster-management/model-search/pom.xml @@ -38,11 +38,6 @@ io.fabric8.openclustermanagement.api.model.* - - ${osgi.include.resources.default}, - /model-search.properties=target/classes/model.properties - - true diff --git a/extensions/service-catalog/model/pom.xml b/extensions/service-catalog/model/pom.xml index 59bb220d24d..61acedeccdb 100755 --- a/extensions/service-catalog/model/pom.xml +++ b/extensions/service-catalog/model/pom.xml @@ -37,11 +37,6 @@ io.fabric8.servicecatalog.api.model.* - - ${osgi.include.resources.default}, - /model.properties=target/classes/model.properties - - true diff --git a/extensions/tekton/model-triggers-v1alpha1/pom.xml b/extensions/tekton/model-triggers-v1alpha1/pom.xml index 01e6acd2816..099de633ca3 100644 --- a/extensions/tekton/model-triggers-v1alpha1/pom.xml +++ b/extensions/tekton/model-triggers-v1alpha1/pom.xml @@ -39,10 +39,6 @@ io.fabric8.tekton.* - - ${osgi.include.resources.default}, - /tekton-triggers.properties=target/classes/model.properties - diff --git a/extensions/tekton/model-triggers-v1beta1/pom.xml b/extensions/tekton/model-triggers-v1beta1/pom.xml index ab6ced7d2ed..bf5c6202106 100644 --- a/extensions/tekton/model-triggers-v1beta1/pom.xml +++ b/extensions/tekton/model-triggers-v1beta1/pom.xml @@ -39,10 +39,6 @@ io.fabric8.tekton.triggers.v1beta1.* - - ${osgi.include.resources.default}, - /tekton-triggers.properties=target/classes/model.properties - diff --git a/extensions/tekton/model-v1alpha1/pom.xml b/extensions/tekton/model-v1alpha1/pom.xml index 4637c521459..c3c89aa94b2 100644 --- a/extensions/tekton/model-v1alpha1/pom.xml +++ b/extensions/tekton/model-v1alpha1/pom.xml @@ -37,10 +37,6 @@ io.fabric8.tekton.* - - ${osgi.include.resources.default}, - /tekton-v1alpha1.properties=target/classes/model.properties - diff --git a/extensions/tekton/model-v1beta1/pom.xml b/extensions/tekton/model-v1beta1/pom.xml index 7fe8e6165bc..9c06fb4927c 100644 --- a/extensions/tekton/model-v1beta1/pom.xml +++ b/extensions/tekton/model-v1beta1/pom.xml @@ -39,10 +39,6 @@ io.fabric8.tekton.* - - ${osgi.include.resources.default}, - /tekton-v1beta1.properties=target/classes/model.properties - diff --git a/extensions/verticalpodautoscaler/model-v1/pom.xml b/extensions/verticalpodautoscaler/model-v1/pom.xml index 776e4a4bec8..e8cb20b82a9 100755 --- a/extensions/verticalpodautoscaler/model-v1/pom.xml +++ b/extensions/verticalpodautoscaler/model-v1/pom.xml @@ -38,11 +38,6 @@ io.fabric8.verticalpodautoscaler.api.model.* - - ${osgi.include.resources.default}, - /model-v1.properties=target/classes/model.properties - - true diff --git a/extensions/volcano/model-v1beta1/pom.xml b/extensions/volcano/model-v1beta1/pom.xml index 5bd9015a0c4..13de4de4693 100644 --- a/extensions/volcano/model-v1beta1/pom.xml +++ b/extensions/volcano/model-v1beta1/pom.xml @@ -38,11 +38,6 @@ io.fabric8.volcano.* - - ${osgi.include.resources.default}, - /model-v1beta1.properties=target/classes/model.properties - - true diff --git a/extensions/volumesnapshot/model/pom.xml b/extensions/volumesnapshot/model/pom.xml index 2ae3d376a0c..8e420f7a7ac 100755 --- a/extensions/volumesnapshot/model/pom.xml +++ b/extensions/volumesnapshot/model/pom.xml @@ -38,11 +38,6 @@ io.fabric8.volumesnapshot.api.model.* - - ${osgi.include.resources.default}, - /model.properties=target/classes/model.properties - - true diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/pom.xml b/kubernetes-model-generator/kubernetes-model-admissionregistration/pom.xml index 1463f8c7cc7..550a2153d78 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /admissionregistration.properties=target/classes/admissionregistration.properties, - * 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 index 99c2c53f0bf..82fa7144a8d 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/pom.xml @@ -30,10 +30,6 @@ true - - ${osgi.include.resources.default}, - /apiextensions.properties=target/classes/apiextensions.properties, - * 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 index d570812b3f0..e5498661af8 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-apps/pom.xml @@ -30,10 +30,6 @@ true - - ${osgi.include.resources.default}, - /apps.properties=target/classes/apps.properties, - * 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 index 04770cb5557..56150df1ba9 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/pom.xml @@ -30,10 +30,6 @@ true - - ${osgi.include.resources.default}, - /autoscaling.properties=target/classes/autoscaling.properties, - * 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 index a37db7afef0..a520fc2ec49 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-batch/pom.xml @@ -30,10 +30,6 @@ true - - ${osgi.include.resources.default}, - /batch.properties=target/classes/batch.properties, - * 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 index 0fc04a9b7e3..be10ec70953 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-certificates/pom.xml @@ -30,10 +30,6 @@ true - - ${osgi.include.resources.default}, - /certificates.properties=target/classes/certificates.properties, - * 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 index b7f90ba5c45..86d206da9fd 100644 --- a/kubernetes-model-generator/kubernetes-model-coordination/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-coordination/pom.xml @@ -30,10 +30,6 @@ true - - ${osgi.include.resources.default}, - /coordination.properties=target/classes/coordination.properties, - * io.fabric8.kubernetes.api.model.coordination** diff --git a/kubernetes-model-generator/kubernetes-model-core/pom.xml b/kubernetes-model-generator/kubernetes-model-core/pom.xml index b4618a17424..bbb06b5d50e 100644 --- a/kubernetes-model-generator/kubernetes-model-core/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-core/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /core.properties=target/classes/core.properties, - *, io.fabric8.kubernetes.api.model.admission.v1, diff --git a/kubernetes-model-generator/kubernetes-model-discovery/pom.xml b/kubernetes-model-generator/kubernetes-model-discovery/pom.xml index 6620e016f93..43119ec593c 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-discovery/pom.xml @@ -30,10 +30,6 @@ true - - ${osgi.include.resources.default}, - /discovery.properties=target/classes/discovery.properties, - * io.fabric8.kubernetes.api.model.discovery** diff --git a/kubernetes-model-generator/kubernetes-model-events/pom.xml b/kubernetes-model-generator/kubernetes-model-events/pom.xml index d83ba4fd4bf..3b5e38f121d 100644 --- a/kubernetes-model-generator/kubernetes-model-events/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-events/pom.xml @@ -30,10 +30,6 @@ true - - ${osgi.include.resources.default}, - /events.properties=target/classes/events.properties, - * io.fabric8.kubernetes.api.model.events** diff --git a/kubernetes-model-generator/kubernetes-model-extensions/pom.xml b/kubernetes-model-generator/kubernetes-model-extensions/pom.xml index 41dcbe0582b..d2dc7171f48 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-extensions/pom.xml @@ -30,10 +30,6 @@ true - - ${osgi.include.resources.default}, - /extensions.properties=target/classes/extensions.properties, - * io.fabric8.kubernetes.api.model.extensions** diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/pom.xml b/kubernetes-model-generator/kubernetes-model-flowcontrol/pom.xml index a03f37f6051..8039b205dce 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /flowcontrol.properties=target/classes/flowcontrol.properties, - * io.fabric8.kubernetes.api.model.flowcontrol** diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/pom.xml b/kubernetes-model-generator/kubernetes-model-gatewayapi/pom.xml index 737a64fcb7d..56a3ef2b479 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /gatewayapi.properties=target/classes/gatewayapi.properties, - * io.fabric8.kubernetes.api.model.gatewayapi** diff --git a/kubernetes-model-generator/kubernetes-model-jsonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/KubernetesCoreTypeAnnotator.java b/kubernetes-model-generator/kubernetes-model-jsonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/KubernetesCoreTypeAnnotator.java index c55b5bc5cb3..fefc55921c5 100644 --- a/kubernetes-model-generator/kubernetes-model-jsonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/KubernetesCoreTypeAnnotator.java +++ b/kubernetes-model-generator/kubernetes-model-jsonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/KubernetesCoreTypeAnnotator.java @@ -23,7 +23,6 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.sun.codemodel.JAnnotationArrayMember; -import com.sun.codemodel.JAnnotationUse; import com.sun.codemodel.JDefinedClass; import com.sun.codemodel.JExpressionImpl; import com.sun.codemodel.JFieldVar; @@ -59,7 +58,6 @@ public class KubernetesCoreTypeAnnotator extends Jackson2Annotator { public static final String OPENSHIFT_PACKAGE = "openshift"; protected final Map pendingResources = new HashMap<>(); protected final Map pendingLists = new HashMap<>(); - protected String moduleName = null; private final Set handledClasses = new HashSet<>(); @@ -113,7 +111,6 @@ public void propertyOrder(JDefinedClass clazz, JsonNode propertiesNode) { final JDefinedClass resourceClass = pendingResources.remove(resourceName); if (resourceClass != null) { annotate(clazz, apiVersion, apiGroup); - addClassesToPropertyFiles(resourceClass); } else { pendingLists.put(resourceName, clazz); } @@ -121,7 +118,6 @@ public void propertyOrder(JDefinedClass clazz, JsonNode propertiesNode) { final JDefinedClass resourceListClass = pendingLists.remove(resourceName); if (resourceListClass != null) { annotate(resourceListClass, apiVersion, apiGroup); - addClassesToPropertyFiles(clazz); } else { annotate(clazz, apiVersion, apiGroup); pendingResources.put(resourceName, clazz); @@ -137,10 +133,6 @@ private void annotate(JDefinedClass clazz, String apiVersion, String apiGroup) { @Override public void propertyInclusion(JDefinedClass clazz, JsonNode schema) { - if (moduleName == null && schema.has("$module")) { - moduleName = schema.get("$module").textValue(); - } - if (schema.has("serializer")) { annotateSerde(clazz, JsonSerialize.class, schema.get("serializer").asText()); } @@ -201,35 +193,6 @@ protected void processBuildable(JDefinedClass clazz) { .param("builderPackage", "io.fabric8.kubernetes.api.builder"); } - protected void addClassesToPropertyFiles(JDefinedClass clazz) { - if (moduleName == null || moduleName.equals(getPackageCategory(clazz.getPackage().name()))) { - JAnnotationUse annotation = clazz.annotations().stream() - .filter(a -> a.getAnnotationClass().name().equals(TemplateTransformations.class.getSimpleName())).findFirst().get(); - JAnnotationArrayMember arrayMember = (JAnnotationArrayMember) annotation.getAnnotationMembers().get(ANNOTATION_VALUE); - arrayMember.annotate(TemplateTransformation.class).param(ANNOTATION_VALUE, "/manifest.vm") - .param("outputPath", (moduleName == null ? "model" : moduleName) + ".properties").param("gather", true); - } - } - - private String getPackageCategory(String packageName) { - if (packageName.isEmpty()) { - return null; - } - if (packageName.equals("io.fabric8.kubernetes.api.model")) { - return CORE_PACKAGE; - } else if (packageName.equals("io.fabric8.openshift.api.model")) { - return OPENSHIFT_PACKAGE; - } - // append whatever is after io.fabric8.kubernetes.api.model whether it's - // io.fabric8.kubernetes.api.model.apps or - // io.fabric8.kubernetes.api.model.batch.v1 - String[] parts = packageName.split("\\."); - if (parts.length < 6) { - throw new IllegalArgumentException("Invalid package name encountered: " + packageName); - } - return parts[5]; - } - private boolean hasInterfaceFields(JsonNode propertiesNode) { for (Iterator field = propertiesNode.elements(); field.hasNext();) { JsonNode propertyNode = field.next(); diff --git a/kubernetes-model-generator/kubernetes-model-metrics/pom.xml b/kubernetes-model-generator/kubernetes-model-metrics/pom.xml index 047b458f6c9..3ac389d707a 100644 --- a/kubernetes-model-generator/kubernetes-model-metrics/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-metrics/pom.xml @@ -30,10 +30,6 @@ true - - ${osgi.include.resources.default}, - /metrics.properties=target/classes/metrics.properties, - * io.fabric8.kubernetes.api.model.metrics** diff --git a/kubernetes-model-generator/kubernetes-model-networking/pom.xml b/kubernetes-model-generator/kubernetes-model-networking/pom.xml index 719af7b1e71..64a6cad6e79 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-networking/pom.xml @@ -30,10 +30,6 @@ true - - ${osgi.include.resources.default}, - /networking.properties=target/classes/networking.properties, - * io.fabric8.kubernetes.api.model.networking** diff --git a/kubernetes-model-generator/kubernetes-model-node/pom.xml b/kubernetes-model-generator/kubernetes-model-node/pom.xml index a127a71aea0..86b55f7f7d5 100644 --- a/kubernetes-model-generator/kubernetes-model-node/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-node/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /node.properties=target/classes/node.properties, - * io.fabric8.kubernetes.api.model.node** diff --git a/kubernetes-model-generator/kubernetes-model-policy/pom.xml b/kubernetes-model-generator/kubernetes-model-policy/pom.xml index 37cfc93cb2f..9003a0f13ea 100644 --- a/kubernetes-model-generator/kubernetes-model-policy/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-policy/pom.xml @@ -30,10 +30,6 @@ true - - ${osgi.include.resources.default}, - /policy.properties=target/classes/policy.properties, - * io.fabric8.kubernetes.api.model.policy** diff --git a/kubernetes-model-generator/kubernetes-model-rbac/pom.xml b/kubernetes-model-generator/kubernetes-model-rbac/pom.xml index c15ea8c3844..fabc2d82700 100644 --- a/kubernetes-model-generator/kubernetes-model-rbac/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-rbac/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /rbac.properties=target/classes/rbac.properties, - * io.fabric8.kubernetes.api.model.rbac** diff --git a/kubernetes-model-generator/kubernetes-model-scheduling/pom.xml b/kubernetes-model-generator/kubernetes-model-scheduling/pom.xml index 03cd7b7a182..b98ae83d863 100644 --- a/kubernetes-model-generator/kubernetes-model-scheduling/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-scheduling/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /scheduling.properties=target/classes/scheduling.properties, - * io.fabric8.kubernetes.api.model.scheduling** diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/pom.xml b/kubernetes-model-generator/kubernetes-model-storageclass/pom.xml index 8cb9f8e9e77..bdb35aa231a 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-storageclass/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /storage.properties=target/classes/storage.properties, - * io.fabric8.kubernetes.api.model.storage** diff --git a/kubernetes-model-generator/openshift-model-clusterautoscaling/pom.xml b/kubernetes-model-generator/openshift-model-clusterautoscaling/pom.xml index b6e670840ec..9983ef0f188 100644 --- a/kubernetes-model-generator/openshift-model-clusterautoscaling/pom.xml +++ b/kubernetes-model-generator/openshift-model-clusterautoscaling/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /clusterautoscaling.properties=target/classes/clusterautoscaling.properties - * io.fabric8.openshift.api.model.clusterautoscaling**, diff --git a/kubernetes-model-generator/openshift-model-config/pom.xml b/kubernetes-model-generator/openshift-model-config/pom.xml index 52b70e6097c..0bba2afec21 100644 --- a/kubernetes-model-generator/openshift-model-config/pom.xml +++ b/kubernetes-model-generator/openshift-model-config/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /config.properties=target/classes/config.properties - * io.fabric8.openshift.api.model.config**, diff --git a/kubernetes-model-generator/openshift-model-console/pom.xml b/kubernetes-model-generator/openshift-model-console/pom.xml index 199b5d85c34..9b1f5d36573 100644 --- a/kubernetes-model-generator/openshift-model-console/pom.xml +++ b/kubernetes-model-generator/openshift-model-console/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /console.properties=target/classes/console.properties - * io.fabric8.openshift.api.model.console**, diff --git a/kubernetes-model-generator/openshift-model-hive/pom.xml b/kubernetes-model-generator/openshift-model-hive/pom.xml index 4e18ea9bdb2..6ad5bb9f1b8 100644 --- a/kubernetes-model-generator/openshift-model-hive/pom.xml +++ b/kubernetes-model-generator/openshift-model-hive/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /hive.properties=target/classes/hive.properties - * io.fabric8.openshift.api.model.hive**, diff --git a/kubernetes-model-generator/openshift-model-machine/pom.xml b/kubernetes-model-generator/openshift-model-machine/pom.xml index 91c88242625..adca1d9fe77 100644 --- a/kubernetes-model-generator/openshift-model-machine/pom.xml +++ b/kubernetes-model-generator/openshift-model-machine/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /machine.properties=target/classes/machine.properties - * io.fabric8.openshift.api.model.machine**, diff --git a/kubernetes-model-generator/openshift-model-machineconfig/pom.xml b/kubernetes-model-generator/openshift-model-machineconfig/pom.xml index a6ab0328acc..35a2cc9fa8a 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/pom.xml +++ b/kubernetes-model-generator/openshift-model-machineconfig/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /machineconfig.properties=target/classes/machineconfig.properties - * io.fabric8.openshift.api.model.machineconfig**, diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/pom.xml b/kubernetes-model-generator/openshift-model-miscellaneous/pom.xml index 7ab0e891ef4..1bbac3b7b4c 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/pom.xml +++ b/kubernetes-model-generator/openshift-model-miscellaneous/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /miscellaneous.properties=target/classes/miscellaneous.properties - * io.fabric8.openshift.api.model.miscellaneous**, diff --git a/kubernetes-model-generator/openshift-model-monitoring/pom.xml b/kubernetes-model-generator/openshift-model-monitoring/pom.xml index dd82e1f7860..ae5ae7d9484 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/pom.xml +++ b/kubernetes-model-generator/openshift-model-monitoring/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /monitoring.properties=target/classes/monitoring.properties - * io.fabric8.openshift.api.model.monitoring**, diff --git a/kubernetes-model-generator/openshift-model-operator/pom.xml b/kubernetes-model-generator/openshift-model-operator/pom.xml index ec08db94efd..2c96d3c5bf6 100644 --- a/kubernetes-model-generator/openshift-model-operator/pom.xml +++ b/kubernetes-model-generator/openshift-model-operator/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /operator.properties=target/classes/operator.properties - * io.fabric8.openshift.api.model.operator**, diff --git a/kubernetes-model-generator/openshift-model-operatorhub/pom.xml b/kubernetes-model-generator/openshift-model-operatorhub/pom.xml index 6b5dc3d1e4c..4d71c44c9ed 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/pom.xml +++ b/kubernetes-model-generator/openshift-model-operatorhub/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /operatorhub.properties=target/classes/operatorhub.properties - * io.fabric8.openshift.api.model.operatorhub**, diff --git a/kubernetes-model-generator/openshift-model-storageversionmigrator/pom.xml b/kubernetes-model-generator/openshift-model-storageversionmigrator/pom.xml index 0a76f9b4fcd..adb33141889 100644 --- a/kubernetes-model-generator/openshift-model-storageversionmigrator/pom.xml +++ b/kubernetes-model-generator/openshift-model-storageversionmigrator/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /storageversionmigrator.properties=target/classes/storageversionmigrator.properties - * io.fabric8.openshift.api.model.storageversionmigrator**, diff --git a/kubernetes-model-generator/openshift-model-tuned/pom.xml b/kubernetes-model-generator/openshift-model-tuned/pom.xml index 58880941dfb..30720ba2b32 100644 --- a/kubernetes-model-generator/openshift-model-tuned/pom.xml +++ b/kubernetes-model-generator/openshift-model-tuned/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /tuned.properties=target/classes/tuned.properties - * io.fabric8.openshift.api.model.tuned**, diff --git a/kubernetes-model-generator/openshift-model-whereabouts/pom.xml b/kubernetes-model-generator/openshift-model-whereabouts/pom.xml index 92403882f62..77bcd039418 100644 --- a/kubernetes-model-generator/openshift-model-whereabouts/pom.xml +++ b/kubernetes-model-generator/openshift-model-whereabouts/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /whereabouts.properties=target/classes/whereabouts.properties - * io.fabric8.openshift.api.model.whereabouts**, diff --git a/kubernetes-model-generator/openshift-model/pom.xml b/kubernetes-model-generator/openshift-model/pom.xml index c955cb16994..618998637a7 100644 --- a/kubernetes-model-generator/openshift-model/pom.xml +++ b/kubernetes-model-generator/openshift-model/pom.xml @@ -32,10 +32,6 @@ true - - ${osgi.include.resources.default}, - /openshift.properties=target/classes/openshift.properties - * io.fabric8.openshift.api.model**,