This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 8e60903de150464aaae20989715b3c27c36a11f3 Author: Antonin Stefanutti <[email protected]> AuthorDate: Thu Jun 11 14:11:12 2020 +0200 fix(api): Remove unecessary recursive CamelArtifact declaration from CamelCatalog --- deploy/crd-camel-catalog.yaml | 27 ++++++++++++++++++++++++++- pkg/apis/camel/v1/camelcatalog_types.go | 10 +++++----- pkg/apis/camel/v1/zz_generated.deepcopy.go | 2 +- 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/deploy/crd-camel-catalog.yaml b/deploy/crd-camel-catalog.yaml index 930ad71..d28ac66 100644 --- a/deploy/crd-camel-catalog.yaml +++ b/deploy/crd-camel-catalog.yaml @@ -73,7 +73,32 @@ spec: type: string type: array dependencies: - items: {} + items: + description: CamelArtifactDependency represent a maven's dependency + properties: + artifactId: + type: string + exclusions: + items: + description: CamelArtifactExclusion -- + properties: + artifactId: + type: string + groupId: + type: string + required: + - artifactId + - groupId + type: object + type: array + groupId: + type: string + version: + type: string + required: + - artifactId + - groupId + type: object type: array exclusions: items: diff --git a/pkg/apis/camel/v1/camelcatalog_types.go b/pkg/apis/camel/v1/camelcatalog_types.go index 35aa3c8..23b9e56 100644 --- a/pkg/apis/camel/v1/camelcatalog_types.go +++ b/pkg/apis/camel/v1/camelcatalog_types.go @@ -43,11 +43,11 @@ type CamelArtifactDependency struct { // CamelArtifact -- type CamelArtifact struct { CamelArtifactDependency `json:",inline" yaml:",inline"` - Schemes []CamelScheme `json:"schemes,omitempty" yaml:"schemes,omitempty"` - Languages []string `json:"languages,omitempty" yaml:"languages,omitempty"` - DataFormats []string `json:"dataformats,omitempty" yaml:"dataformats,omitempty"` - Dependencies []CamelArtifact `json:"dependencies,omitempty" yaml:"dependencies,omitempty"` - JavaTypes []string `json:"javaTypes,omitempty" yaml:"javaTypes,omitempty"` + Schemes []CamelScheme `json:"schemes,omitempty" yaml:"schemes,omitempty"` + Languages []string `json:"languages,omitempty" yaml:"languages,omitempty"` + DataFormats []string `json:"dataformats,omitempty" yaml:"dataformats,omitempty"` + Dependencies []CamelArtifactDependency `json:"dependencies,omitempty" yaml:"dependencies,omitempty"` + JavaTypes []string `json:"javaTypes,omitempty" yaml:"javaTypes,omitempty"` } // CamelLoader -- diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go b/pkg/apis/camel/v1/zz_generated.deepcopy.go index 48e1812..4daba34 100644 --- a/pkg/apis/camel/v1/zz_generated.deepcopy.go +++ b/pkg/apis/camel/v1/zz_generated.deepcopy.go @@ -268,7 +268,7 @@ func (in *CamelArtifact) DeepCopyInto(out *CamelArtifact) { } if in.Dependencies != nil { in, out := &in.Dependencies, &out.Dependencies - *out = make([]CamelArtifact, len(*in)) + *out = make([]CamelArtifactDependency, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) }
