Skip to content

Commit

Permalink
Fix #1562: rename modules to new names
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicolaferraro
nicolaferraro committed Nov 10, 2020
1 parent aea4ee2 commit 872f2c7
Show file tree
Hide file tree
Showing 7 changed files with 115 additions and 7 deletions.
4 changes: 2 additions & 2 deletions build/maven/pom-runtime.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion deploy/traits.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
72 changes: 72 additions & 0 deletions docs/modules/ROOT/assets/attachments/schema/integration-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -3006,6 +3009,9 @@
"id": {
"type": "string"
},
"max-decompressed-size": {
"type": "string"
},
"preserve-path-elements": {
"type": "string"
},
Expand Down Expand Up @@ -3401,6 +3407,9 @@
"id": {
"type": "string"
},
"max-decompressed-size": {
"type": "string"
},
"preserve-path-elements": {
"type": "string"
},
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -3614,6 +3633,14 @@
"ref": {
"type": "string"
},
"scope": {
"enum": [
"Singleton",
"Request",
"Prototype"
],
"type": "string"
},
"trim": {
"type": "string"
}
Expand Down Expand Up @@ -3822,6 +3849,12 @@
"type": "string"
},
"mode": {
"enum": [
"i",
"w",
"u",
"t"
],
"type": "string"
},
"trim": {
Expand Down Expand Up @@ -3863,6 +3896,9 @@
"object-model": {
"type": "string"
},
"pre-compile": {
"type": "string"
},
"result-type": {
"enum": [
"NUMBER",
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -7203,6 +7242,9 @@
"id": {
"type": "string"
},
"max-decompressed-size": {
"type": "string"
},
"preserve-path-elements": {
"type": "string"
},
Expand Down Expand Up @@ -7598,6 +7640,9 @@
"id": {
"type": "string"
},
"max-decompressed-size": {
"type": "string"
},
"preserve-path-elements": {
"type": "string"
},
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -7811,6 +7866,14 @@
"ref": {
"type": "string"
},
"scope": {
"enum": [
"Singleton",
"Request",
"Prototype"
],
"type": "string"
},
"trim": {
"type": "string"
}
Expand Down Expand Up @@ -8019,6 +8082,12 @@
"type": "string"
},
"mode": {
"enum": [
"i",
"w",
"u",
"t"
],
"type": "string"
},
"trim": {
Expand Down Expand Up @@ -8060,6 +8129,9 @@
"object-model": {
"type": "string"
},
"pre-compile": {
"type": "string"
},
"result-type": {
"enum": [
"NUMBER",
Expand Down
36 changes: 36 additions & 0 deletions docs/modules/ROOT/assets/attachments/schema/kamelet-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -3006,6 +3009,9 @@
"id": {
"type": "string"
},
"max-decompressed-size": {
"type": "string"
},
"preserve-path-elements": {
"type": "string"
},
Expand Down Expand Up @@ -3401,6 +3407,9 @@
"id": {
"type": "string"
},
"max-decompressed-size": {
"type": "string"
},
"preserve-path-elements": {
"type": "string"
},
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -3614,6 +3633,14 @@
"ref": {
"type": "string"
},
"scope": {
"enum": [
"Singleton",
"Request",
"Prototype"
],
"type": "string"
},
"trim": {
"type": "string"
}
Expand Down Expand Up @@ -3822,6 +3849,12 @@
"type": "string"
},
"mode": {
"enum": [
"i",
"w",
"u",
"t"
],
"type": "string"
},
"trim": {
Expand Down Expand Up @@ -3863,6 +3896,9 @@
"object-model": {
"type": "string"
},
"pre-compile": {
"type": "string"
},
"result-type": {
"enum": [
"NUMBER",
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/traits/pages/cron.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

Expand Down
2 changes: 1 addition & 1 deletion pkg/trait/cron.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
4 changes: 2 additions & 2 deletions pkg/trait/knative.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,14 +219,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 {
Expand Down

0 comments on commit 872f2c7

Please sign in to comment.