Skip to content

Commit

Permalink
Update version to 4.3.0 for release
Browse files Browse the repository at this point in the history
  • Loading branch information
mgubaidullin committed Dec 27, 2023
1 parent 89e985a commit 071c94e
Show file tree
Hide file tree
Showing 30 changed files with 69 additions and 65 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

env:
REGISTRY: ghcr.io
TAG: 4.1.1
TAG: 4.3.0

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-devmode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}-devmode
TAG: 4.1.1
TAG: 4.3.0

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
branches: [ main ]

env:
TAG: 4.1.1
TAG: 4.3.0

jobs:
build:
Expand Down
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.1.0 camel@apache/camel run $INTEGRATION.yaml --max-messages=10 --logging-level=info
jbang -Dcamel.jbang.version=4.3.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.1.0 camel@apache/camel export --directory=export
jbang -Dcamel.jbang.version=4.3.0 camel@apache/camel export --directory=export
```
2 changes: 1 addition & 1 deletion docs/WEB_DOCKER.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
-e KARAVAN_GIT_INSTALL_GITEA=true \
-e KARAVAN_IMAGE_REGISTRY_INSTALL=true \
-v /var/run/docker.sock:/var/run/docker.sock \
ghcr.io/apache/camel-karavan:4.1.0
ghcr.io/apache/camel-karavan:4.3.0
```
3. Open http://localhost:8080
Expand Down
8 changes: 4 additions & 4 deletions docs/WEB_KUBERNETES.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,24 @@
```
4. Install Karavan using Maven
Download installer from Maven Central: https://repo1.maven.org/maven2/org/apache/camel/karavan/karavan-installer/4.1.0/karavan-installer-4.1.0.jar
Download installer from Maven Central: https://repo1.maven.org/maven2/org/apache/camel/karavan/karavan-installer/4.3.0/karavan-installer-4.3.0.jar
ex. with following command:
```
mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:copy -Dartifact=org.apache.camel.karavan:karavan-installer:4.1.0:jar -DoutputDirectory=.
mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:copy -Dartifact=org.apache.camel.karavan:karavan-installer:4.3.0:jar -DoutputDirectory=.
```
Install Karavan with Gitea (for demo purpose)
```
java -jar karavan-installer-4.1.0.jar --install-gitea --node-port=30777
java -jar karavan-installer-4.3.0.jar --install-gitea --node-port=30777
```
5. Install Karavan using Jbang
Install Karavan with Gitea (for demo purpose)
```
jbang org.apache.camel.karavan:karavan-installer:4.1.0 --install-gitea --node-port=30777
jbang org.apache.camel.karavan:karavan-installer:4.3.0 --install-gitea --node-port=30777
```
6. Get karavan service URL
Expand Down
8 changes: 4 additions & 4 deletions docs/WEB_OPENSHIFT.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,24 @@
```
4. Install Karavan using Maven
Download installer from Maven Central: https://repo1.maven.org/maven2/org/apache/camel/karavan/karavan-installer/4.1.0/karavan-installer-4.1.0.jar
Download installer from Maven Central: https://repo1.maven.org/maven2/org/apache/camel/karavan/karavan-installer/4.3.0/karavan-installer-4.3.0.jar
ex. with following command:
```
mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:copy -Dartifact=org.apache.camel.karavan:karavan-installer:4.1.0:jar -DoutputDirectory=.
mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:copy -Dartifact=org.apache.camel.karavan:karavan-installer:4.3.0:jar -DoutputDirectory=.
```
Install Karavan with Gitea (for demo purpose)
```
java -jar karavan-installer-4.1.0.jar --install-gitea
java -jar karavan-installer-4.3.0.jar --install-gitea
```
5. Install Karavan using Jbang
Install Karavan with Gitea (for demo purpose)
```
jbang org.apache.camel.karavan:karavan-installer:4.1.0 --install-gitea
jbang org.apache.camel.karavan:karavan-installer:4.3.0 --install-gitea
```
6. Get karavan route host
Expand Down
4 changes: 2 additions & 2 deletions karavan-core/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion karavan-core/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "karavan-core",
"publisher": "camel-karavan",
"version": "4.1.1",
"version": "4.3.0",
"description": "Apache Camel Karavan Core",
"scripts": {
"build": "tsc && tsc-alias",
Expand Down
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.1.0 camel@apache/camel run *
jbang -Dcamel.jbang.version=4.3.0 camel@apache/camel run *
```

### Publish payment to JMS
Expand Down
4 changes: 2 additions & 2 deletions karavan-designer/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion karavan-designer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "karavan-designer",
"version": "4.1.1",
"version": "4.3.0",
"license": "Apache-2.0",
"scripts": {
"start": "react-scripts start",
Expand Down
2 changes: 1 addition & 1 deletion karavan-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.camel.karavan</groupId>
<artifactId>karavan-generator</artifactId>
<version>4.1.1</version>
<version>4.3.0</version>
<properties>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<maven.compiler.parameters>true</maven.compiler.parameters>
Expand Down
4 changes: 2 additions & 2 deletions karavan-space/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion karavan-space/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "karavan-space",
"version": "4.1.1",
"version": "4.3.0",
"license": "Apache-2.0",
"scripts": {
"cp-designer": "cp -r ../karavan-designer/src/designer src",
Expand Down
7 changes: 6 additions & 1 deletion karavan-vscode/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Changelog

## 4.1.1
## 4.3.0
0. Camel 4.3.0
1. Camel-main Runtime
2. Kamelets 4.3.0
3. Jkube 1.15.0
4. JBang v0.114.0

## 4.1.0
0. Camel 4.1.0
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.1.0 camel@apache/camel run $INTEGRATION.yaml --max-messages=10 --logging-level=info
jbang -Dcamel.jbang.version=4.3.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.1.0 camel@apache/camel export --directory=export
jbang -Dcamel.jbang.version=4.3.0 camel@apache/camel export --directory=export
```

# Issues
Expand Down
4 changes: 2 additions & 2 deletions karavan-vscode/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions karavan-vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"displayName": "Karavan",
"icon": "icons/karavan.png",
"description": "Integration Toolkit for Apache Camel",
"version": "4.1.1",
"version": "4.3.0",
"license": "Apache-2.0",
"preview": false,
"bugs": {
Expand Down Expand Up @@ -63,7 +63,7 @@
"properties": {
"camel.version": {
"type": "string",
"default": "4.1.0",
"default": "4.3.0",
"description": "Camel version",
"scope": "machine",
"order": 10
Expand Down Expand Up @@ -260,8 +260,8 @@
"camel.karavan.project-description=$NAME",
"camel.karavan.target=$TARGET",
"camel.jbang.gav=$GAV",
"camel.jbang.camelSpringBootVersion=4.1.0",
"camel.jbang.springBootVersion=3.1.4",
"camel.jbang.camelSpringBootVersion=4.3.0",
"camel.jbang.springBootVersion=3.2.0",
"camel.jbang.runtime=$RUNTIME",
"camel.jbang.exportDir=.export",
"management.endpoints.web.exposure.include=health",
Expand All @@ -284,7 +284,7 @@
"camel.karavan.project-description=$NAME",
"camel.karavan.target=$TARGET",
"camel.jbang.gav=$GAV",
"camel.jbang.version=4.1.0",
"camel.jbang.version=4.3.0",
"camel.jbang.runtime=camel-main",
"camel.jbang.dependencies=camel-console,camel-platform-http-main",
"camel.jbang.exportDir=.export",
Expand Down Expand Up @@ -375,7 +375,7 @@
},
"default": [
"# jkube properties",
"jkube.version=1.14.0",
"jkube.version=1.15.0",
"jkube.build.strategy=s2i",
"jkube.namespace=${NAMESPACE}",
"jkube.generator.name=image-registry.openshift-image-registry.svc:5000/${NAMESPACE}/$NAME:${DATE}",
Expand All @@ -396,7 +396,7 @@
},
"default": [
"# jkube properties",
"jkube.version=1.14.0",
"jkube.version=1.15.0",
"jkube.build.strategy=s2i",
"jkube.namespace=${NAMESPACE}",
"jkube.generator.name=image-registry.openshift-image-registry.svc:5000/${NAMESPACE}/$NAME:${DATE}",
Expand All @@ -417,7 +417,7 @@
},
"default": [
"# jkube properties",
"jkube.version=1.14.0",
"jkube.version=1.15.0",
"jkube.build.strategy=docker",
"jkube.namespace=default",
"jkube.generator.name=default/$NAME:${DATE}",
Expand All @@ -441,7 +441,7 @@
"label.runtime=app.kubernetes.io/runtime",
"jib.from.image=gcr.io/distroless/java17@sha256:3a4ea21bd7b412b8b6ae61313b39337d8f03bb6844013810e8e4625d8c765edb",
"jib.to.image=default/$NAME:${DATE}",
"jkube.version=1.14.0",
"jkube.version=1.15.0",
"jkube.skip.build=true",
"jkube.build.strategy=jib",
"jkube.namespace=default",
Expand Down
8 changes: 4 additions & 4 deletions karavan-web/docker/Dockerfile.devmode
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM maven:3.9.3-eclipse-temurin-17
FROM maven:3.9.6-eclipse-temurin-17

LABEL "org.opencontainers.image.title"="karavan-devmode"
LABEL "org.opencontainers.image.description"="Apache Camel Karavan DevMode"
LABEL "org.opencontainers.image.url"="https://camel.apache.org"
LABEL "org.opencontainers.image.licenses"="Apache 2.0"
LABEL "org.opencontainers.image.version"="4.1.1"
LABEL "org.opencontainers.image.version"="4.3.0"

RUN apt-get update && apt-get install git && apt-get clean

ENV JBANG_VERSION=0.110.0
ENV CAMEL_VERSION=4.1.0
ENV JBANG_VERSION=0.114.0
ENV CAMEL_VERSION=4.3.0
ENV KARAVAN="/karavan"
ENV JBANG_DIR="$KARAVAN/.jbang"
ENV MAVEN_CONFIG="$KARAVAN/.m2"
Expand Down
15 changes: 7 additions & 8 deletions karavan-web/karavan-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.camel.karavan</groupId>
<artifactId>karavan</artifactId>
<version>4.1.1</version>
<version>4.3.0</version>

<properties>
<compiler-plugin.version>3.11.0</compiler-plugin.version>
Expand All @@ -33,21 +33,20 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>3.4.3</quarkus.platform.version>
<camel.version>4.1.0</camel.version>
<camel-kamelet.version>4.1.0</camel-kamelet.version>
<quarkus.platform.version>3.6.4</quarkus.platform.version>
<camel.version>4.3.0</camel.version>
<camel-kamelet.version>4.3.0</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>
<jgit.version>3.0.6</jgit.version>
<quinoa.version>2.3.1</quinoa.version>
<resources-plugin.version>3.3.0</resources-plugin.version>
<kubernetes-client.version>6.7.1</kubernetes-client.version>

<picocli.version>4.7.3</picocli.version>
<log4j-version>2.20.0</log4j-version>
<slf4j-api-version>2.0.6</slf4j-api-version>
<log4j2-version>2.20.0</log4j2-version>

<docker-java.version>3.3.2</docker-java.version>
<docker-java.version>3.3.4</docker-java.version>

<maven-shade-plugin.version>3.4.1</maven-shade-plugin.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion karavan-web/karavan-app/src/main/docker/Dockerfile.jdk
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ LABEL "org.opencontainers.image.title"="karavan"
LABEL "org.opencontainers.image.description"="Apache Camel Karavan"
LABEL "org.opencontainers.image.url"="https://camel.apache.org"
LABEL "org.opencontainers.image.licenses"="Apache 2.0"
LABEL "org.opencontainers.image.version"="4.1.1"
LABEL "org.opencontainers.image.version"="4.3.0"
LABEL "org.apache.camel.karavan/type"="internal"

RUN mkdir /opt/app
Expand Down
Loading

0 comments on commit 071c94e

Please sign in to comment.