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
commit 83af4d3bdeda856e6067dc1587145bfe75493583 Author: Marat Gubaidullin <ma...@talismancloud.io> AuthorDate: Mon Sep 18 21:49:55 2023 -0400 Set version 4.0.0 #895 --- .github/workflows/app.yml | 2 +- .github/workflows/docker-devmode.yml | 2 +- .github/workflows/installer.yml | 2 +- .github/workflows/operator.yml | 2 +- change_version.sh | 14 ++++++-------- docs/AWS/karavan-app-deployment-public.yaml | 2 +- docs/AWS/karavan-quarkus-task-aws.yaml | 2 +- docs/AWS/karavan-spring-boot-task-aws.yaml | 4 ++-- docs/VSCODE_HOWTO.md | 4 ++-- docs/WEB_KUBERNETES.md | 8 ++++---- docs/WEB_OPENSHIFT.md | 8 ++++---- karavan-core/package-lock.json | 4 ++-- karavan-core/package.json | 2 +- karavan-demo/jms-to-kafka/docs/README.md | 2 +- karavan-designer/package-lock.json | 6 +++--- karavan-designer/package.json | 2 +- karavan-generator/pom.xml | 2 +- karavan-space/package-lock.json | 6 +++--- karavan-space/package.json | 2 +- karavan-web/docker/Dockerfile.devmode | 2 +- karavan-web/karavan-app/pom.xml | 2 +- karavan-web/karavan-app/src/main/docker/Dockerfile.jdk | 2 +- .../karavan-app/src/main/resources/application.properties | 4 ++-- .../main/resources/snippets/docker-application.properties | 2 +- .../resources/snippets/kubernetes-application.properties | 2 +- .../resources/snippets/openshift-application.properties | 2 +- karavan-web/karavan-app/src/main/webui/package-lock.json | 6 +++--- karavan-web/karavan-app/src/main/webui/package.json | 2 +- karavan-web/karavan-installer/pom.xml | 2 +- .../org/apache/camel/karavan/installer/KaravanCommand.java | 2 +- karavan-web/karavan-operator/Makefile | 2 +- karavan-web/karavan-operator/pom.xml | 2 +- .../src/main/resources/application.properties | 4 ++-- .../main/resources/quarkus-builder-script-kubernetes.sh | 2 +- .../src/main/resources/quarkus-builder-script-openshift.sh | 2 +- .../resources/spring-boot-builder-script-kubernetes.sh | 2 +- .../main/resources/spring-boot-builder-script-openshift.sh | 2 +- karavan-web/pom.xml | 2 +- 38 files changed, 60 insertions(+), 62 deletions(-) diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml index 2d68771b..d456624a 100644 --- a/.github/workflows/app.yml +++ b/.github/workflows/app.yml @@ -9,7 +9,7 @@ on: branches: [ main ] env: - TAG: 4.0.0-RC2 + TAG: 4.0.0 jobs: build: diff --git a/.github/workflows/docker-devmode.yml b/.github/workflows/docker-devmode.yml index 932d4974..2bf9b334 100644 --- a/.github/workflows/docker-devmode.yml +++ b/.github/workflows/docker-devmode.yml @@ -9,7 +9,7 @@ on: env: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }}-devmode - TAG: 4.0.0-RC2 + TAG: 4.0.0 jobs: build: diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml index 5b5274b2..c4949e1b 100644 --- a/.github/workflows/installer.yml +++ b/.github/workflows/installer.yml @@ -9,7 +9,7 @@ on: branches: [ main ] env: - TAG: 4.0.0-RC2 + TAG: 4.0.0 jobs: build: diff --git a/.github/workflows/operator.yml b/.github/workflows/operator.yml index d85ff301..a55e98d5 100644 --- a/.github/workflows/operator.yml +++ b/.github/workflows/operator.yml @@ -13,7 +13,7 @@ env: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }}-operator IMAGE_NAME_BUNDLE: ${{ github.repository }}-bundle - TAG: 4.0.0-RC2 + TAG: 4.0.0 jobs: build: diff --git a/change_version.sh b/change_version.sh index 0ba9a544..c0e6ae1c 100755 --- a/change_version.sh +++ b/change_version.sh @@ -3,14 +3,14 @@ echo "Set Generator pom.xml version: $1"; mvn versions:set -DnewVersion=$1 -f karavan-generator +echo "Set Web pom.xml version: $1"; +mvn versions:set -DnewVersion=$1 -f karavan-web + echo "Set Application pom.xml version: $1"; mvn versions:set -DnewVersion=$1 -f karavan-web/karavan-app -echo "Set Operator pom.xml version: $1"; -mvn versions:set -DnewVersion=$1 -f karavan-web/karavan-operator - -echo "Set Operator pom.xml version: $1"; -mvn versions:set -DnewVersion=$1 -f karavan-web/karavan-cli +echo "Set Installer pom.xml version: $1"; +mvn versions:set -DnewVersion=$1 -f karavan-web/karavan-installer echo "Set Core package.json extension version: $1"; yarn version --new-version $1 --no-commit --no-git-tag-version --cwd karavan-core @@ -27,8 +27,6 @@ yarn version --new-version $1 --no-commit --no-git-tag-version --cwd karavan-vsc echo "Set VSCode extension package.json version: $1"; yarn version --new-version $1 --no-commit --no-git-tag-version --cwd karavan-space -echo "Set Github Workflow Builder TAG version: $1"; -sed -i.bak 's/TAG:.*/TAG: '"$1"'/g' .github/workflows/docker-builder.yml echo "Set Github Workflow Runner TAG version: $1"; sed -i.bak 's/TAG:.*/TAG: '"$1"'/g' .github/workflows/docker-devmode.yml @@ -39,7 +37,7 @@ echo "Set Github Workflow App TAG version: $1"; sed -i.bak 's/TAG:.*/TAG: '"$1"'/g' .github/workflows/operator.yml echo "Set Github Workflow App TAG version: $1"; -sed -i.bak 's/TAG:.*/TAG: '"$1"'/g' .github/workflows/cli.yml +sed -i.bak 's/TAG:.*/TAG: '"$1"'/g' .github/workflows/installer.yml echo "Set application.properties karavan.version=$1"; sed -i.bak 's/karavan.version.*/karavan.version='"$1"'/g' karavan-web/karavan-operator/src/main/resources/application.properties diff --git a/docs/AWS/karavan-app-deployment-public.yaml b/docs/AWS/karavan-app-deployment-public.yaml index 3f4bf50a..f99b3229 100644 --- a/docs/AWS/karavan-app-deployment-public.yaml +++ b/docs/AWS/karavan-app-deployment-public.yaml @@ -23,7 +23,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: ghcr.io/apache/camel-karavan:4.0.0-RC2 + image: ghcr.io/apache/camel-karavan:4.0.0 imagePullPolicy: Always name: karavan resources: diff --git a/docs/AWS/karavan-quarkus-task-aws.yaml b/docs/AWS/karavan-quarkus-task-aws.yaml index 86f76e5c..516c0b80 100644 --- a/docs/AWS/karavan-quarkus-task-aws.yaml +++ b/docs/AWS/karavan-quarkus-task-aws.yaml @@ -79,7 +79,7 @@ spec: cd ${CHECKOUT_DIR}/$(inputs.params.project) - entrypoint -Dcamel.jbang.version=4.0.0-RC2 camel@apache/camel export --local-kamelet-dir=${KAMELETS_DIR} + entrypoint -Dcamel.jbang.version=4.0.0 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/docs/AWS/karavan-spring-boot-task-aws.yaml b/docs/AWS/karavan-spring-boot-task-aws.yaml index 2e6ee429..f7ecfa68 100644 --- a/docs/AWS/karavan-spring-boot-task-aws.yaml +++ b/docs/AWS/karavan-spring-boot-task-aws.yaml @@ -79,7 +79,7 @@ spec: cd ${CHECKOUT_DIR}/$(inputs.params.project) - entrypoint -Dcamel.jbang.version=4.0.0-RC2 camel@apache/camel export --local-kamelet-dir=${KAMELETS_DIR} + entrypoint -Dcamel.jbang.version=4.0.0 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') @@ -97,7 +97,7 @@ spec: -Djkube.docker.push.registry=$AWS_ACCOUNT.dkr.ecr.$AWS_REGION.amazonaws.com \ -Djkube.generator.name=$AWS_ACCOUNT.dkr.ecr.$AWS_REGION.amazonaws.com/${NAMESPACE}/$(inputs.params.project):${DATE} - image: ghcr.io/apache/camel-karavan-builder:4.0.0-RC2 + image: ghcr.io/apache/camel-karavan-builder:4.0.0 env: - name: GIT_REPOSITORY valueFrom: diff --git a/docs/VSCODE_HOWTO.md b/docs/VSCODE_HOWTO.md index 7b232d6f..c475b7e7 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-RC2 camel@apache/camel run $INTEGRATION.yaml --max-messages=10 --logging-level=info + jbang -Dcamel.jbang.version=4.0.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-RC2 camel@apache/camel export --directory=export + jbang -Dcamel.jbang.version=4.0.0 camel@apache/camel export --directory=export ``` \ No newline at end of file diff --git a/docs/WEB_KUBERNETES.md b/docs/WEB_KUBERNETES.md index 1f8b2282..92160209 100644 --- a/docs/WEB_KUBERNETES.md +++ b/docs/WEB_KUBERNETES.md @@ -18,16 +18,16 @@ ``` 4. Install Karavan using Maven - Download installer from Maven Central: https://repo1.maven.org/maven2/org/apache/camel/karavan/karavan-installer/4.0.0-RC2/karavan-installer-4.0.0-RC2.jar + Download installer from Maven Central: https://repo1.maven.org/maven2/org/apache/camel/karavan/karavan-installer/4.0.0/karavan-installer-4.0.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.0.0-RC2:jar -DoutputDirectory=. + mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:copy -Dartifact=org.apache.camel.karavan:karavan-installer:4.0.0:jar -DoutputDirectory=. ``` Install Karavan with Gitea (for demo purpose) ``` - java -jar karavan-installer-4.0.0-RC2.jar --install-gitea --node-port=30777 + java -jar karavan-installer-4.0.0.jar --install-gitea --node-port=30777 ``` @@ -35,7 +35,7 @@ Install Karavan with Gitea (for demo purpose) ``` - jbang org.apache.camel.karavan:karavan-installer:4.0.0-RC2 --install-gitea --node-port=30777 + jbang org.apache.camel.karavan:karavan-installer:4.0.0 --install-gitea --node-port=30777 ``` 6. Get karavan service URL diff --git a/docs/WEB_OPENSHIFT.md b/docs/WEB_OPENSHIFT.md index 63580f1e..44412f55 100644 --- a/docs/WEB_OPENSHIFT.md +++ b/docs/WEB_OPENSHIFT.md @@ -18,16 +18,16 @@ ``` 4. Install Karavan using Maven - Download installer from Maven Central: https://repo1.maven.org/maven2/org/apache/camel/karavan/karavan-installer/4.0.0-RC2/karavan-installer-4.0.0-RC2.jar + Download installer from Maven Central: https://repo1.maven.org/maven2/org/apache/camel/karavan/karavan-installer/4.0.0/karavan-installer-4.0.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.0.0-RC2:jar -DoutputDirectory=. + mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:copy -Dartifact=org.apache.camel.karavan:karavan-installer:4.0.0:jar -DoutputDirectory=. ``` Install Karavan with Gitea (for demo purpose) ``` - java -jar karavan-installer-4.0.0-RC2.jar --install-gitea + java -jar karavan-installer-4.0.0.jar --install-gitea ``` @@ -35,7 +35,7 @@ Install Karavan with Gitea (for demo purpose) ``` - jbang org.apache.camel.karavan:karavan-installer:4.0.0-RC2 --install-gitea + jbang org.apache.camel.karavan:karavan-installer:4.0.0 --install-gitea ``` 6. Get karavan route host diff --git a/karavan-core/package-lock.json b/karavan-core/package-lock.json index 2cbf7bc4..be9a5f00 100644 --- a/karavan-core/package-lock.json +++ b/karavan-core/package-lock.json @@ -1,12 +1,12 @@ { "name": "karavan-core", - "version": "4.0.0-RC2", + "version": "4.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "karavan-core", - "version": "4.0.0-RC2", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { "@types/js-yaml": "^4.0.5", diff --git a/karavan-core/package.json b/karavan-core/package.json index a593eb85..18eb281e 100644 --- a/karavan-core/package.json +++ b/karavan-core/package.json @@ -1,7 +1,7 @@ { "name": "karavan-core", "publisher": "camel-karavan", - "version": "4.0.0-RC2", + "version": "4.0.0", "description": "Apache Camel Karavan Core", "scripts": { "build": "tsc && tsc-alias", diff --git a/karavan-demo/jms-to-kafka/docs/README.md b/karavan-demo/jms-to-kafka/docs/README.md index e4ad9e41..2674d9fc 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.0-RC2 camel@apache/camel run * +jbang -Dcamel.jbang.version=4.0.0 camel@apache/camel run * ``` ### Publish payment to JMS diff --git a/karavan-designer/package-lock.json b/karavan-designer/package-lock.json index 654708b7..5dbd70a2 100644 --- a/karavan-designer/package-lock.json +++ b/karavan-designer/package-lock.json @@ -1,12 +1,12 @@ { "name": "karavan-designer", - "version": "4.0.0-RC2", + "version": "4.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "karavan-designer", - "version": "4.0.0-RC2", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { "@monaco-editor/react": "^4.5.2", @@ -42,7 +42,7 @@ } }, "../karavan-core": { - "version": "4.0.0-RC2", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { "@types/js-yaml": "^4.0.5", diff --git a/karavan-designer/package.json b/karavan-designer/package.json index 47cec418..bebc1f1c 100644 --- a/karavan-designer/package.json +++ b/karavan-designer/package.json @@ -1,6 +1,6 @@ { "name": "karavan-designer", - "version": "4.0.0-RC2", + "version": "4.0.0", "license": "Apache-2.0", "scripts": { "start": "react-scripts start", diff --git a/karavan-generator/pom.xml b/karavan-generator/pom.xml index e2b22106..940bf2db 100644 --- a/karavan-generator/pom.xml +++ b/karavan-generator/pom.xml @@ -19,7 +19,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.camel.karavan</groupId> <artifactId>karavan-generator</artifactId> - <version>4.0.0-RC2</version> + <version>4.0.0</version> <properties> <compiler-plugin.version>3.8.1</compiler-plugin.version> <maven.compiler.parameters>true</maven.compiler.parameters> diff --git a/karavan-space/package-lock.json b/karavan-space/package-lock.json index 6691eb72..8db0dc56 100644 --- a/karavan-space/package-lock.json +++ b/karavan-space/package-lock.json @@ -1,12 +1,12 @@ { "name": "karavan-space", - "version": "4.0.0-RC2", + "version": "4.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "karavan-space", - "version": "4.0.0-RC2", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { "@monaco-editor/react": "4.5.0", @@ -44,7 +44,7 @@ } }, "../karavan-core": { - "version": "4.0.0-RC2", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { "@types/js-yaml": "^4.0.5", diff --git a/karavan-space/package.json b/karavan-space/package.json index 22fb8e89..ec5ba94d 100644 --- a/karavan-space/package.json +++ b/karavan-space/package.json @@ -1,6 +1,6 @@ { "name": "karavan-space", - "version": "4.0.0-RC2", + "version": "4.0.0", "license": "Apache-2.0", "scripts": { "cp-designer": "cp -r ../karavan-designer/src/designer src", diff --git a/karavan-web/docker/Dockerfile.devmode b/karavan-web/docker/Dockerfile.devmode index b121ab25..9debe731 100644 --- a/karavan-web/docker/Dockerfile.devmode +++ b/karavan-web/docker/Dockerfile.devmode @@ -4,7 +4,7 @@ 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.0.0-RC2" +LABEL "org.opencontainers.image.version"="4.0.0" RUN apt-get update && apt-get install git && apt-get clean diff --git a/karavan-web/karavan-app/pom.xml b/karavan-web/karavan-app/pom.xml index c042dd30..8e0df8b9 100644 --- a/karavan-web/karavan-app/pom.xml +++ b/karavan-web/karavan-app/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.camel.karavan</groupId> <artifactId>karavan-web</artifactId> - <version>4.0.0-RC2</version> + <version>4.0.0</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/karavan-web/karavan-app/src/main/docker/Dockerfile.jdk b/karavan-web/karavan-app/src/main/docker/Dockerfile.jdk index 2022efbc..53b400e3 100644 --- a/karavan-web/karavan-app/src/main/docker/Dockerfile.jdk +++ b/karavan-web/karavan-app/src/main/docker/Dockerfile.jdk @@ -4,7 +4,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.0.0-RC2" +LABEL "org.opencontainers.image.version"="4.0.0" LABEL "org.apache.camel.karavan/type"="internal" RUN mkdir /opt/app diff --git a/karavan-web/karavan-app/src/main/resources/application.properties b/karavan-web/karavan-app/src/main/resources/application.properties index ec175d4d..35903f62 100644 --- a/karavan-web/karavan-app/src/main/resources/application.properties +++ b/karavan-web/karavan-app/src/main/resources/application.properties @@ -1,4 +1,4 @@ -karavan.version=4.0.0-RC2 +karavan.version=4.0.0 karavan.environment=dev karavan.environments=dev @@ -9,7 +9,7 @@ karavan.container.status.interval=2s karavan.container.statistics.interval=10s # karavan.container.statistics.interval should be off in kubernetes -karavan.devmode.image=ghcr.io/apache/camel-karavan-devmode:4.0.0-RC2 +karavan.devmode.image=ghcr.io/apache/camel-karavan-devmode:4.0.0 karavan.maven.cache= # Git repository Configuration 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 5fab57b9..1917b819 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.0-RC2 +camel.jbang.version=4.0.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 ff0c5b6a..1c091daf 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.0-RC2 +camel.jbang.version=4.0.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 fe9786e0..d7ec7986 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.0-RC2 +camel.jbang.version=4.0.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/webui/package-lock.json b/karavan-web/karavan-app/src/main/webui/package-lock.json index a87a8bcd..555c2ced 100644 --- a/karavan-web/karavan-app/src/main/webui/package-lock.json +++ b/karavan-web/karavan-app/src/main/webui/package-lock.json @@ -1,12 +1,12 @@ { "name": "karavan", - "version": "4.0.0-RC2", + "version": "4.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "karavan", - "version": "4.0.0-RC2", + "version": "4.0.0", "dependencies": { "@microsoft/fetch-event-source": "^2.0.1", "@monaco-editor/react": "4.5.1", @@ -49,7 +49,7 @@ } }, "../../../../../karavan-core": { - "version": "4.0.0-RC2", + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { "@types/js-yaml": "^4.0.5", diff --git a/karavan-web/karavan-app/src/main/webui/package.json b/karavan-web/karavan-app/src/main/webui/package.json index 54e823a3..67b92eaf 100644 --- a/karavan-web/karavan-app/src/main/webui/package.json +++ b/karavan-web/karavan-app/src/main/webui/package.json @@ -1,6 +1,6 @@ { "name": "karavan", - "version": "4.0.0-RC2", + "version": "4.0.0", "private": true, "scripts": { "copy-designer": "cp -r ../../../../../karavan-designer/src/designer src && cp -r ../../../../../karavan-designer/src/knowledgebase src", diff --git a/karavan-web/karavan-installer/pom.xml b/karavan-web/karavan-installer/pom.xml index 0a53fe60..11b334cd 100644 --- a/karavan-web/karavan-installer/pom.xml +++ b/karavan-web/karavan-installer/pom.xml @@ -6,7 +6,7 @@ <groupId>org.apache.camel.karavan</groupId> <artifactId>karavan-installer</artifactId> <name>karavan-installer</name> - <version>4.0.0-RC2</version> + <version>4.0.0</version> <packaging>jar</packaging> <!-- Required to publish to the repo --> diff --git a/karavan-web/karavan-installer/src/main/java/org/apache/camel/karavan/installer/KaravanCommand.java b/karavan-web/karavan-installer/src/main/java/org/apache/camel/karavan/installer/KaravanCommand.java index 1af74baf..f66059aa 100644 --- a/karavan-web/karavan-installer/src/main/java/org/apache/camel/karavan/installer/KaravanCommand.java +++ b/karavan-web/karavan-installer/src/main/java/org/apache/camel/karavan/installer/KaravanCommand.java @@ -14,7 +14,7 @@ import java.util.concurrent.Callable; description = "Karavan Installer") public class KaravanCommand implements Callable<Integer> { - @CommandLine.Option(names = {"-v", "--version"}, required = true, description = "Karavan version", defaultValue = "4.0.0-RC2") + @CommandLine.Option(names = {"-v", "--version"}, required = true, description = "Karavan version", defaultValue = "4.0.0") private String version; @CommandLine.Option(names = {"-n", "--namespace"}, description = "Namespace", defaultValue = Constants.DEFAULT_NAMESPACE) private String namespace; diff --git a/karavan-web/karavan-operator/Makefile b/karavan-web/karavan-operator/Makefile index f8975fde..c5000f0f 100644 --- a/karavan-web/karavan-operator/Makefile +++ b/karavan-web/karavan-operator/Makefile @@ -1,5 +1,5 @@ -VERSION ?=4.0.0-RC2 +VERSION ?=4.0.0 # CHANNELS define the bundle channels used in the bundle. # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable") diff --git a/karavan-web/karavan-operator/pom.xml b/karavan-web/karavan-operator/pom.xml index 76641c49..c37a305f 100644 --- a/karavan-web/karavan-operator/pom.xml +++ b/karavan-web/karavan-operator/pom.xml @@ -6,7 +6,7 @@ <groupId>org.apache.camel.karavan</groupId> <artifactId>karavan-operator</artifactId> <name>karavan-operator</name> - <version>4.0.0-RC2</version> + <version>4.0.0</version> <packaging>jar</packaging> <properties> <compiler-plugin.version>3.8.1</compiler-plugin.version> diff --git a/karavan-web/karavan-operator/src/main/resources/application.properties b/karavan-web/karavan-operator/src/main/resources/application.properties index 341d0edf..920b532e 100644 --- a/karavan-web/karavan-operator/src/main/resources/application.properties +++ b/karavan-web/karavan-operator/src/main/resources/application.properties @@ -20,8 +20,8 @@ quarkus.kubernetes.resources.limits.cpu=1000m quarkus.container-image.builder=jib quarkus.container-image.group=ghcr.io/apache quarkus.container-image.name=camel-karavan-operator -quarkus.container-image.tag=4.0.0-RC2 +quarkus.container-image.tag=4.0.0 -karavan.version=4.0.0-RC2 +karavan.version=4.0.0 karavan.image=ghcr.io/apache/camel-karavan karavan.build-image=ghcr.io/apache/camel-karavan-builder diff --git a/karavan-web/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh b/karavan-web/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh index 810bdf2e..3dfcbc67 100644 --- a/karavan-web/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh +++ b/karavan-web/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=4.0.0-RC2 camel@apache/camel export --local-kamelet-dir=${KAMELETS_DIR} +entrypoint -Dcamel.jbang.version=4.0.0 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-web/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh b/karavan-web/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh index d649d0ce..b840c03c 100644 --- a/karavan-web/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh +++ b/karavan-web/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=4.0.0-RC2 camel@apache/camel export --local-kamelet-dir=${KAMELETS_DIR} +entrypoint -Dcamel.jbang.version=4.0.0 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-web/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh b/karavan-web/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh index da2c0b77..681b06b3 100644 --- a/karavan-web/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh +++ b/karavan-web/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=4.0.0-RC2 camel@apache/camel export --local-kamelet-dir=${KAMELETS_DIR} +entrypoint -Dcamel.jbang.version=4.0.0 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-web/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh b/karavan-web/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh index 280b5711..c591e792 100644 --- a/karavan-web/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh +++ b/karavan-web/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=4.0.0-RC2 camel@apache/camel export --local-kamelet-dir=${KAMELETS_DIR} +entrypoint -Dcamel.jbang.version=4.0.0 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-web/pom.xml b/karavan-web/pom.xml index b9166af3..36ffc21b 100644 --- a/karavan-web/pom.xml +++ b/karavan-web/pom.xml @@ -6,7 +6,7 @@ <groupId>org.apache.camel.karavan</groupId> <artifactId>karavan-web</artifactId> - <version>4.0.0-RC2</version> + <version>4.0.0</version> <packaging>pom</packaging> <properties>