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 2023/06/07 19:05:10 UTC
[camel-karavan] branch main updated: Fix #779
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 7ff566a7 Fix #779
7ff566a7 is described below
commit 7ff566a78af0bddd10c92e4b91d4b3097d839d04
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Wed Jun 7 15:04:38 2023 -0400
Fix #779
---
karavan-app/pom.xml | 4 ++--
.../src/main/resources/pipelines/karavan-task-dev-quarkus.yaml | 2 +-
.../src/main/resources/pipelines/karavan-task-dev-spring-boot.yaml | 2 +-
.../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 | 6 +++---
.../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-vscode/CHANGELOG.md | 2 +-
karavan-vscode/README.md | 4 ++--
karavan-vscode/package.json | 4 ++--
21 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index 4860c09f..541fcdac 100644
--- a/karavan-app/pom.xml
+++ b/karavan-app/pom.xml
@@ -30,8 +30,8 @@
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<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.0</camel-quarkus.version>
- <camel.version>3.20.4</camel.version>
+ <camel-quarkus.version>2.16.6</camel-quarkus.version>
+ <camel.version>3.20.5</camel.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<infinispan.version>14.0.9.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 3ad3d5fd..ac2b49ab 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.4 camel@apache/camel export
+ entrypoint -Dcamel.jbang.version=3.20.5 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 429b657c..dde2931d 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.4 camel@apache/camel export
+ entrypoint -Dcamel.jbang.version=3.20.5 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 b26af340..62a3e1cc 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.4
+camel.jbang.camelSpringBootVersion=3.20.5
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 0d5aff0a..5168b4ee 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.4
+camel.jbang.camelSpringBootVersion=3.20.5
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 979dcdae..cf35d0e3 100644
--- a/karavan-builder/Dockerfile
+++ b/karavan-builder/Dockerfile
@@ -12,4 +12,4 @@ RUN mkdir /opt/mvnd && \
mv maven-mvnd-1.0-m6-m39-linux-amd64/* /opt/mvnd
WORKDIR /scripts
-ENTRYPOINT ["entrypoint", "-Dcamel.jbang.version=3.20.4", "camel@apache/camel"]
+ENTRYPOINT ["entrypoint", "-Dcamel.jbang.version=3.20.5", "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 49a67e94..c53cc6db 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.4 camel@apache/camel export --local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.5 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 1b37af8e..c60e9ff4 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.4 camel@apache/camel export --local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.5 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 097c2f99..ca77096b 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.4 camel@apache/camel export --local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.5 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 5c51b76f..dc74a459 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.4 camel@apache/camel export --local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.5 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 38ee39c1..b7f7e671 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.4 camel@apache/camel export --local-kamelet-dir=${KAMELETS_DIR}
+ entrypoint -Dcamel.jbang.version=3.20.5 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 252e2509..0dcfce27 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.4 camel@apache/camel export --local-kamelet-dir=${KAMELETS_DIR}
+ entrypoint -Dcamel.jbang.version=3.20.5 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 a38643aa..dc0c58ae 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.4 camel@apache/camel run *
+jbang -Dcamel.jbang.version=3.20.5 camel@apache/camel run *
```
### Publish payment to JMS
diff --git a/karavan-generator/pom.xml b/karavan-generator/pom.xml
index 279cd3b0..595169d7 100644
--- a/karavan-generator/pom.xml
+++ b/karavan-generator/pom.xml
@@ -28,9 +28,9 @@
<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.4</version.camel-core>
- <version.camel-kamelet>3.20.3</version.camel-kamelet>
- <version.vertx>4.3.6</version.vertx>
+ <version.camel-core>3.20.5</version.camel-core>
+ <version.camel-kamelet>3.20.5</version.camel-kamelet>
+ <version.vertx>4.4.3</version.vertx>
</properties>
<dependencies>
<dependency>
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 49a67e94..c53cc6db 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.4 camel@apache/camel export --local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.5 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 1b37af8e..c60e9ff4 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.4 camel@apache/camel export --local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.5 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 097c2f99..ca77096b 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.4 camel@apache/camel export --local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.5 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 5c51b76f..dc74a459 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.4 camel@apache/camel export --local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.5 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/CHANGELOG.md b/karavan-vscode/CHANGELOG.md
index e8e371a8..47f7a466 100644
--- a/karavan-vscode/CHANGELOG.md
+++ b/karavan-vscode/CHANGELOG.md
@@ -1,7 +1,7 @@
# Changelog
## 3.20.2
-0. Camel 3.20.4
+0. Camel 3.20.5
1. Spring Boot 2.7.11
## 3.20.1
diff --git a/karavan-vscode/README.md b/karavan-vscode/README.md
index 790b4412..04960ed0 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.4 camel@apache/camel run $INTEGRATION.yaml --max-messages=10 --logging-level=info
+ jbang -Dcamel.jbang.version=3.20.5 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.4 camel@apache/camel export --directory=export
+ jbang -Dcamel.jbang.version=3.20.5 camel@apache/camel export --directory=export
```
# Issues
diff --git a/karavan-vscode/package.json b/karavan-vscode/package.json
index 37b13565..8e0a121c 100644
--- a/karavan-vscode/package.json
+++ b/karavan-vscode/package.json
@@ -64,7 +64,7 @@
"properties": {
"camel.version": {
"type": "string",
- "default": "3.20.4",
+ "default": "3.20.5",
"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.4",
+ "camel.jbang.camelSpringBootVersion=3.20.5",
"camel.jbang.springBootVersion=2.7.11",
"camel.jbang.runtime=$RUNTIME",
"camel.jbang.exportDir=.export",