Skip to content

Commit

Permalink
Fix #931
Browse files Browse the repository at this point in the history
  • Loading branch information
mgubaidullin committed Oct 21, 2023
1 parent 3435394 commit 56ffa2f
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 15 deletions.
4 changes: 2 additions & 2 deletions docs/VSCODE_HOWTO.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
```
2 changes: 1 addition & 1 deletion karavan-demo/jms-to-kafka/docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions karavan-vscode/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions karavan-vscode/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions karavan-vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"properties": {
"camel.version": {
"type": "string",
"default": "4.0.1",
"default": "4.1.0",
"description": "Camel version",
"scope": "machine",
"order": 10
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion karavan-web/docker/Dockerfile.devmode
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions karavan-web/karavan-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 56ffa2f

Please sign in to comment.