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 ebe1e3b63310df802858be9f2ac65f6b5daaf0d6
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Thu Sep 15 17:59:07 2022 -0400
Set Karavan version 3.18.4
---
.github/workflows/app.yml | 9 +++--
.github/workflows/builder.yml | 2 +-
.gitignore | 1 +
change_version.sh | 40 +++++++++++++++-------
karavan-app/pom.xml | 2 +-
.../src/main/resources/application.properties | 5 ++-
karavan-app/src/main/webapp/package.json | 2 +-
...ravan-app-bacis.yaml => karavan-app-basic.yaml} | 24 ++-----------
karavan-cloud/openshift/karavan-app-oidc.yaml | 22 +-----------
karavan-cloud/openshift/karavan-app-public.yaml | 2 +-
karavan-cloud/openshift/karavan-quarkus-task.yaml | 2 +-
karavan-core/package.json | 2 +-
karavan-designer/package.json | 2 +-
karavan-generator/pom.xml | 2 +-
karavan-vscode/package.json | 2 +-
15 files changed, 49 insertions(+), 70 deletions(-)
diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml
index 3d414b2..50c14fe 100644
--- a/.github/workflows/app.yml
+++ b/.github/workflows/app.yml
@@ -7,6 +7,9 @@ on:
pull_request:
branches: [ main ]
+env:
+ TAG: 3.18.4
+
jobs:
build:
@@ -52,7 +55,7 @@ jobs:
mvn package -f karavan-app -Dquarkus.profile=public -DskipTest \
-Dquarkus.container-image.build=true \
-Dquarkus.container-image.push=true \
- -Dquarkus.container-image.image=ghcr.io/${GITHUB_REPOSITORY}:3.18.3 \
+ -Dquarkus.container-image.image=ghcr.io/${GITHUB_REPOSITORY}:${{
env.TAG }} \
-Dquarkus.container-image.username=${{ github.actor }} \
-Dquarkus.container-image.password=${{ secrets.GITHUB_TOKEN }}
if: ${{ github.ref == 'refs/heads/main' }}
@@ -63,7 +66,7 @@ jobs:
mvn package -f karavan-app -Dquarkus.profile=basic -DskipTest \
-Dquarkus.container-image.build=true \
-Dquarkus.container-image.push=true \
-
-Dquarkus.container-image.image=ghcr.io/${GITHUB_REPOSITORY}-basic:3.18.3 \
+
-Dquarkus.container-image.image=ghcr.io/${GITHUB_REPOSITORY}-basic:${{ env.TAG
}} \
-Dquarkus.container-image.username=${{ github.actor }} \
-Dquarkus.container-image.password=${{ secrets.GITHUB_TOKEN }}
if: ${{ github.ref == 'refs/heads/main' }}
@@ -74,7 +77,7 @@ jobs:
mvn package -f karavan-app -Dquarkus.profile=oidc -DskipTest \
-Dquarkus.container-image.build=true \
-Dquarkus.container-image.push=true \
-
-Dquarkus.container-image.image=ghcr.io/${GITHUB_REPOSITORY}-oidc:3.18.3 \
+
-Dquarkus.container-image.image=ghcr.io/${GITHUB_REPOSITORY}-oidc:${{ env.TAG
}} \
-Dquarkus.container-image.username=${{ github.actor }} \
-Dquarkus.container-image.password=${{ secrets.GITHUB_TOKEN }}
if: ${{ github.ref == 'refs/heads/main' }}
\ No newline at end of file
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index c51edb0..f85735e 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.3
+ TAG: 3.18.4
jobs:
build:
diff --git a/.gitignore b/.gitignore
index 7b70af2..1e489c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,4 @@ yarn-error.log*
**/*.tgz
**/*.vsix
karavan-cloud/openshift/karavan-secret-real.yaml
+**/*.bak
diff --git a/change_version.sh b/change_version.sh
index 9019fd3..16253b5 100755
--- a/change_version.sh
+++ b/change_version.sh
@@ -1,20 +1,36 @@
#!/bin/bash
-echo "Set Generator pom.xml version: $1";
-mvn versions:set -DnewVersion=$1 -f karavan-generator
+# echo "Set Generator pom.xml version: $1";
+# mvn versions:set -DnewVersion=$1 -f karavan-generator
-echo "Set Application pom.xml version: $1";
-mvn versions:set -DnewVersion=$1 -f karavan-app
+# echo "Set Application pom.xml version: $1";
+# 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
+# echo "Set Core package.json extension version: $1";
+# 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
+# echo "Set Designer package.json version: $1";
+# 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/
+# 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/
-echo "Set VSCode extension package.json version: $1";
-yarn version --new-version $1 --no-commit --no-git-tag-version --cwd
karavan-vscode
+# echo "Set VSCode extension package.json version: $1";
+# 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
+
+echo "Set Github Workflow App TAG version: $1";
+sed -i.bak 's/TAG:.*/TAG: '"$1"'/g' .github/workflows/app.yml
+
+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
+
+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
diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index 9de3545..6957f39 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.3</version>
+ <version>3.18.4</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 7caf204..d0f11c6 100644
--- a/karavan-app/src/main/resources/application.properties
+++ b/karavan-app/src/main/resources/application.properties
@@ -1,5 +1,4 @@
-#karavan.version=${project.version}
-karavan.version=3.18.3
+karavan.version=3.18.4
karavan.master-username=admin
karavan.master-password=karavan
@@ -111,7 +110,7 @@
quarkus.docker.dockerfile-jvm-path=src/main/docker/Dockerfile.distroless
quarkus.container-image.group=apache
quarkus.container-image.name=camel-karavan
-#quarkus.container-image.tag=${project.version}
+quarkus.container-image.tag=${karavan.version=3.18.4
quarkus.container-image.builder=docker
diff --git a/karavan-app/src/main/webapp/package.json
b/karavan-app/src/main/webapp/package.json
index 24363be..f398619 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.3",
+ "version": "3.18.4",
"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/openshift/karavan-app-bacis.yaml
b/karavan-cloud/openshift/karavan-app-basic.yaml
similarity index 67%
rename from karavan-cloud/openshift/karavan-app-bacis.yaml
rename to karavan-cloud/openshift/karavan-app-basic.yaml
index 28bb1d6..959478d 100644
--- a/karavan-cloud/openshift/karavan-app-bacis.yaml
+++ b/karavan-cloud/openshift/karavan-app-basic.yaml
@@ -45,7 +45,7 @@ spec:
secretKeyRef:
key: master-password
name: karavan
- image: ghcr.io/apache/camel-karavan-basic:3.18.3
+ image: ghcr.io/apache/camel-karavan-basic:3.18.4
imagePullPolicy: Always
name: karavan
resources:
@@ -57,27 +57,7 @@ spec:
ports:
- containerPort: 8080
name: http
- protocol: TCP
- # livenessProbe:
- # failureThreshold: 3
- # httpGet:
- # path: /q/health/live
- # port: 8080
- # scheme: HTTP
- # initialDelaySeconds: 0
- # periodSeconds: 30
- # successThreshold: 1
- # timeoutSeconds: 10
- # readinessProbe:
- # failureThreshold: 3
- # httpGet:
- # path: /q/health/ready
- # port: 8080
- # scheme: HTTP
- # initialDelaySeconds: 0
- # periodSeconds: 30
- # successThreshold: 1
- # timeoutSeconds: 10
+ protocol: TCP
volumes:
- name: karavan-data
persistentVolumeClaim:
diff --git a/karavan-cloud/openshift/karavan-app-oidc.yaml
b/karavan-cloud/openshift/karavan-app-oidc.yaml
index 3e9f42b..a0d3d72 100644
--- a/karavan-cloud/openshift/karavan-app-oidc.yaml
+++ b/karavan-cloud/openshift/karavan-app-oidc.yaml
@@ -55,7 +55,7 @@ spec:
secretKeyRef:
key: oidc-secret
name: karavan
- image: ghcr.io/apache/camel-karavan-oidc:3.18.3
+ image: ghcr.io/apache/camel-karavan-oidc:3.18.4
imagePullPolicy: Always
name: karavan
resources:
@@ -68,26 +68,6 @@ spec:
- containerPort: 8080
name: http
protocol: TCP
- # livenessProbe:
- # failureThreshold: 3
- # httpGet:
- # path: /q/health/live
- # port: 8080
- # scheme: HTTP
- # initialDelaySeconds: 0
- # periodSeconds: 30
- # successThreshold: 1
- # timeoutSeconds: 10
- # readinessProbe:
- # failureThreshold: 3
- # httpGet:
- # path: /q/health/ready
- # port: 8080
- # scheme: HTTP
- # initialDelaySeconds: 0
- # periodSeconds: 30
- # successThreshold: 1
- # timeoutSeconds: 10
volumes:
- name: karavan-data
persistentVolumeClaim:
diff --git a/karavan-cloud/openshift/karavan-app-public.yaml
b/karavan-cloud/openshift/karavan-app-public.yaml
index 8efd783..4549b96 100644
--- a/karavan-cloud/openshift/karavan-app-public.yaml
+++ b/karavan-cloud/openshift/karavan-app-public.yaml
@@ -40,7 +40,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: ghcr.io/apache/camel-karavan:3.18.3
+ image: ghcr.io/apache/camel-karavan:3.18.4
imagePullPolicy: Always
name: karavan
resources:
diff --git a/karavan-cloud/openshift/karavan-quarkus-task.yaml
b/karavan-cloud/openshift/karavan-quarkus-task.yaml
index b84f873..492f596 100644
--- a/karavan-cloud/openshift/karavan-quarkus-task.yaml
+++ b/karavan-cloud/openshift/karavan-quarkus-task.yaml
@@ -56,7 +56,7 @@ spec:
-Dquarkus.kubernetes.deploy=true \
-Dquarkus.container-image.group=${NAMESPACE} \
-Dquarkus.container-image.tag=${DATE}
- image: 'ghcr.io/apache/camel-karavan-builder:3.18.3'
+ image: ghcr.io/apache/camel-karavan-builder:3.18.4
env:
- name: PROJECTS_GIT_REPOSITORY
valueFrom:
diff --git a/karavan-core/package.json b/karavan-core/package.json
index b65a294..4fd9478 100644
--- a/karavan-core/package.json
+++ b/karavan-core/package.json
@@ -1,7 +1,7 @@
{
"name": "karavan-core",
"publisher": "camel-karavan",
- "version": "3.18.3",
+ "version": "3.18.4",
"description": "Apache Camel Karavan Core",
"scripts": {
"build": "tsc",
diff --git a/karavan-designer/package.json b/karavan-designer/package.json
index f16b46c..598abde 100644
--- a/karavan-designer/package.json
+++ b/karavan-designer/package.json
@@ -1,6 +1,6 @@
{
"name": "karavan-designer",
- "version": "3.18.3",
+ "version": "3.18.4",
"license": "Apache-2.0",
"scripts": {
"start": "react-scripts start",
diff --git a/karavan-generator/pom.xml b/karavan-generator/pom.xml
index 1628fc3..b4d3303 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.3</version>
+ <version>3.18.4</version>
<properties>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<maven.compiler.parameters>true</maven.compiler.parameters>
diff --git a/karavan-vscode/package.json b/karavan-vscode/package.json
index f8bf455..537710f 100644
--- a/karavan-vscode/package.json
+++ b/karavan-vscode/package.json
@@ -4,7 +4,7 @@
"displayName": "Karavan",
"icon": "icons/karavan.png",
"description": "Apache Camel Mastering Tool",
- "version": "3.18.3",
+ "version": "3.18.4",
"license": "Apache-2.0",
"preview": true,
"bugs": {
