From 56ffa2fa06d12b695b1a3e7ccdcd3e75319ccc2b Mon Sep 17 00:00:00 2001 From: Marat Gubaidullin Date: Fri, 20 Oct 2023 21:12:16 -0400 Subject: [PATCH] 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 ++-- .../main/resources/snippets/docker-application.properties | 2 +- .../resources/snippets/kubernetes-application.properties | 2 +- .../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 c475b7e7f82..633cb994cfe 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 ff6aba52ba0..f4f3225a905 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 bbaf0bb4d6a..a408f9432ba 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 8f02d8bc5a0..e5336ccd670 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 1671fc799e4..e99004d09a3 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 0ae6bf69e5d..fb1e69daa7c 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 9d1c2f687f2..43ddc7ad704 100644 --- a/karavan-web/karavan-app/pom.xml +++ b/karavan-web/karavan-app/pom.xml @@ -35,8 +35,8 @@ io.quarkus.platform 3.2.3.Final 3.2.2 - 4.0.0-RC1 - 4.0.0-RC1 + 4.1.0 + 4.0.1 3.1.0 2.3.2 1.2.4 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 a5b9eec1c00..3eb16295ac2 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 af588337182..b46b7af63c4 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 e8a1388d84d..1c62ff5e534 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