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 773196f07043005dca309b94bd0cbda9bf35bf2d Author: Marat Gubaidullin <ma...@talismancloud.io> AuthorDate: Thu Apr 11 11:16:59 2024 -0400 Upgrade to Camel 4.5.0 --- .github/workflows/app-oidc.yml | 2 +- .github/workflows/app.yml | 2 +- .github/workflows/docker-devmode.yml | 2 +- docs/install/karavan-docker/docker-compose-gitea.yaml | 2 +- docs/install/karavan-docker/docker-compose.yaml | 2 +- docs/install/karavan-kubernetes/deployment.yaml | 4 ++-- docs/install/karavan-kubernetes/kustomization.yaml | 2 +- karavan-app/pom.xml | 2 +- karavan-app/src/main/docker/Dockerfile | 2 +- karavan-app/src/main/resources/application.properties | 4 ++-- .../src/main/resources/snippets/docker-application.properties | 2 +- .../main/resources/snippets/kubernetes-application.properties | 2 +- .../main/resources/snippets/openshift-application.properties | 2 +- karavan-app/src/main/webui/package-lock.json | 4 ++-- karavan-app/src/main/webui/package.json | 2 +- karavan-core/package-lock.json | 4 ++-- karavan-core/package.json | 2 +- karavan-designer/package-lock.json | 4 ++-- karavan-designer/package.json | 2 +- karavan-devmode/Dockerfile | 4 ++-- karavan-generator/pom.xml | 2 +- karavan-space/package-lock.json | 4 ++-- karavan-space/package.json | 2 +- karavan-space/src/App.tsx | 2 +- karavan-vscode/CHANGELOG.md | 8 ++++++++ karavan-vscode/package-lock.json | 4 ++-- karavan-vscode/package.json | 10 +++++----- 27 files changed, 46 insertions(+), 38 deletions(-) diff --git a/.github/workflows/app-oidc.yml b/.github/workflows/app-oidc.yml index 2a145d06..87a3dad0 100644 --- a/.github/workflows/app-oidc.yml +++ b/.github/workflows/app-oidc.yml @@ -10,7 +10,7 @@ on: env: REGISTRY: ghcr.io - TAG: 4.4.1 + TAG: 4.5.0 jobs: build: diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml index b165b6e1..ebe35c94 100644 --- a/.github/workflows/app.yml +++ b/.github/workflows/app.yml @@ -10,7 +10,7 @@ on: env: REGISTRY: ghcr.io - TAG: 4.4.1 + TAG: 4.5.0 jobs: build: diff --git a/.github/workflows/docker-devmode.yml b/.github/workflows/docker-devmode.yml index fbbb6923..abc709ed 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.4.1 + TAG: 4.5.0 jobs: docker: diff --git a/docs/install/karavan-docker/docker-compose-gitea.yaml b/docs/install/karavan-docker/docker-compose-gitea.yaml index 483148a4..dc688f8d 100644 --- a/docs/install/karavan-docker/docker-compose-gitea.yaml +++ b/docs/install/karavan-docker/docker-compose-gitea.yaml @@ -4,7 +4,7 @@ services: karavan: container_name: karavan - image: ghcr.io/apache/camel-karavan:4.4.1 + image: ghcr.io/apache/camel-karavan:4.5.0 ports: - "8080:8080" environment: diff --git a/docs/install/karavan-docker/docker-compose.yaml b/docs/install/karavan-docker/docker-compose.yaml index d66e2bb8..49c170c9 100644 --- a/docs/install/karavan-docker/docker-compose.yaml +++ b/docs/install/karavan-docker/docker-compose.yaml @@ -4,7 +4,7 @@ services: karavan: container_name: karavan - image: ghcr.io/apache/camel-karavan:4.4.1 + image: ghcr.io/apache/camel-karavan:4.5.0 ports: - "8080:8080" environment: diff --git a/docs/install/karavan-kubernetes/deployment.yaml b/docs/install/karavan-kubernetes/deployment.yaml index 750d76cb..7ee11441 100644 --- a/docs/install/karavan-kubernetes/deployment.yaml +++ b/docs/install/karavan-kubernetes/deployment.yaml @@ -24,7 +24,7 @@ spec: - name: "KARAVAN_CAMEL_STATUS_INTERVAL" value: "3s" - name: "KARAVAN_DEVMODE_IMAGE" - value: "ghcr.io/apache/camel-karavan-devmode:4.4.1" + value: "ghcr.io/apache/camel-karavan-devmode:4.5.0" - name: "karavan.git.repository" valueFrom: secretKeyRef: @@ -75,7 +75,7 @@ spec: fieldRef: apiVersion: "" fieldPath: "metadata.namespace" - image: "ghcr.io/apache/camel-karavan:4.4.1" + image: "ghcr.io/apache/camel-karavan:4.5.0" imagePullPolicy: "Always" name: "karavan" ports: diff --git a/docs/install/karavan-kubernetes/kustomization.yaml b/docs/install/karavan-kubernetes/kustomization.yaml index 92cea4ba..27177543 100644 --- a/docs/install/karavan-kubernetes/kustomization.yaml +++ b/docs/install/karavan-kubernetes/kustomization.yaml @@ -4,7 +4,7 @@ commonLabels: app: "karavan" app.kubernetes.io/part-of: "karavan" app.kubernetes.io/name: "karavan" - app.kubernetes.io/version: "4.4.1" + app.kubernetes.io/version: "4.5.0" namespace: "karavan" resources: - secret.yaml diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml index 94785a20..6f7ddcd7 100644 --- a/karavan-app/pom.xml +++ b/karavan-app/pom.xml @@ -21,7 +21,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.camel.karavan</groupId> <artifactId>karavan</artifactId> - <version>4.4.1</version> + <version>4.5.0</version> <properties> <compiler-plugin.version>3.11.0</compiler-plugin.version> diff --git a/karavan-app/src/main/docker/Dockerfile b/karavan-app/src/main/docker/Dockerfile index b3f3fe0f..a0003533 100644 --- a/karavan-app/src/main/docker/Dockerfile +++ b/karavan-app/src/main/docker/Dockerfile @@ -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.4.1" +LABEL "org.opencontainers.image.version"="4.5.0" LABEL "org.apache.camel.karavan/type"="internal" RUN mkdir /opt/app diff --git a/karavan-app/src/main/resources/application.properties b/karavan-app/src/main/resources/application.properties index 27aee6db..fa7f788a 100644 --- a/karavan-app/src/main/resources/application.properties +++ b/karavan-app/src/main/resources/application.properties @@ -15,7 +15,7 @@ # limitations under the License. # karavan.title=Apache Camel Karavan -karavan.version=4.4.1 +karavan.version=4.5.0 karavan.environment=dev karavan.environments=dev @@ -26,7 +26,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.4.1 +karavan.devmode.image=ghcr.io/apache/camel-karavan-devmode:4.5.0 karavan.devmode.create-pvc=false karavan.devmode.service.account=karavan karavan.builder.service.account=karavan diff --git a/karavan-app/src/main/resources/snippets/docker-application.properties b/karavan-app/src/main/resources/snippets/docker-application.properties index f75d90c4..b32b6708 100644 --- a/karavan-app/src/main/resources/snippets/docker-application.properties +++ b/karavan-app/src/main/resources/snippets/docker-application.properties @@ -19,5 +19,5 @@ camel.routecontroller.threadPoolSize=3 camel.context.dev-console=true camel.health.enabled=true camel.health.exposure-level=full -jkube.version=1.16.1 +jkube.version=1.16.2 jib.from.image=gcr.io/distroless/java17@sha256:68e2373f7bef9486c08356bd9ffd3b40b56e6b9316c5f6885eb58b1d9093b43d diff --git a/karavan-app/src/main/resources/snippets/kubernetes-application.properties b/karavan-app/src/main/resources/snippets/kubernetes-application.properties index 5dfe5444..b63cc09b 100644 --- a/karavan-app/src/main/resources/snippets/kubernetes-application.properties +++ b/karavan-app/src/main/resources/snippets/kubernetes-application.properties @@ -22,7 +22,7 @@ camel.context.dev-console=true label.runtime=app.kubernetes.io/runtime jib.from.image=gcr.io/distroless/java17@sha256:68e2373f7bef9486c08356bd9ffd3b40b56e6b9316c5f6885eb58b1d9093b43d #jib.from.image=gcr.io/distroless/java17-debian11:nonroot-arm64 -jkube.version=1.16.1 +jkube.version=1.16.2 jkube.skip.build=true jkube.namespace=default jkube.imagePullPolicy=Always diff --git a/karavan-app/src/main/resources/snippets/openshift-application.properties b/karavan-app/src/main/resources/snippets/openshift-application.properties index 159d181f..bcdcb794 100644 --- a/karavan-app/src/main/resources/snippets/openshift-application.properties +++ b/karavan-app/src/main/resources/snippets/openshift-application.properties @@ -21,7 +21,7 @@ camel.routecontroller.threadPoolSize=3 camel.context.dev-console=true label.runtime=app.openshift.io/runtime jib.from.image=gcr.io/distroless/java17@sha256:68e2373f7bef9486c08356bd9ffd3b40b56e6b9316c5f6885eb58b1d9093b43d -jkube.version=1.16.1 +jkube.version=1.16.2 jkube.skip.build=true jkube.namespace=default jkube.imagePullPolicy=IfNotPresent diff --git a/karavan-app/src/main/webui/package-lock.json b/karavan-app/src/main/webui/package-lock.json index 2ec1e4f6..3a1cb6e6 100644 --- a/karavan-app/src/main/webui/package-lock.json +++ b/karavan-app/src/main/webui/package-lock.json @@ -1,12 +1,12 @@ { "name": "karavan", - "version": "4.4.1", + "version": "4.5.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "karavan", - "version": "4.4.1", + "version": "4.5.0", "dependencies": { "@hookform/error-message": "^2.0.1", "@hookform/resolvers": "^3.3.4", diff --git a/karavan-app/src/main/webui/package.json b/karavan-app/src/main/webui/package.json index 85e16ccb..36e4390d 100644 --- a/karavan-app/src/main/webui/package.json +++ b/karavan-app/src/main/webui/package.json @@ -1,6 +1,6 @@ { "name": "karavan", - "version": "4.4.1", + "version": "4.5.0", "private": true, "scripts": { "copy-designer": "cp -r ../../../../karavan-designer/src/designer src", diff --git a/karavan-core/package-lock.json b/karavan-core/package-lock.json index 79032c07..56da3d0d 100644 --- a/karavan-core/package-lock.json +++ b/karavan-core/package-lock.json @@ -1,12 +1,12 @@ { "name": "karavan-core", - "version": "4.4.1", + "version": "4.5.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "karavan-core", - "version": "4.4.1", + "version": "4.5.0", "license": "Apache-2.0", "dependencies": { "@types/js-yaml": "^4.0.7", diff --git a/karavan-core/package.json b/karavan-core/package.json index 51d6842b..6dc8e860 100644 --- a/karavan-core/package.json +++ b/karavan-core/package.json @@ -1,7 +1,7 @@ { "name": "karavan-core", "publisher": "camel-karavan", - "version": "4.4.1", + "version": "4.5.0", "description": "Apache Camel Karavan Core", "scripts": { "build": "tsc && tsc-alias", diff --git a/karavan-designer/package-lock.json b/karavan-designer/package-lock.json index 1631ba22..07d89bca 100644 --- a/karavan-designer/package-lock.json +++ b/karavan-designer/package-lock.json @@ -1,12 +1,12 @@ { "name": "karavan-designer", - "version": "4.4.1", + "version": "4.5.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "karavan-designer", - "version": "4.4.1", + "version": "4.5.0", "license": "Apache-2.0", "dependencies": { "@monaco-editor/react": "^4.6.0", diff --git a/karavan-designer/package.json b/karavan-designer/package.json index 7ae3794d..228be65d 100644 --- a/karavan-designer/package.json +++ b/karavan-designer/package.json @@ -1,6 +1,6 @@ { "name": "karavan-designer", - "version": "4.4.1", + "version": "4.5.0", "license": "Apache-2.0", "scripts": { "start": "react-scripts start", diff --git a/karavan-devmode/Dockerfile b/karavan-devmode/Dockerfile index 8ed4d341..72da3091 100644 --- a/karavan-devmode/Dockerfile +++ b/karavan-devmode/Dockerfile @@ -19,11 +19,11 @@ 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.4.1" +LABEL "org.opencontainers.image.version"="4.5.0" RUN apt-get update && apt-get install git && apt-get clean -ENV JBANG_VERSION=0.115.0 +ENV JBANG_VERSION=0.116.0 ENV CAMEL_VERSION=4.4.0 ENV KARAVAN="/karavan" ENV JBANG_DIR="$KARAVAN/.jbang" diff --git a/karavan-generator/pom.xml b/karavan-generator/pom.xml index 93e86d4d..1f8a60f4 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.4.1</version> + <version>4.5.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 0b56b527..efc423bc 100644 --- a/karavan-space/package-lock.json +++ b/karavan-space/package-lock.json @@ -1,12 +1,12 @@ { "name": "karavan-space", - "version": "4.4.1", + "version": "4.5.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "karavan-space", - "version": "4.4.1", + "version": "4.5.0", "license": "Apache-2.0", "dependencies": { "@monaco-editor/react": "^4.6.0", diff --git a/karavan-space/package.json b/karavan-space/package.json index dc8f2794..8e5a03bd 100644 --- a/karavan-space/package.json +++ b/karavan-space/package.json @@ -1,6 +1,6 @@ { "name": "karavan-space", - "version": "4.4.1", + "version": "4.5.0", "license": "Apache-2.0", "scripts": { "cp-designer": "cp -r ../karavan-designer/src/designer src", diff --git a/karavan-space/src/App.tsx b/karavan-space/src/App.tsx index c4d15e14..0d4be79d 100644 --- a/karavan-space/src/App.tsx +++ b/karavan-space/src/App.tsx @@ -137,7 +137,7 @@ class App extends React.Component<Props, State> { return (<Flex className="nav-buttons" direction={{default: "column"}} style={{height: "100%"}} spaceItems={{default: "spaceItemsNone"}}> <FlexItem alignSelf={{default: "alignSelfCenter"}}> - <Tooltip className="logo-tooltip" content={"Apache Camel Karavan 4.4.1"} + <Tooltip className="logo-tooltip" content={"Apache Camel Karavan 4.5.0"} position={"right"}> {KaravanIcon()} </Tooltip> diff --git a/karavan-vscode/CHANGELOG.md b/karavan-vscode/CHANGELOG.md index 696e73c7..924da90f 100644 --- a/karavan-vscode/CHANGELOG.md +++ b/karavan-vscode/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## 4.5.0 +0. Camel 4.5.0 +1. Camel-main Runtime +2. Kamelets 4.5.0 +3. Jkube 1.16.2 +4. JBang v0.116.0 +4. Quarkus 3.8.2 + ## 4.4.1 0. Camel 4.4.1 1. Camel-main Runtime diff --git a/karavan-vscode/package-lock.json b/karavan-vscode/package-lock.json index ee1e2365..2d5cadb8 100644 --- a/karavan-vscode/package-lock.json +++ b/karavan-vscode/package-lock.json @@ -1,12 +1,12 @@ { "name": "karavan", - "version": "4.4.1", + "version": "4.5.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "karavan", - "version": "4.4.1", + "version": "4.5.0", "license": "Apache-2.0", "dependencies": { "@monaco-editor/react": "^4.6.0", diff --git a/karavan-vscode/package.json b/karavan-vscode/package.json index 944fc6fe..4671b008 100644 --- a/karavan-vscode/package.json +++ b/karavan-vscode/package.json @@ -4,7 +4,7 @@ "displayName": "Karavan", "icon": "icons/karavan.png", "description": "Integration Toolkit for Apache Camel", - "version": "4.4.1", + "version": "4.5.0", "license": "Apache-2.0", "preview": false, "bugs": { @@ -375,7 +375,7 @@ }, "default": [ "# jkube properties", - "jkube.version=1.16.1", + "jkube.version=1.16.2", "jkube.build.strategy=s2i", "jkube.namespace=${NAMESPACE}", "jkube.generator.name=image-registry.openshift-image-registry.svc:5000/${NAMESPACE}/$NAME:${DATE}", @@ -396,7 +396,7 @@ }, "default": [ "# jkube properties", - "jkube.version=1.16.1", + "jkube.version=1.16.2", "jkube.build.strategy=s2i", "jkube.namespace=${NAMESPACE}", "jkube.generator.name=image-registry.openshift-image-registry.svc:5000/${NAMESPACE}/$NAME:${DATE}", @@ -417,7 +417,7 @@ }, "default": [ "# jkube properties", - "jkube.version=1.16.1", + "jkube.version=1.16.2", "jkube.build.strategy=docker", "jkube.namespace=default", "jkube.generator.name=default/$NAME:${DATE}", @@ -441,7 +441,7 @@ "label.runtime=app.kubernetes.io/runtime", "jib.from.image=gcr.io/distroless/java17@sha256:68e2373f7bef9486c08356bd9ffd3b40b56e6b9316c5f6885eb58b1d9093b43d", "jib.to.image=default/$NAME:${DATE}", - "jkube.version=1.16.1", + "jkube.version=1.16.2", "jkube.skip.build=true", "jkube.build.strategy=jib", "jkube.namespace=default",