You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2022/10/31 15:33:14 UTC
[camel-karavan] branch main updated: Fix #499
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 45af7a1 Fix #499
45af7a1 is described below
commit 45af7a101a9bedde66b969f9d8bf9bad4c637c95
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Mon Oct 31 11:33:05 2022 -0400
Fix #499
---
karavan-app/pom.xml | 2 +-
karavan-builder/Dockerfile | 2 +-
karavan-core/src/core/model/CamelDefinition.ts | 2 ++
karavan-core/src/core/model/CamelMetadata.ts | 4 ++++
karavan-demo/jms-to-kafka/docs/README.md | 2 +-
karavan-generator/pom.xml | 2 +-
.../src/main/resources/quarkus-builder-script-kubernetes.sh | 2 +-
.../src/main/resources/quarkus-builder-script-openshift.sh | 2 +-
karavan-vscode/README.md | 4 ++--
karavan-vscode/package.json | 2 +-
10 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index 91dfc35..dfaa5a0 100644
--- a/karavan-app/pom.xml
+++ b/karavan-app/pom.xml
@@ -31,7 +31,7 @@
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>2.11.2.Final</quarkus.platform.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
- <version.camel>3.18.2</version.camel>
+ <version.camel>3.18.3</version.camel>
</properties>
<dependencyManagement>
<dependencies>
diff --git a/karavan-builder/Dockerfile b/karavan-builder/Dockerfile
index c2d53ec..8cf704f 100644
--- a/karavan-builder/Dockerfile
+++ b/karavan-builder/Dockerfile
@@ -12,4 +12,4 @@ RUN mkdir /opt/mvnd && \
mv maven-mvnd-0.8.2-linux-amd64/* /opt/mvnd
WORKDIR /scripts
-ENTRYPOINT ["entrypoint", "-Dcamel.jbang.version=3.18.2", "camel@apache/camel"]
+ENTRYPOINT ["entrypoint", "-Dcamel.jbang.version=3.18.3", "camel@apache/camel"]
diff --git a/karavan-core/src/core/model/CamelDefinition.ts b/karavan-core/src/core/model/CamelDefinition.ts
index 895baf9..4a89b78 100644
--- a/karavan-core/src/core/model/CamelDefinition.ts
+++ b/karavan-core/src/core/model/CamelDefinition.ts
@@ -1012,6 +1012,7 @@ export class Resilience4jConfigurationDefinition extends CamelElement {
slowCallDurationThreshold?: number;
minimumNumberOfCalls?: number;
permittedNumberOfCallsInHalfOpenState?: number;
+ throwExceptionWhenHalfOpenOrOpenState?: boolean;
slowCallRateThreshold?: number;
stepName?: string = 'resilience4jConfiguration';
writableStackTraceEnabled?: boolean;
@@ -2954,6 +2955,7 @@ export class JsonPathExpression extends CamelElement {
headerName?: string;
trim?: boolean;
expressionName?: string = 'jsonpath';
+ unpackArray?: boolean;
writeAsString?: boolean;
id?: string;
allowSimple?: boolean;
diff --git a/karavan-core/src/core/model/CamelMetadata.ts b/karavan-core/src/core/model/CamelMetadata.ts
index 7802d9a..0476676 100644
--- a/karavan-core/src/core/model/CamelMetadata.ts
+++ b/karavan-core/src/core/model/CamelMetadata.ts
@@ -731,6 +731,7 @@ export const CamelLanguageMetadata: ElementMeta[] = [
new PropertyMeta('allowSimple', 'Allow Simple', "Whether to allow in inlined Simple exceptions in the JSONPath expression", 'boolean', '', 'true', false, false, false, false, 'advanced'),
new PropertyMeta('allowEasyPredicate', 'Allow Easy Predicate', "Whether to allow using the easy predicate parser to pre-parse predicates.", 'boolean', '', 'true', false, false, false, false, 'advanced'),
new PropertyMeta('writeAsString', 'Write As String', "Whether to write the output of each row/element as a JSON String value instead of a Map/POJO value.", 'boolean', '', 'false', false, false, false, false, ''),
+ new PropertyMeta('unpackArray', 'Unpack Array', "Whether to unpack a single element json-array into an object.", 'boolean', '', 'false', false, false, false, false, ''),
new PropertyMeta('headerName', 'Header Name', "Name of header to use as input, instead of the message body", 'string', '', '', false, false, false, false, 'advanced'),
new PropertyMeta('option', 'Option', "To configure additional options on JSONPath. Multiple values can be separated by comma.", 'string', 'DEFAULT_PATH_LEAF_TO_NULL, ALWAYS_RETURN_LIST, AS_PATH_LIST, SUPPRESS_EXCEPTIONS, REQUIRE_PROPERTIES', '', false, false, false, false, 'advanced'),
new PropertyMeta('trim', 'Trim', "Whether to trim the value to remove leading and trailing whitespaces and line breaks", 'boolean', '', 'true', false, false, false, false, 'advanced'),
@@ -1277,6 +1278,7 @@ export const CamelModelMetadata: ElementMeta[] = [
new PropertyMeta('config', 'Config', "Refers to an existing io.github.resilience4j.circuitbreaker.CircuitBreakerConfig instance to lookup and use from the registry.", 'string', '', '', false, false, false, false, 'advanced'),
new PropertyMeta('failureRateThreshold', 'Failure Rate Threshold', "Configures the failure rate threshold in percentage. If the failure rate is equal or greater than the threshold the CircuitBreaker transitions to open and starts short-circuiting calls. The threshold must be greater than 0 and not greater than 100. Default value is 50 percentage.", 'number', '', '50', false, false, false, false, ''),
new PropertyMeta('permittedNumberOfCallsInHalfOpenState', 'Permitted Number Of Calls In Half Open State', "Configures the number of permitted calls when the CircuitBreaker is half open. The size must be greater than 0. Default size is 10.", 'number', '', '10', false, false, false, false, 'advanced'),
+ new PropertyMeta('throwExceptionWhenHalfOpenOrOpenState', 'Throw Exception When Half Open Or Open State', "Whether to throw io.github.resilience4j.circuitbreaker.CallNotPermittedException when the call is rejected due circuit breaker is half open or open.", 'boolean', '', 'false', false, false, false, false, ''),
new PropertyMeta('slidingWindowSize', 'Sliding Window Size', "Configures the size of the sliding window which is used to record the outcome of calls when the CircuitBreaker is closed. slidingWindowSize configures the size of the sliding window. Sliding window can either be count-based or time-based. If slidingWindowType is COUNT_BASED, the last slidingWindowSize calls are recorded and aggregated. If slidingWindowType is TIME_BASED, the calls of the last slidingWindowSize seconds [...]
new PropertyMeta('slidingWindowType', 'Sliding Window Type', "Configures the type of the sliding window which is used to record the outcome of calls when the CircuitBreaker is closed. Sliding window can either be count-based or time-based. If slidingWindowType is COUNT_BASED, the last slidingWindowSize calls are recorded and aggregated. If slidingWindowType is TIME_BASED, the calls of the last slidingWindowSize seconds are recorded and aggregated. Default slidingWindowType is COU [...]
new PropertyMeta('minimumNumberOfCalls', 'Minimum Number Of Calls', "Configures the minimum number of calls which are required (per sliding window period) before the CircuitBreaker can calculate the error rate. For example, if minimumNumberOfCalls is 10, then at least 10 calls must be recorded, before the failure rate can be calculated. If only 9 calls have been recorded the CircuitBreaker will not transition to open even if all 9 calls have failed. Default minimumNumberOfCalls i [...]
@@ -2090,10 +2092,12 @@ export const SensitiveKeys: string[] = [
"authorizationtoken",
"sharedaccesskey",
"apiusername",
+ "api_key",
"sasljaasconfig",
"httpproxypassword",
"oauthaccesstoken",
"user",
+ "api_secret",
"passcode",
"consumerkey",
"sslkeystore",
diff --git a/karavan-demo/jms-to-kafka/docs/README.md b/karavan-demo/jms-to-kafka/docs/README.md
index ec743b3..a6d9667 100644
--- a/karavan-demo/jms-to-kafka/docs/README.md
+++ b/karavan-demo/jms-to-kafka/docs/README.md
@@ -26,7 +26,7 @@ docker-compose up
### Start integration
```
-jbang -Dcamel.jbang.version=3.18.2 camel@apache/camel run *
+jbang -Dcamel.jbang.version=3.18.3 camel@apache/camel run *
```
### Publish payment to JMS
diff --git a/karavan-generator/pom.xml b/karavan-generator/pom.xml
index 3efd049..3682972 100644
--- a/karavan-generator/pom.xml
+++ b/karavan-generator/pom.xml
@@ -31,7 +31,7 @@
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>2.13.2.Final</quarkus.platform.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
- <version.camel-core>3.18.2</version.camel-core>
+ <version.camel-core>3.18.3</version.camel-core>
<version.camel-kamelet>0.9.2</version.camel-kamelet>
</properties>
<dependencyManagement>
diff --git a/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh b/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
index 48940e9..a12a0c1 100644
--- a/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
+++ b/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
@@ -25,7 +25,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=3.18.2 camel@apache/camel export --local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.18.3 camel@apache/camel export --local-kamelet-dir=${KAMELETS_DIR}
export LAST_COMMIT=$(git rev-parse --short HEAD)
export DATE=$(date '+%Y%m%d%H%M%S')
diff --git a/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh b/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
index e8f6861..22a3804 100644
--- a/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
+++ b/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
@@ -25,7 +25,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=3.18.2 camel@apache/camel export --local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.18.3 camel@apache/camel export --local-kamelet-dir=${KAMELETS_DIR}
export LAST_COMMIT=$(git rev-parse --short HEAD)
export DATE=$(date '+%Y%m%d%H%M%S')
diff --git a/karavan-vscode/README.md b/karavan-vscode/README.md
index 491c534..ea80a54 100644
--- a/karavan-vscode/README.md
+++ b/karavan-vscode/README.md
@@ -72,7 +72,7 @@ Build-in catalogues:
* Run using CLI
```shell
- jbang -Dcamel.jbang.version=3.18.2 camel@apache/camel run $INTEGRATION.yaml --max-messages=10 --logging-level=info
+ jbang -Dcamel.jbang.version=3.18.3 camel@apache/camel run $INTEGRATION.yaml --max-messages=10 --logging-level=info
```
## Export integration to Maven project
@@ -82,7 +82,7 @@ Build-in catalogues:
* Export using CLI
```shell
- jbang -Dcamel.jbang.version=3.18.2 camel@apache/camel export --directory=export
+ jbang -Dcamel.jbang.version=3.18.3 camel@apache/camel export --directory=export
```
# Issues
diff --git a/karavan-vscode/package.json b/karavan-vscode/package.json
index a2f3b59..5b6bcaa 100644
--- a/karavan-vscode/package.json
+++ b/karavan-vscode/package.json
@@ -63,7 +63,7 @@
"properties": {
"camel.version": {
"type": "string",
- "default": "3.18.2",
+ "default": "3.18.3",
"description": "Camel version",
"scope": "machine",
"order": 10