This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 05e68fa171ae05ffa7231ddd18ea8e9e3de99cd0 Author: nicolaferraro <[email protected]> AuthorDate: Tue Nov 10 13:21:24 2020 +0100 Fix #1562: rename modules to new names --- build/maven/pom-runtime.xml | 4 +- deploy/traits.yaml | 2 +- .../attachments/schema/integration-schema.json | 72 ++++++++++++++++++++++ .../assets/attachments/schema/kamelet-schema.json | 36 +++++++++++ docs/modules/traits/pages/cron.adoc | 2 +- pkg/trait/cron.go | 2 +- pkg/trait/knative.go | 4 +- 7 files changed, 115 insertions(+), 7 deletions(-) diff --git a/build/maven/pom-runtime.xml b/build/maven/pom-runtime.xml index c1b4488..a38ead5 100644 --- a/build/maven/pom-runtime.xml +++ b/build/maven/pom-runtime.xml @@ -65,12 +65,12 @@ </dependency> <dependency> <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-runtime-core</artifactId> + <artifactId>camel-k-core</artifactId> <version>${runtime.version}</version> </dependency> <dependency> <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-runtime-knative</artifactId> + <artifactId>camel-k-knative</artifactId> <version>${runtime.version}</version> </dependency> <dependency> diff --git a/deploy/traits.yaml b/deploy/traits.yaml index 8d45734..5f6dbd8 100755 --- a/deploy/traits.yaml +++ b/deploy/traits.yaml @@ -149,7 +149,7 @@ traits: description: The CronJob schedule for the whole integration. If multiple routes are declared, they must have the same schedule for thismechanism to work correctly. - name: components type: string - description: 'A comma separated list of the Camel components that need to be customized in order for them to work when the schedule is triggered externally by Kubernetes.A specific customizer is activated for each specified component. E.g. for the `timer` component, the `cron-timer` customizer isactivated (it''s present in the `org.apache.camel.k:camel-k-runtime-cron` library).Supported components are currently: `cron`, `timer` and `quartz`.' + description: 'A comma separated list of the Camel components that need to be customized in order for them to work when the schedule is triggered externally by Kubernetes.A specific customizer is activated for each specified component. E.g. for the `timer` component, the `cron-timer` customizer isactivated (it''s present in the `org.apache.camel.k:camel-k-cron` library).Supported components are currently: `cron`, `timer` and `quartz`.' - name: fallback type: bool description: Use the default Camel implementation of the `cron` endpoint (`quartz`) instead of trying to materialize the integrationas Kubernetes CronJob. diff --git a/docs/modules/ROOT/assets/attachments/schema/integration-schema.json b/docs/modules/ROOT/assets/attachments/schema/integration-schema.json index f8358a7..7cfac05 100644 --- a/docs/modules/ROOT/assets/attachments/schema/integration-schema.json +++ b/docs/modules/ROOT/assets/attachments/schema/integration-schema.json @@ -1046,6 +1046,9 @@ }, "org.apache.camel.k.loader.yaml.parser.RouteStepParser$Definition": { "properties": { + "auto-startup": { + "type": "boolean" + }, "from": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.RouteStepParser$From" }, @@ -3006,6 +3009,9 @@ "id": { "type": "string" }, + "max-decompressed-size": { + "type": "string" + }, "preserve-path-elements": { "type": "string" }, @@ -3401,6 +3407,9 @@ "id": { "type": "string" }, + "max-decompressed-size": { + "type": "string" + }, "preserve-path-elements": { "type": "string" }, @@ -3552,6 +3561,16 @@ "id": { "type": "string" }, + "option": { + "enum": [ + "DEFAULT_PATH_LEAF_TO_NULL", + "ALWAYS_RETURN_LIST", + "AS_PATH_LIST", + "SUPPRESS_EXCEPTIONS", + "REQUIRE_PROPERTIES" + ], + "type": "string" + }, "result-type": { "type": "string" }, @@ -3614,6 +3633,14 @@ "ref": { "type": "string" }, + "scope": { + "enum": [ + "Singleton", + "Request", + "Prototype" + ], + "type": "string" + }, "trim": { "type": "string" } @@ -3822,6 +3849,12 @@ "type": "string" }, "mode": { + "enum": [ + "i", + "w", + "u", + "t" + ], "type": "string" }, "trim": { @@ -3863,6 +3896,9 @@ "object-model": { "type": "string" }, + "pre-compile": { + "type": "string" + }, "result-type": { "enum": [ "NUMBER", @@ -5243,6 +5279,9 @@ }, "org.apache.camel.k.loader.yaml.parser.RouteStepParser$Definition": { "properties": { + "auto-startup": { + "type": "boolean" + }, "from": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.RouteStepParser$From" }, @@ -7203,6 +7242,9 @@ "id": { "type": "string" }, + "max-decompressed-size": { + "type": "string" + }, "preserve-path-elements": { "type": "string" }, @@ -7598,6 +7640,9 @@ "id": { "type": "string" }, + "max-decompressed-size": { + "type": "string" + }, "preserve-path-elements": { "type": "string" }, @@ -7749,6 +7794,16 @@ "id": { "type": "string" }, + "option": { + "enum": [ + "DEFAULT_PATH_LEAF_TO_NULL", + "ALWAYS_RETURN_LIST", + "AS_PATH_LIST", + "SUPPRESS_EXCEPTIONS", + "REQUIRE_PROPERTIES" + ], + "type": "string" + }, "result-type": { "type": "string" }, @@ -7811,6 +7866,14 @@ "ref": { "type": "string" }, + "scope": { + "enum": [ + "Singleton", + "Request", + "Prototype" + ], + "type": "string" + }, "trim": { "type": "string" } @@ -8019,6 +8082,12 @@ "type": "string" }, "mode": { + "enum": [ + "i", + "w", + "u", + "t" + ], "type": "string" }, "trim": { @@ -8060,6 +8129,9 @@ "object-model": { "type": "string" }, + "pre-compile": { + "type": "string" + }, "result-type": { "enum": [ "NUMBER", diff --git a/docs/modules/ROOT/assets/attachments/schema/kamelet-schema.json b/docs/modules/ROOT/assets/attachments/schema/kamelet-schema.json index 4ea5bf7..d87e8ce 100644 --- a/docs/modules/ROOT/assets/attachments/schema/kamelet-schema.json +++ b/docs/modules/ROOT/assets/attachments/schema/kamelet-schema.json @@ -1046,6 +1046,9 @@ }, "org.apache.camel.k.loader.yaml.parser.RouteStepParser$Definition": { "properties": { + "auto-startup": { + "type": "boolean" + }, "from": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.RouteStepParser$From" }, @@ -3006,6 +3009,9 @@ "id": { "type": "string" }, + "max-decompressed-size": { + "type": "string" + }, "preserve-path-elements": { "type": "string" }, @@ -3401,6 +3407,9 @@ "id": { "type": "string" }, + "max-decompressed-size": { + "type": "string" + }, "preserve-path-elements": { "type": "string" }, @@ -3552,6 +3561,16 @@ "id": { "type": "string" }, + "option": { + "enum": [ + "DEFAULT_PATH_LEAF_TO_NULL", + "ALWAYS_RETURN_LIST", + "AS_PATH_LIST", + "SUPPRESS_EXCEPTIONS", + "REQUIRE_PROPERTIES" + ], + "type": "string" + }, "result-type": { "type": "string" }, @@ -3614,6 +3633,14 @@ "ref": { "type": "string" }, + "scope": { + "enum": [ + "Singleton", + "Request", + "Prototype" + ], + "type": "string" + }, "trim": { "type": "string" } @@ -3822,6 +3849,12 @@ "type": "string" }, "mode": { + "enum": [ + "i", + "w", + "u", + "t" + ], "type": "string" }, "trim": { @@ -3863,6 +3896,9 @@ "object-model": { "type": "string" }, + "pre-compile": { + "type": "string" + }, "result-type": { "enum": [ "NUMBER", diff --git a/docs/modules/traits/pages/cron.adoc b/docs/modules/traits/pages/cron.adoc index 6343754..d640388 100755 --- a/docs/modules/traits/pages/cron.adoc +++ b/docs/modules/traits/pages/cron.adoc @@ -45,7 +45,7 @@ mechanism to work correctly. | string | A comma separated list of the Camel components that need to be customized in order for them to work when the schedule is triggered externally by Kubernetes. A specific customizer is activated for each specified component. E.g. for the `timer` component, the `cron-timer` customizer is -activated (it's present in the `org.apache.camel.k:camel-k-runtime-cron` library). +activated (it's present in the `org.apache.camel.k:camel-k-cron` library). Supported components are currently: `cron`, `timer` and `quartz`. diff --git a/pkg/trait/cron.go b/pkg/trait/cron.go index 87ff0e9..8e496cc 100644 --- a/pkg/trait/cron.go +++ b/pkg/trait/cron.go @@ -57,7 +57,7 @@ type cronTrait struct { Schedule string `property:"schedule" json:"schedule,omitempty"` // A comma separated list of the Camel components that need to be customized in order for them to work when the schedule is triggered externally by Kubernetes. // A specific customizer is activated for each specified component. E.g. for the `timer` component, the `cron-timer` customizer is - // activated (it's present in the `org.apache.camel.k:camel-k-runtime-cron` library). + // activated (it's present in the `org.apache.camel.k:camel-k-cron` library). // // Supported components are currently: `cron`, `timer` and `quartz`. Components string `property:"components" json:"components,omitempty"` diff --git a/pkg/trait/knative.go b/pkg/trait/knative.go index c3c06e8..e4a1b35 100644 --- a/pkg/trait/knative.go +++ b/pkg/trait/knative.go @@ -224,14 +224,14 @@ func (t *knativeTrait) Apply(e *Environment) error { if util.StringSliceExists(e.getAllInterceptors(), "knative-source") { // Adding required libraries for Camel sources util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "mvn:org.apache.camel.k/camel-knative") - util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "mvn:org.apache.camel.k/camel-k-runtime-knative") + util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "mvn:org.apache.camel.k/camel-k-knative") // Adding platform HTTP util.StringSliceUniqueAdd(&e.Integration.Status.Capabilities, v1.CapabilityPlatformHTTP) } } if t.SinkBinding != nil && *t.SinkBinding { - util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "mvn:org.apache.camel.k/camel-k-runtime-knative") + util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "mvn:org.apache.camel.k/camel-k-knative") } if len(t.ChannelSources) > 0 || len(t.EndpointSources) > 0 || len(t.EventSources) > 0 {
