diff --git a/config/crd/bases/camel.apache.org_builds.yaml b/config/crd/bases/camel.apache.org_builds.yaml index 0da5d52455..ee4cee516d 100644 --- a/config/crd/bases/camel.apache.org_builds.yaml +++ b/config/crd/bases/camel.apache.org_builds.yaml @@ -436,12 +436,12 @@ spec: description: Servers (auth) items: description: Server see link:https://maven.apache.org/settings.html[Maven - settings] + settings]. properties: configuration: additionalProperties: type: string - description: Properties -- + description: Properties -- . type: object id: type: string diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc index 7eb00c80f7..5137126d4f 100644 --- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc +++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc @@ -339,7 +339,7 @@ Generic raw message, typically a map containing the keys (trait parameters) and * <<#_camel_apache_org_v1_Container, Container>> -Args -- +Args -- . [cols="2,2a",options="header"] |=== @@ -1400,7 +1400,7 @@ the value to assign to the configuration (syntax may vary depending on the `Type * <<#_camel_apache_org_v1_PluginConfiguration, PluginConfiguration>> -Container -- +Container -- . [cols="2,2a",options="header"] |=== @@ -1913,7 +1913,7 @@ string * <<#_camel_apache_org_v1_PluginConfiguration, PluginConfiguration>> -ExtraDirectories -- +ExtraDirectories -- . [cols="2,2a",options="header"] |=== @@ -2021,7 +2021,7 @@ time of the attempt execution * <<#_camel_apache_org_v1_PluginExtensionConfiguration, PluginExtensionConfiguration>> -Filter -- +Filter -- . [cols="2,2a",options="header"] |=== @@ -4049,7 +4049,7 @@ See https://maven.apache.org/ref/3.8.4/maven-embedder/cli.html. * <<#_camel_apache_org_v1_ExtraDirectories, ExtraDirectories>> -Path -- +Path -- . [cols="2,2a",options="header"] |=== @@ -4087,7 +4087,7 @@ string * <<#_camel_apache_org_v1_ExtraDirectories, ExtraDirectories>> -Permission -- +Permission -- . [cols="2,2a",options="header"] |=== @@ -4318,7 +4318,7 @@ Selector allows to identify pods belonging to the pipe [#_camel_apache_org_v1_PluginConfiguration] === PluginConfiguration -PluginConfiguration see link:https://maven.apache.org/settings.html[Maven settings] +PluginConfiguration see link:https://maven.apache.org/settings.html[Maven settings]. [cols="2,2a",options="header"] |=== @@ -4363,7 +4363,7 @@ string * <<#_camel_apache_org_v1_PluginExtensions, PluginExtensions>> -PluginExtension -- +PluginExtension -- . [cols="2,2a",options="header"] |=== @@ -4394,7 +4394,7 @@ string * <<#_camel_apache_org_v1_PluginExtension, PluginExtension>> -PluginExtensionConfiguration -- +PluginExtensionConfiguration -- . [cols="2,2a",options="header"] |=== @@ -4425,7 +4425,7 @@ string * <<#_camel_apache_org_v1_PluginConfiguration, PluginConfiguration>> -PluginExtensions -- +PluginExtensions -- . [cols="2,2a",options="header"] |=== @@ -4445,7 +4445,7 @@ PluginExtensions -- [#_camel_apache_org_v1_PluginProperties] === PluginProperties(`map[string]github.com/apache/camel-k/v2/pkg/apis/camel/v1.StringOrProperties` alias) -PluginProperties -- +PluginProperties -- . [#_camel_apache_org_v1_PodCondition] @@ -4613,7 +4613,7 @@ the specification * <<#_camel_apache_org_v1_Server, Server>> * <<#_camel_apache_org_v1_StringOrProperties, StringOrProperties>> -Properties -- +Properties -- . [#_camel_apache_org_v1_PublishTask] @@ -4955,7 +4955,7 @@ used by the ImageStream * <<#_camel_apache_org_v1_MavenBuildSpec, MavenBuildSpec>> -Server see link:https://maven.apache.org/settings.html[Maven settings] +Server see link:https://maven.apache.org/settings.html[Maven settings]. [cols="2,2a",options="header"] |=== @@ -5109,7 +5109,7 @@ SpectrumTask is used to configure Spectrum. [#_camel_apache_org_v1_StringOrProperties] === StringOrProperties -StringOrProperties -- +StringOrProperties -- . [cols="2,2a",options="header"] |=== diff --git a/helm/camel-k/crds/crd-build.yaml b/helm/camel-k/crds/crd-build.yaml index 0da5d52455..ee4cee516d 100644 --- a/helm/camel-k/crds/crd-build.yaml +++ b/helm/camel-k/crds/crd-build.yaml @@ -436,12 +436,12 @@ spec: description: Servers (auth) items: description: Server see link:https://maven.apache.org/settings.html[Maven - settings] + settings]. properties: configuration: additionalProperties: type: string - description: Properties -- + description: Properties -- . type: object id: type: string diff --git a/pkg/apis/camel/v1/maven_types.go b/pkg/apis/camel/v1/maven_types.go index 9cc27ef465..1a017c5c6b 100644 --- a/pkg/apis/camel/v1/maven_types.go +++ b/pkg/apis/camel/v1/maven_types.go @@ -91,7 +91,7 @@ type MavenArtifact struct { Version string `json:"version,omitempty" yaml:"version,omitempty" xml:"version,omitempty"` } -// Server see link:https://maven.apache.org/settings.html[Maven settings] +// Server see link:https://maven.apache.org/settings.html[Maven settings]. type Server struct { XMLName xml.Name `xml:"server" json:"-"` ID string `xml:"id,omitempty" json:"id,omitempty"` @@ -100,19 +100,19 @@ type Server struct { Configuration Properties `xml:"configuration,omitempty" json:"configuration,omitempty"` } -// StringOrProperties -- +// StringOrProperties -- . type StringOrProperties struct { Value string `xml:",chardata" json:"-"` Properties Properties `xml:"properties,omitempty" json:"properties,omitempty"` } -// Properties -- +// Properties -- . type Properties map[string]string -// PluginProperties -- +// PluginProperties -- . type PluginProperties map[string]StringOrProperties -// PluginConfiguration see link:https://maven.apache.org/settings.html[Maven settings] +// PluginConfiguration see link:https://maven.apache.org/settings.html[Maven settings]. type PluginConfiguration struct { Container Container `xml:"container" json:"container"` AllowInsecureRegistries string `xml:"allowInsecureRegistries" json:"allowInsecureRegistries"` @@ -120,54 +120,54 @@ type PluginConfiguration struct { PluginExtensions PluginExtensions `xml:"pluginExtensions" json:"pluginExtensions"` } -// Container -- +// Container -- . type Container struct { Entrypoint string `xml:"entrypoint" json:"entrypoint"` Args Args `xml:"args" json:"args"` } -// Args -- +// Args -- . type Args struct { Arg string `xml:"arg" json:"arg"` } -// ExtraDirectories -- +// ExtraDirectories -- . type ExtraDirectories struct { Paths []Path `xml:"paths>path" json:"paths>path"` Permissions []Permission `xml:"permissions>permission,omitempty" json:"permissions>permission,omitempty"` } -// Path -- +// Path -- . type Path struct { From string `xml:"from" json:"from"` Into string `xml:"into" json:"into"` Excludes []string `xml:"excludes>exclude,omitempty" json:"excludes>exclude,omitempty"` } -// Permission -- +// Permission -- . type Permission struct { File string `xml:"file" json:"file"` Mode string `xml:"mode" json:"mode"` } -// PluginExtensions -- +// PluginExtensions -- . type PluginExtensions struct { PluginExtension PluginExtension `xml:"pluginExtension" json:"pluginExtension"` } -// PluginExtension -- +// PluginExtension -- . type PluginExtension struct { Implementation string `xml:"implementation" json:"implementation"` Configuration PluginExtensionConfiguration `xml:"configuration" json:"configuration"` } -// PluginExtensionConfiguration -- +// PluginExtensionConfiguration -- . type PluginExtensionConfiguration struct { Filters []Filter `xml:"filters>Filter" json:"filters>Filter"` Implementation string `xml:"implementation,attr" json:"_implementation"` } -// Filter -- +// Filter -- . type Filter struct { Glob string `xml:"glob" json:"glob"` ToLayer string `xml:"toLayer,omitempty" json:"toLayer,omitempty"`