You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2022/10/13 17:18:49 UTC
[camel-karavan] 01/02: Bump version to 3.18.5
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 ece3b5c610d8009a23cefe6d21bcce71ade858eb
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Wed Oct 12 10:13:54 2022 -0400
Bump version to 3.18.5
---
.github/workflows/app.yml | 2 +-
.github/workflows/builder.yml | 2 +-
.github/workflows/native.yml | 35 ----------------------
.github/workflows/vscode.yml | 4 ---
README.md | 4 +--
change_version.sh | 22 +++++++-------
karavan-app/pom.xml | 2 +-
.../src/main/resources/application.properties | 2 +-
karavan-app/src/main/webapp/package.json | 2 +-
.../minikube/karavan-app-deployment-public.yaml | 2 +-
.../minikube/karavan-quarkus-task-minikube.yaml | 2 +-
.../openshift/karavan-app-deployment-basic.yaml | 2 +-
.../openshift/karavan-app-deployment-oidc.yaml | 2 +-
.../openshift/karavan-app-deployment-public.yaml | 2 +-
karavan-cloud/openshift/karavan-quarkus-task.yaml | 2 +-
karavan-core/package.json | 2 +-
karavan-designer/package.json | 4 +--
karavan-generator/pom.xml | 2 +-
karavan-operator/resources/karavan.yaml | 2 +-
karavan-vscode/package.json | 2 +-
20 files changed, 31 insertions(+), 68 deletions(-)
diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml
index 49afd7e..a2e5d4e 100644
--- a/.github/workflows/app.yml
+++ b/.github/workflows/app.yml
@@ -8,7 +8,7 @@ on:
branches: [ main ]
env:
- TAG: 3.18.4
+ TAG: 3.18.5
jobs:
build:
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index c3f7153..41c4bb9 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -8,7 +8,7 @@ on:
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}-builder
- TAG: 3.18.4
+ TAG: 3.18.5
jobs:
build:
diff --git a/.github/workflows/native.yml b/.github/workflows/native.yml
deleted file mode 100644
index 7fcbb6b..0000000
--- a/.github/workflows/native.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: native-image
-
-on:
- push:
- branches: [ main ]
- workflow_dispatch:
-
-env:
- REGISTRY: ghcr.io
- IMAGE_NAME: ${{ github.repository }}-native
- TAG: latest
-
-jobs:
- build:
-
- runs-on: ubuntu-latest
-
- steps:
- - name: Checkout repository
- uses: actions/checkout@v2
-
- - name: Log in to the Container registry
- uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
- with:
- registry: ${{ env.REGISTRY }}
- username: ${{ github.actor }}
- password: ${{ secrets.GITHUB_TOKEN }}
-
- - name: Build and push Docker image
- uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
- with:
- context: .
- file: karavan-app/src/main/docker/Dockerfile.multistage
- push: true
- tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG }}
diff --git a/.github/workflows/vscode.yml b/.github/workflows/vscode.yml
index e850f08..5c507fd 100644
--- a/.github/workflows/vscode.yml
+++ b/.github/workflows/vscode.yml
@@ -51,10 +51,6 @@ jobs:
working-directory: ./karavan-vscode
run: npm update && npm install
- # - name: Karavan VS Code extension (build)
- # working-directory: ./karavan-vscode
- # run: npm run package
-
- name: Karavan VS Code extension (install vsce)
working-directory: ./karavan-vscode
run: npm install -g vsce
diff --git a/README.md b/README.md
index 13579f5..cb696e8 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Integration project output is a runnable uber-jar or an OCI image for local envi
## Installation
Two types of applications are available:
1. [Cloud-native](karavan-cloud/README.md) application deployed into Kubernetes/OpenShift
-2. [VS Code extension](karavan-vscode/README.md) available on the [Marketplace](https://marketplace.visualstudio.com/items?itemName=camel-karavan.karavan).
+2. [VS Code extension](karavan-vscode/README.md) available on the [Marketplace](https://marketplace.visualstudio.com/items?itemName=camel-karavan.karavan). Extensions for VS Code Compatible Editors available on [Open VSX Registry](https://open-vsx.org/extension/camel-karavan/karavan)
Both applications share same visual designer and work with Camel YAMl DSL.
@@ -37,7 +37,7 @@ Karavan cloud-native integration toolkit is an application to manage projects, d
## Karavan VS Code extension
-Install Karavan VS Code extension from the [Marketplace](https://marketplace.visualstudio.com/items?itemName=camel-karavan.karavan)
+Install Karavan VS Code extension from the [Marketplace](https://marketplace.visualstudio.com/items?itemName=camel-karavan.karavan) or from [Open VSX Registry](https://open-vsx.org/extension/camel-karavan/karavan)
More about [Karavan VS Code Extension](karavan-vscode/README.md)
diff --git a/change_version.sh b/change_version.sh
index 16253b5..08d4ef9 100755
--- a/change_version.sh
+++ b/change_version.sh
@@ -1,22 +1,22 @@
#!/bin/bash
# echo "Set Generator pom.xml version: $1";
-# mvn versions:set -DnewVersion=$1 -f karavan-generator
+mvn versions:set -DnewVersion=$1 -f karavan-generator
# echo "Set Application pom.xml version: $1";
-# mvn versions:set -DnewVersion=$1 -f karavan-app
+mvn versions:set -DnewVersion=$1 -f karavan-app
# echo "Set Core package.json extension version: $1";
-# yarn version --new-version $1 --no-commit --no-git-tag-version --cwd karavan-core
+yarn version --new-version $1 --no-commit --no-git-tag-version --cwd karavan-core
# echo "Set Designer package.json version: $1";
-# yarn version --new-version $1 --no-commit --no-git-tag-version --cwd karavan-designer
+yarn version --new-version $1 --no-commit --no-git-tag-version --cwd karavan-designer
# echo "Set Application package.json extension version: $1";
-# yarn version --new-version $1 --no-commit --no-git-tag-version --cwd karavan-app/src/main/webapp/
+yarn version --new-version $1 --no-commit --no-git-tag-version --cwd karavan-app/src/main/webapp/
# echo "Set VSCode extension package.json version: $1";
-# yarn version --new-version $1 --no-commit --no-git-tag-version --cwd karavan-vscode
+yarn version --new-version $1 --no-commit --no-git-tag-version --cwd karavan-vscode
echo "Set Github Workflow Builder TAG version: $1";
sed -i.bak 's/TAG:.*/TAG: '"$1"'/g' .github/workflows/builder.yml
@@ -28,9 +28,11 @@ echo "Set application.properties karavan.version=$1";
sed -i.bak 's/karavan.version.*/karavan.version='"$1"'/g' karavan-app/src/main/resources/application.properties
echo "Set Deployment manifests version $1";
-sed -i.bak 's/camel-karavan.*/camel-karavan:'"$1"'/g' karavan-cloud/openshift/karavan-app-public.yaml
-sed -i.bak 's/camel-karavan-basic.*/camel-karavan-basic:'"$1"'/g' karavan-cloud/openshift/karavan-app-basic.yaml
-sed -i.bak 's/camel-karavan-oidc.*/camel-karavan-oidc:'"$1"'/g' karavan-cloud/openshift/karavan-app-oidc.yaml
+sed -i.bak 's/camel-karavan.*/camel-karavan:'"$1"'/g' karavan-cloud/minikube/karavan-app-deployment-public.yaml
+sed -i.bak 's/camel-karavan.*/camel-karavan:'"$1"'/g' karavan-cloud/openshift/karavan-app-deployment-public.yaml
+sed -i.bak 's/camel-karavan-basic.*/camel-karavan-basic:'"$1"'/g' karavan-cloud/openshift/karavan-app-deployment-basic.yaml
+sed -i.bak 's/camel-karavan-oidc.*/camel-karavan-oidc:'"$1"'/g' karavan-cloud/openshift/karavan-app-deployment-oidc.yaml
echo "Set Tekton Task manifest version $1";
-sed -i.bak 's/camel-karavan-builder.*/camel-karavan-builder:'"$1"'/g' karavan-cloud/openshift/karavan-quarkus-task.yaml
\ No newline at end of file
+sed -i.bak 's/camel-karavan-builder.*/camel-karavan-builder:'"$1"'/g' karavan-cloud/openshift/karavan-quarkus-task.yaml
+sed -i.bak 's/camel-karavan-builder.*/camel-karavan-builder:'"$1"'/g' karavan-cloud/minikube/karavan-quarkus-task-minikube.yaml
\ No newline at end of file
diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index 2c20131..4a39aa9 100644
--- a/karavan-app/pom.xml
+++ b/karavan-app/pom.xml
@@ -18,7 +18,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.camel.karavan</groupId>
- <version>3.18.4</version>
+ <version>3.18.5</version>
<artifactId>karavan</artifactId>
<properties>
<compiler-plugin.version>3.10.1</compiler-plugin.version>
diff --git a/karavan-app/src/main/resources/application.properties b/karavan-app/src/main/resources/application.properties
index 4bc35d4..a527351 100644
--- a/karavan-app/src/main/resources/application.properties
+++ b/karavan-app/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-karavan.version=3.18.4
+karavan.version=3.18.5
# Git repository Configuration
karavan.projects-git-repository=${GIT_REPOSITORY}
diff --git a/karavan-app/src/main/webapp/package.json b/karavan-app/src/main/webapp/package.json
index 4878eaf..2a99d7d 100644
--- a/karavan-app/src/main/webapp/package.json
+++ b/karavan-app/src/main/webapp/package.json
@@ -1,6 +1,6 @@
{
"name": "karavan",
- "version": "3.18.4",
+ "version": "3.18.5",
"private": true,
"scripts": {
"copy-designer": "cp -r ../../../../karavan-designer/src/designer src && cp -r ../../../../karavan-designer/src/kamelets src && cp -r ../../../../karavan-designer/src/components src && cp -r ../../../../karavan-designer/src/eip src",
diff --git a/karavan-cloud/minikube/karavan-app-deployment-public.yaml b/karavan-cloud/minikube/karavan-app-deployment-public.yaml
index cd8b9bb..11bb8ff 100644
--- a/karavan-cloud/minikube/karavan-app-deployment-public.yaml
+++ b/karavan-cloud/minikube/karavan-app-deployment-public.yaml
@@ -23,7 +23,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: ghcr.io/apache/camel-karavan:3.18.4
+ image: ghcr.io/apache/camel-karavan:3.18.5
imagePullPolicy: Always
name: karavan
resources:
diff --git a/karavan-cloud/minikube/karavan-quarkus-task-minikube.yaml b/karavan-cloud/minikube/karavan-quarkus-task-minikube.yaml
index d4e3d56..48d2cfe 100644
--- a/karavan-cloud/minikube/karavan-quarkus-task-minikube.yaml
+++ b/karavan-cloud/minikube/karavan-quarkus-task-minikube.yaml
@@ -57,7 +57,7 @@ spec:
-Dquarkus.kubernetes.labels.\"app.openshift.io/runtime\"=camel \
-Dquarkus.container-image.group=${NAMESPACE} \
-Dquarkus.container-image.tag=${DATE}
- image: ghcr.io/apache/camel-karavan-builder:3.18.4
+ image: ghcr.io/apache/camel-karavan-builder:3.18.5
env:
- name: PROJECTS_GIT_REPOSITORY
valueFrom:
diff --git a/karavan-cloud/openshift/karavan-app-deployment-basic.yaml b/karavan-cloud/openshift/karavan-app-deployment-basic.yaml
index 5fac5a1..080d7f6 100644
--- a/karavan-cloud/openshift/karavan-app-deployment-basic.yaml
+++ b/karavan-cloud/openshift/karavan-app-deployment-basic.yaml
@@ -28,7 +28,7 @@ spec:
secretKeyRef:
key: master-password
name: karavan
- image: ghcr.io/apache/camel-karavan-basic:3.18.4
+ image: ghcr.io/apache/camel-karavan-basic:3.18.5
imagePullPolicy: Always
name: karavan
resources:
diff --git a/karavan-cloud/openshift/karavan-app-deployment-oidc.yaml b/karavan-cloud/openshift/karavan-app-deployment-oidc.yaml
index cb56d48..57ded92 100644
--- a/karavan-cloud/openshift/karavan-app-deployment-oidc.yaml
+++ b/karavan-cloud/openshift/karavan-app-deployment-oidc.yaml
@@ -38,7 +38,7 @@ spec:
secretKeyRef:
key: oidc-secret
name: karavan
- image: ghcr.io/apache/camel-karavan-oidc:3.18.4
+ image: ghcr.io/apache/camel-karavan-oidc:3.18.5
imagePullPolicy: Always
name: karavan
resources:
diff --git a/karavan-cloud/openshift/karavan-app-deployment-public.yaml b/karavan-cloud/openshift/karavan-app-deployment-public.yaml
index cd8b9bb..11bb8ff 100644
--- a/karavan-cloud/openshift/karavan-app-deployment-public.yaml
+++ b/karavan-cloud/openshift/karavan-app-deployment-public.yaml
@@ -23,7 +23,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: ghcr.io/apache/camel-karavan:3.18.4
+ image: ghcr.io/apache/camel-karavan:3.18.5
imagePullPolicy: Always
name: karavan
resources:
diff --git a/karavan-cloud/openshift/karavan-quarkus-task.yaml b/karavan-cloud/openshift/karavan-quarkus-task.yaml
index 78a6eef..3136c1e 100644
--- a/karavan-cloud/openshift/karavan-quarkus-task.yaml
+++ b/karavan-cloud/openshift/karavan-quarkus-task.yaml
@@ -59,7 +59,7 @@ spec:
-Dquarkus.openshift.labels.\"app.openshift.io/runtime\"=camel \
-Dquarkus.container-image.group=${NAMESPACE} \
-Dquarkus.container-image.tag=${DATE}
- image: ghcr.io/apache/camel-karavan-builder:3.18.4
+ image: ghcr.io/apache/camel-karavan-builder:3.18.5
env:
- name: PROJECTS_GIT_REPOSITORY
valueFrom:
diff --git a/karavan-core/package.json b/karavan-core/package.json
index 4fd9478..afec3b2 100644
--- a/karavan-core/package.json
+++ b/karavan-core/package.json
@@ -1,7 +1,7 @@
{
"name": "karavan-core",
"publisher": "camel-karavan",
- "version": "3.18.4",
+ "version": "3.18.5",
"description": "Apache Camel Karavan Core",
"scripts": {
"build": "tsc",
diff --git a/karavan-designer/package.json b/karavan-designer/package.json
index 4dacf85..175ac86 100644
--- a/karavan-designer/package.json
+++ b/karavan-designer/package.json
@@ -1,6 +1,6 @@
{
"name": "karavan-designer",
- "version": "3.18.4",
+ "version": "3.18.5",
"license": "Apache-2.0",
"scripts": {
"start": "react-scripts start",
@@ -26,6 +26,7 @@
]
},
"dependencies": {
+ "@monaco-editor/react": "4.3.1",
"@patternfly/patternfly": "4.215.1",
"@patternfly/react-core": "4.239.0",
"@patternfly/react-table": "^4.108.0",
@@ -37,7 +38,6 @@
"karavan-core": "file:../karavan-core",
"react": "17.0.2",
"react-dom": "17.0.2",
- "@monaco-editor/react": "4.3.1",
"react-router-dom": "^6.2.1",
"react-scripts": "5.0.0",
"rxjs": "^7.5.2",
diff --git a/karavan-generator/pom.xml b/karavan-generator/pom.xml
index b4d3303..9fdfe94 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>3.18.4</version>
+ <version>3.18.5</version>
<properties>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<maven.compiler.parameters>true</maven.compiler.parameters>
diff --git a/karavan-operator/resources/karavan.yaml b/karavan-operator/resources/karavan.yaml
index 868e677..678ac1d 100644
--- a/karavan-operator/resources/karavan.yaml
+++ b/karavan-operator/resources/karavan.yaml
@@ -4,7 +4,7 @@ metadata:
name: karavan
annotations:
camel.apache.org/support.level: Preview
- camel.apache.org/version: 3.18.4
+ camel.apache.org/version: 3.18.5
camel.apache.org/provider: Apache Software Foundation
spec:
instances: 1
diff --git a/karavan-vscode/package.json b/karavan-vscode/package.json
index ef3ea9a..b55b707 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": "3.18.4",
+ "version": "3.18.5",
"license": "Apache-2.0",
"preview": true,
"bugs": {