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 bf5b0fdc Fix #801
bf5b0fdc is described below
commit bf5b0fdceae71456aba7b6bc41f84b2e36b8ba7a
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Tue Jun 20 11:21:02 2023 -0400
Fix #801
---
karavan-app/pom.xml | 2 +-
.../src/main/resources/pipelines/karavan-task-dev-quarkus.yaml | 2 +-
.../src/main/resources/pipelines/karavan-task-dev-spring-boot.yaml | 2 +-
.../resources/snippets/spring-boot-kubernetes-application.properties | 2 +-
.../resources/snippets/spring-boot-openshift-application.properties | 2 +-
karavan-builder/Dockerfile | 2 +-
karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh | 2 +-
karavan-cli/src/main/resources/quarkus-builder-script-openshift.sh | 2 +-
.../src/main/resources/spring-boot-builder-script-kubernetes.sh | 2 +-
.../src/main/resources/spring-boot-builder-script-openshift.sh | 2 +-
karavan-cloud/AWS/karavan-quarkus-task-aws.yaml | 2 +-
karavan-cloud/AWS/karavan-spring-boot-task-aws.yaml | 2 +-
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 +-
.../src/main/resources/spring-boot-builder-script-kubernetes.sh | 2 +-
.../src/main/resources/spring-boot-builder-script-openshift.sh | 2 +-
karavan-runner/Dockerfile | 2 +-
karavan-vscode/CHANGELOG.md | 2 +-
karavan-vscode/README.md | 4 ++--
karavan-vscode/package.json | 4 ++--
22 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index 4cf82b02..2a5da14c 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.16.7.Final</quarkus.platform.version>
<camel-quarkus.version>2.16.7</camel-quarkus.version>
- <camel.version>3.20.5</camel.version>
+ <camel.version>3.20.6</camel.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<infinispan.version>14.0.6.Final</infinispan.version>
<tekton.version>6.3.1</tekton.version>
diff --git
a/karavan-app/src/main/resources/pipelines/karavan-task-dev-quarkus.yaml
b/karavan-app/src/main/resources/pipelines/karavan-task-dev-quarkus.yaml
index ac2b49ab..e7a89556 100644
--- a/karavan-app/src/main/resources/pipelines/karavan-task-dev-quarkus.yaml
+++ b/karavan-app/src/main/resources/pipelines/karavan-task-dev-quarkus.yaml
@@ -54,7 +54,7 @@ spec:
cd ${CHECKOUT_DIR}/$(inputs.params.project)
- entrypoint -Dcamel.jbang.version=3.20.5 camel@apache/camel export
+ entrypoint -Dcamel.jbang.version=3.20.6 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
export LAST_COMMIT=$(git rev-parse --short HEAD)
diff --git
a/karavan-app/src/main/resources/pipelines/karavan-task-dev-spring-boot.yaml
b/karavan-app/src/main/resources/pipelines/karavan-task-dev-spring-boot.yaml
index dde2931d..1c96d652 100644
--- a/karavan-app/src/main/resources/pipelines/karavan-task-dev-spring-boot.yaml
+++ b/karavan-app/src/main/resources/pipelines/karavan-task-dev-spring-boot.yaml
@@ -54,7 +54,7 @@ spec:
cd ${CHECKOUT_DIR}/$(inputs.params.project)
- entrypoint -Dcamel.jbang.version=3.20.5 camel@apache/camel export
+ entrypoint -Dcamel.jbang.version=3.20.6 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
export LAST_COMMIT=$(git rev-parse --short HEAD)
diff --git
a/karavan-app/src/main/resources/snippets/spring-boot-kubernetes-application.properties
b/karavan-app/src/main/resources/snippets/spring-boot-kubernetes-application.properties
index 30e89330..1669574d 100644
---
a/karavan-app/src/main/resources/snippets/spring-boot-kubernetes-application.properties
+++
b/karavan-app/src/main/resources/snippets/spring-boot-kubernetes-application.properties
@@ -3,7 +3,7 @@ camel.karavan.project-name={projectName}
camel.karavan.project-description={projectDescription}
camel.jbang.gav=org.camel.karavan.demo:{projectId}:1
camel.jbang.runtime=spring-boot
-camel.jbang.camelSpringBootVersion=3.20.5
+camel.jbang.camelSpringBootVersion=3.20.6
camel.jbang.springBootVersion=2.7.11
camel.jbang.dependencies=camel:microprofile-health
camel.health.enabled=true
diff --git
a/karavan-app/src/main/resources/snippets/spring-boot-openshift-application.properties
b/karavan-app/src/main/resources/snippets/spring-boot-openshift-application.properties
index 828d46d0..3788ab80 100644
---
a/karavan-app/src/main/resources/snippets/spring-boot-openshift-application.properties
+++
b/karavan-app/src/main/resources/snippets/spring-boot-openshift-application.properties
@@ -3,7 +3,7 @@ camel.karavan.project-name={projectName}
camel.karavan.project-description={projectDescription}
camel.jbang.gav=org.camel.karavan.demo:{projectId}:1
camel.jbang.runtime=spring-boot
-camel.jbang.camelSpringBootVersion=3.20.5
+camel.jbang.camelSpringBootVersion=3.20.6
camel.jbang.springBootVersion=2.7.11
camel.jbang.dependencies=camel:microprofile-health
camel.health.enabled=true
diff --git a/karavan-builder/Dockerfile b/karavan-builder/Dockerfile
index 477cdaf1..d4416286 100644
--- a/karavan-builder/Dockerfile
+++ b/karavan-builder/Dockerfile
@@ -7,4 +7,4 @@ RUN jbang trust add -o --fresh --quiet
https://github.com/apache/camel/blob/HEAD
RUN apt-get update -y && apt-get install maven git -y && apt-get clean
WORKDIR /scripts
-ENTRYPOINT ["entrypoint", "-Dcamel.jbang.version=3.20.5", "camel@apache/camel"]
+ENTRYPOINT ["entrypoint", "-Dcamel.jbang.version=3.20.6", "camel@apache/camel"]
diff --git
a/karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh
b/karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh
index 5715ac18..14b3f5fa 100644
--- a/karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh
+++ b/karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh
@@ -14,7 +14,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=3.20.5 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.6 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-cli/src/main/resources/quarkus-builder-script-openshift.sh
b/karavan-cli/src/main/resources/quarkus-builder-script-openshift.sh
index 79a71125..cd0638cf 100644
--- a/karavan-cli/src/main/resources/quarkus-builder-script-openshift.sh
+++ b/karavan-cli/src/main/resources/quarkus-builder-script-openshift.sh
@@ -14,7 +14,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=3.20.5 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.6 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-cli/src/main/resources/spring-boot-builder-script-kubernetes.sh
b/karavan-cli/src/main/resources/spring-boot-builder-script-kubernetes.sh
index c76078a5..aa49c1ec 100644
--- a/karavan-cli/src/main/resources/spring-boot-builder-script-kubernetes.sh
+++ b/karavan-cli/src/main/resources/spring-boot-builder-script-kubernetes.sh
@@ -14,7 +14,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=3.20.5 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.6 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-cli/src/main/resources/spring-boot-builder-script-openshift.sh
b/karavan-cli/src/main/resources/spring-boot-builder-script-openshift.sh
index 98b71043..431d4ea6 100644
--- a/karavan-cli/src/main/resources/spring-boot-builder-script-openshift.sh
+++ b/karavan-cli/src/main/resources/spring-boot-builder-script-openshift.sh
@@ -14,7 +14,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=3.20.5 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.6 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-cloud/AWS/karavan-quarkus-task-aws.yaml
b/karavan-cloud/AWS/karavan-quarkus-task-aws.yaml
index b7f7e671..2749dc1b 100644
--- a/karavan-cloud/AWS/karavan-quarkus-task-aws.yaml
+++ b/karavan-cloud/AWS/karavan-quarkus-task-aws.yaml
@@ -79,7 +79,7 @@ spec:
cd ${CHECKOUT_DIR}/$(inputs.params.project)
- entrypoint -Dcamel.jbang.version=3.20.5 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+ entrypoint -Dcamel.jbang.version=3.20.6 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-cloud/AWS/karavan-spring-boot-task-aws.yaml
b/karavan-cloud/AWS/karavan-spring-boot-task-aws.yaml
index 0dcfce27..63f64171 100644
--- a/karavan-cloud/AWS/karavan-spring-boot-task-aws.yaml
+++ b/karavan-cloud/AWS/karavan-spring-boot-task-aws.yaml
@@ -79,7 +79,7 @@ spec:
cd ${CHECKOUT_DIR}/$(inputs.params.project)
- entrypoint -Dcamel.jbang.version=3.20.5 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+ entrypoint -Dcamel.jbang.version=3.20.6 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-demo/jms-to-kafka/docs/README.md
b/karavan-demo/jms-to-kafka/docs/README.md
index dc0c58ae..98b363e0 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.20.5 camel@apache/camel run *
+jbang -Dcamel.jbang.version=3.20.6 camel@apache/camel run *
```
### Publish payment to JMS
diff --git a/karavan-generator/pom.xml b/karavan-generator/pom.xml
index 595169d7..4078ae21 100644
--- a/karavan-generator/pom.xml
+++ b/karavan-generator/pom.xml
@@ -28,7 +28,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
- <version.camel-core>3.20.5</version.camel-core>
+ <version.camel-core>3.20.6</version.camel-core>
<version.camel-kamelet>3.20.5</version.camel-kamelet>
<version.vertx>4.4.3</version.vertx>
</properties>
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 c53cc6db..13d8a207 100644
--- a/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
+++ b/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
@@ -14,7 +14,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=3.20.5 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.6 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 c60e9ff4..b15d3fc8 100644
--- a/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
+++ b/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
@@ -14,7 +14,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=3.20.5 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.6 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/spring-boot-builder-script-kubernetes.sh
b/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh
index ca77096b..656c4381 100644
---
a/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh
+++
b/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh
@@ -14,7 +14,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=3.20.5 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.6 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/spring-boot-builder-script-openshift.sh
b/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh
index dc74a459..01fefb19 100644
---
a/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh
+++
b/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh
@@ -14,7 +14,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=3.20.5 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.6 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-runner/Dockerfile b/karavan-runner/Dockerfile
index 312c8473..19cec13b 100644
--- a/karavan-runner/Dockerfile
+++ b/karavan-runner/Dockerfile
@@ -1,6 +1,6 @@
FROM jbangdev/jbang-action:0.106.1
-ENV CAMEL_VERSION=3.20.5
+ENV CAMEL_VERSION=3.20.6
ENV KARAVAN="/karavan"
# ENV JBANG_REPO="$KARAVAN/.jbang/cache/.m2"
# ENV JBANG_DIR="$KARAVAN/.jbang"
diff --git a/karavan-vscode/CHANGELOG.md b/karavan-vscode/CHANGELOG.md
index 47f7a466..3547e0e9 100644
--- a/karavan-vscode/CHANGELOG.md
+++ b/karavan-vscode/CHANGELOG.md
@@ -1,7 +1,7 @@
# Changelog
## 3.20.2
-0. Camel 3.20.5
+0. Camel 3.20.6
1. Spring Boot 2.7.11
## 3.20.1
diff --git a/karavan-vscode/README.md b/karavan-vscode/README.md
index 04960ed0..eb815488 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.20.5 camel@apache/camel run
$INTEGRATION.yaml --max-messages=10 --logging-level=info
+ jbang -Dcamel.jbang.version=3.20.6 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.20.5 camel@apache/camel export
--directory=export
+ jbang -Dcamel.jbang.version=3.20.6 camel@apache/camel export
--directory=export
```
# Issues
diff --git a/karavan-vscode/package.json b/karavan-vscode/package.json
index 55577fe6..19ac5013 100644
--- a/karavan-vscode/package.json
+++ b/karavan-vscode/package.json
@@ -64,7 +64,7 @@
"properties": {
"camel.version": {
"type": "string",
- "default": "3.20.5",
+ "default": "3.20.6",
"description": "Camel version",
"scope": "machine",
"order": 10
@@ -246,7 +246,7 @@
"camel.karavan.project-description=$NAME",
"camel.karavan.target=$TARGET",
"camel.jbang.gav=$GAV",
- "camel.jbang.camelSpringBootVersion=3.20.5",
+ "camel.jbang.camelSpringBootVersion=3.20.6",
"camel.jbang.springBootVersion=2.7.11",
"camel.jbang.runtime=$RUNTIME",
"camel.jbang.exportDir=.export",
