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/10/21 01:12:27 UTC
[camel-karavan] branch main updated: Fix #931
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 56ffa2fa Fix #931
56ffa2fa is described below
commit 56ffa2fa06d12b695b1a3e7ccdcd3e75319ccc2b
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Fri Oct 20 21:12:16 2023 -0400
Fix #931
---
docs/VSCODE_HOWTO.md | 4 ++--
karavan-demo/jms-to-kafka/docs/README.md | 2 +-
karavan-vscode/CHANGELOG.md | 6 ++++++
karavan-vscode/README.md | 4 ++--
karavan-vscode/package.json | 8 ++++----
karavan-web/docker/Dockerfile.devmode | 2 +-
karavan-web/karavan-app/pom.xml | 4 ++--
.../src/main/resources/snippets/docker-application.properties | 2 +-
.../src/main/resources/snippets/kubernetes-application.properties | 2 +-
.../src/main/resources/snippets/openshift-application.properties | 2 +-
10 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/docs/VSCODE_HOWTO.md b/docs/VSCODE_HOWTO.md
index c475b7e7..633cb994 100644
--- a/docs/VSCODE_HOWTO.md
+++ b/docs/VSCODE_HOWTO.md
@@ -16,7 +16,7 @@
* Run using CLI
```shell
- jbang -Dcamel.jbang.version=4.0.0 camel@apache/camel run $INTEGRATION.yaml --max-messages=10 --logging-level=info
+ jbang -Dcamel.jbang.version=4.1.0 camel@apache/camel run $INTEGRATION.yaml --max-messages=10 --logging-level=info
```
## Export integration to Maven project
@@ -26,5 +26,5 @@
* Export using CLI
```shell
- jbang -Dcamel.jbang.version=4.0.0 camel@apache/camel export --directory=export
+ jbang -Dcamel.jbang.version=4.1.0 camel@apache/camel export --directory=export
```
\ No newline at end of file
diff --git a/karavan-demo/jms-to-kafka/docs/README.md b/karavan-demo/jms-to-kafka/docs/README.md
index ff6aba52..f4f3225a 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=4.0.1 camel@apache/camel run *
+jbang -Dcamel.jbang.version=4.1.0 camel@apache/camel run *
```
### Publish payment to JMS
diff --git a/karavan-vscode/CHANGELOG.md b/karavan-vscode/CHANGELOG.md
index bbaf0bb4..a408f943 100644
--- a/karavan-vscode/CHANGELOG.md
+++ b/karavan-vscode/CHANGELOG.md
@@ -1,5 +1,11 @@
# Changelog
+## 4.0.0
+0. Camel 4.1.0
+1. Camel-main Runtime
+2. Kamelets 4.0.1
+3. Jkube 1.14.0
+
## 4.0.0
0. Camel 4.0.0
1. Camel-main Runtime
diff --git a/karavan-vscode/README.md b/karavan-vscode/README.md
index 8f02d8bc..e5336ccd 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=4.0.0 camel@apache/camel run $INTEGRATION.yaml --max-messages=10 --logging-level=info
+ jbang -Dcamel.jbang.version=4.1.0 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=4.0.0 camel@apache/camel export --directory=export
+ jbang -Dcamel.jbang.version=4.1.0 camel@apache/camel export --directory=export
```
# Issues
diff --git a/karavan-vscode/package.json b/karavan-vscode/package.json
index 1671fc79..e99004d0 100644
--- a/karavan-vscode/package.json
+++ b/karavan-vscode/package.json
@@ -62,7 +62,7 @@
"properties": {
"camel.version": {
"type": "string",
- "default": "4.0.1",
+ "default": "4.1.0",
"description": "Camel version",
"scope": "machine",
"order": 10
@@ -259,8 +259,8 @@
"camel.karavan.project-description=$NAME",
"camel.karavan.target=$TARGET",
"camel.jbang.gav=$GAV",
- "camel.jbang.camelSpringBootVersion=4.0.1",
- "camel.jbang.springBootVersion=3.1.2",
+ "camel.jbang.camelSpringBootVersion=4.1.0",
+ "camel.jbang.springBootVersion=3.1.4",
"camel.jbang.runtime=$RUNTIME",
"camel.jbang.exportDir=.export",
"management.endpoints.web.exposure.include=health",
@@ -283,7 +283,7 @@
"camel.karavan.project-description=$NAME",
"camel.karavan.target=$TARGET",
"camel.jbang.gav=$GAV",
- "camel.jbang.version=4.0.1",
+ "camel.jbang.version=4.1.0",
"camel.jbang.runtime=$RUNTIME",
"camel.jbang.exportDir=.export",
"camel.health.enabled=true",
diff --git a/karavan-web/docker/Dockerfile.devmode b/karavan-web/docker/Dockerfile.devmode
index 0ae6bf69..fb1e69da 100644
--- a/karavan-web/docker/Dockerfile.devmode
+++ b/karavan-web/docker/Dockerfile.devmode
@@ -24,7 +24,7 @@ LABEL "org.opencontainers.image.version"="4.0.1"
RUN apt-get update && apt-get install git && apt-get clean
ENV JBANG_VERSION=0.110.0
-ENV CAMEL_VERSION=4.0.0
+ENV CAMEL_VERSION=4.1.0
ENV KARAVAN="/karavan"
ENV JBANG_DIR="$KARAVAN/.jbang"
ENV MAVEN_CONFIG="$KARAVAN/.m2"
diff --git a/karavan-web/karavan-app/pom.xml b/karavan-web/karavan-app/pom.xml
index 9d1c2f68..43ddc7ad 100644
--- a/karavan-web/karavan-app/pom.xml
+++ b/karavan-web/karavan-app/pom.xml
@@ -35,8 +35,8 @@
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>3.2.3.Final</quarkus.platform.version>
<camel-quarkus.version>3.2.2</camel-quarkus.version>
- <camel.version>4.0.0-RC1</camel.version>
- <camel-kamelet.version>4.0.0-RC1</camel-kamelet.version>
+ <camel.version>4.1.0</camel.version>
+ <camel-kamelet.version>4.0.1</camel-kamelet.version>
<surefire-plugin.version>3.1.0</surefire-plugin.version>
<jgit.version>2.3.2</jgit.version>
<quinoa.version>1.2.4</quinoa.version>
diff --git a/karavan-web/karavan-app/src/main/resources/snippets/docker-application.properties b/karavan-web/karavan-app/src/main/resources/snippets/docker-application.properties
index a5b9eec1..3eb16295 100644
--- a/karavan-web/karavan-app/src/main/resources/snippets/docker-application.properties
+++ b/karavan-web/karavan-app/src/main/resources/snippets/docker-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=camel-main
-camel.jbang.version=4.0.1
+camel.jbang.version=4.1.0
camel.jbang.dependencies=camel-console,camel-platform-http-main
camel.server.enabled=true
camel.server.healthCheckEnabled=true
diff --git a/karavan-web/karavan-app/src/main/resources/snippets/kubernetes-application.properties b/karavan-web/karavan-app/src/main/resources/snippets/kubernetes-application.properties
index af588337..b46b7af6 100644
--- a/karavan-web/karavan-app/src/main/resources/snippets/kubernetes-application.properties
+++ b/karavan-web/karavan-app/src/main/resources/snippets/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=camel-main
-camel.jbang.version=4.0.1
+camel.jbang.version=4.1.0
camel.jbang.dependencies=camel-console,camel-platform-http-main
camel.health.enabled=true
camel.health.exposure-level=full
diff --git a/karavan-web/karavan-app/src/main/resources/snippets/openshift-application.properties b/karavan-web/karavan-app/src/main/resources/snippets/openshift-application.properties
index e8a1388d..1c62ff5e 100644
--- a/karavan-web/karavan-app/src/main/resources/snippets/openshift-application.properties
+++ b/karavan-web/karavan-app/src/main/resources/snippets/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=camel-main
-camel.jbang.version=4.0.1
+camel.jbang.version=4.1.0
camel.jbang.dependencies=camel-console,camel-platform-http-main
camel.health.enabled=true
camel.health.exposure-level=full