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/11/04 23:57:30 UTC
[camel-karavan] 01/02: Bump version to 3.18.6
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 7c9d479690a3986b7f25c73ae7ae56e777b3f78b
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Fri Nov 4 16:40:25 2022 -0400
Bump version to 3.18.6
---
.github/workflows/app.yml | 2 +-
.github/workflows/builder.yml | 2 +-
.github/workflows/operator.yml | 2 +-
change_version.sh | 23 +++++++++++++++-------
karavan-app/pom.xml | 2 +-
.../src/main/resources/application.properties | 2 +-
karavan-app/src/main/webapp/package.json | 4 ++--
karavan-core/package.json | 2 +-
karavan-designer/package.json | 2 +-
karavan-generator/pom.xml | 2 +-
karavan-operator/Makefile | 2 +-
karavan-operator/pom.xml | 2 +-
.../operator/spec/KaravanOperatorCSVMetadata.java | 8 ++++----
.../src/main/resources/application.properties | 4 ++--
karavan-vscode/package.json | 8 ++++----
15 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml
index 46e616b..9da8453 100644
--- a/.github/workflows/app.yml
+++ b/.github/workflows/app.yml
@@ -8,7 +8,7 @@ on:
branches: [ main ]
env:
- TAG: 3.18.5
+ TAG: 3.18.6
jobs:
build:
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index c97aa08..6292eb5 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.5
+ TAG: 3.18.6
jobs:
build:
diff --git a/.github/workflows/operator.yml b/.github/workflows/operator.yml
index 99e9037..4258e40 100644
--- a/.github/workflows/operator.yml
+++ b/.github/workflows/operator.yml
@@ -11,7 +11,7 @@ env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}-operator
IMAGE_NAME_BUNDLE: ${{ github.repository }}-bundle
- TAG: 3.18.5
+ TAG: 3.18.6
jobs:
build:
diff --git a/change_version.sh b/change_version.sh
index 43562c3..4211133 100755
--- a/change_version.sh
+++ b/change_version.sh
@@ -1,24 +1,24 @@
#!/bin/bash
-# echo "Set Generator pom.xml version: $1";
+echo "Set Generator pom.xml version: $1";
mvn versions:set -DnewVersion=$1 -f karavan-generator
-# echo "Set Application pom.xml version: $1";
+echo "Set Application pom.xml version: $1";
mvn versions:set -DnewVersion=$1 -f karavan-app
-# echo "Set Operator pom.xml version: $1";
+echo "Set Operator pom.xml version: $1";
mvn versions:set -DnewVersion=$1 -f karavan-operator
-# echo "Set Core package.json extension version: $1";
+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";
+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";
+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";
+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";
@@ -27,6 +27,15 @@ 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 Github Workflow App TAG version: $1";
+sed -i.bak 's/TAG:.*/TAG: '"$1"'/g' .github/workflows/operator.yml
+
+
+echo "Set application.properties karavan.version=$1";
+sed -i.bak 's/karavan.version.*/karavan.version='"$1"'/g' karavan-operator/src/main/resources/application.properties
+sed -i.bak 's/quarkus.container-image.tag.*/quarkus.container-image.tag='"$1"'/g' karavan-operator/src/main/resources/application.properties
+sed -i.bak 's/VERSION ?=.*/VERSION ?='"$1"'/g' karavan-operator/Makefile
+
echo "Set application.properties karavan.version=$1";
sed -i.bak 's/karavan.version.*/karavan.version='"$1"'/g' karavan-app/src/main/resources/application.properties
diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index c14eecd..76d374e 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.5</version>
+ <version>3.18.6</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 0e1b568..2e2d9de 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.5
+karavan.version=3.18.6
karavan.environment=dev
karavan.pipeline=karavan-pipeline-dev-quarkus
karavan.camel-status-threshold=2000
diff --git a/karavan-app/src/main/webapp/package.json b/karavan-app/src/main/webapp/package.json
index 71ddaf1..00ee701 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.5",
+ "version": "3.18.6",
"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",
@@ -29,9 +29,9 @@
"dependencies": {
"@monaco-editor/react": "4.3.1",
"@patternfly/patternfly": "4.215.1",
+ "@patternfly/react-charts": "^6.92.0",
"@patternfly/react-core": "4.239.0",
"@patternfly/react-table": "^4.108.0",
- "@patternfly/react-charts": "^6.92.0",
"@types/js-yaml": "^4.0.5",
"@types/uuid": "^8.3.4",
"axios": "^0.25.0",
diff --git a/karavan-core/package.json b/karavan-core/package.json
index afec3b2..e7b3578 100644
--- a/karavan-core/package.json
+++ b/karavan-core/package.json
@@ -1,7 +1,7 @@
{
"name": "karavan-core",
"publisher": "camel-karavan",
- "version": "3.18.5",
+ "version": "3.18.6",
"description": "Apache Camel Karavan Core",
"scripts": {
"build": "tsc",
diff --git a/karavan-designer/package.json b/karavan-designer/package.json
index 5c17337..d3f95ae 100644
--- a/karavan-designer/package.json
+++ b/karavan-designer/package.json
@@ -1,6 +1,6 @@
{
"name": "karavan-designer",
- "version": "3.18.5",
+ "version": "3.18.6",
"license": "Apache-2.0",
"scripts": {
"start": "react-scripts start",
diff --git a/karavan-generator/pom.xml b/karavan-generator/pom.xml
index 3682972..38c02b0 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.5</version>
+ <version>3.18.6</version>
<properties>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<maven.compiler.parameters>true</maven.compiler.parameters>
diff --git a/karavan-operator/Makefile b/karavan-operator/Makefile
index ebcc4ff..1608150 100644
--- a/karavan-operator/Makefile
+++ b/karavan-operator/Makefile
@@ -1,5 +1,5 @@
-VERSION ?= 3.18.5
+VERSION ?=3.18.6
# 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-operator/pom.xml b/karavan-operator/pom.xml
index 5feb7ae..7f606e6 100644
--- a/karavan-operator/pom.xml
+++ b/karavan-operator/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.apache.camel.karavan</groupId>
<artifactId>karavan-operator</artifactId>
<name>karavan-operator</name>
- <version>3.18.5</version>
+ <version>3.18.6</version>
<packaging>jar</packaging>
<properties>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
diff --git a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/spec/KaravanOperatorCSVMetadata.java b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/spec/KaravanOperatorCSVMetadata.java
index 2b37272..465366d 100644
--- a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/spec/KaravanOperatorCSVMetadata.java
+++ b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/spec/KaravanOperatorCSVMetadata.java
@@ -79,7 +79,7 @@ import io.quarkiverse.operatorsdk.bundle.runtime.SharedCSVMetadata;
@CSVMetadata.PermissionRule(apiGroups = {"apiextensions.k8s.io"}, resources = {"customresourcedefinitions"}, verbs = {"get", "list", "watch"}),
},
keywords = {"apache", "camel", "karavan", "integration", "microservices", "low-code"},
- version = "3.18.5",
+ version = "3.18.6",
maintainers = @CSVMetadata.Maintainer(name = "The Apache Software Foundation", email = "users@camel.apache.org"),
provider = @CSVMetadata.Provider(name = "The Apache Software Foundation"),
maturity = "alpha",
@@ -98,9 +98,9 @@ public class KaravanOperatorCSVMetadata implements SharedCSVMetadata {
// import io.quarkiverse.operatorsdk.bundle.runtime.SharedCSVMetadata;
//
//@CSVMetadata(
-// name = "camel-karavan-operator.v3.18.5",
+// name = "camel-karavan-operator.v3.18.6",
// annotations = @CSVMetadata.Annotations(
-// containerImage = "ghcr.io/apache/camel-karavan-operator:3.18.5",
+// containerImage = "ghcr.io/apache/camel-karavan-operator:3.18.6",
// repository = "https://github.com/apache/camel-karavan",
// capabilities = "Basic Install",
// categories = "Developer Tools, Integration & Delivery",
@@ -181,7 +181,7 @@ public class KaravanOperatorCSVMetadata implements SharedCSVMetadata {
// @CSVMetadata.PermissionRule(apiGroups = {"apiextensions.k8s.io"}, resources = {"customresourcedefinitions"}, verbs = {"get", "list", "watch"}),
// },
// keywords = {"apache", "camel", "karavan", "integration", "microservices", "low-code"},
-// version = "3.18.5",
+// version = "3.18.6",
// maintainers = @CSVMetadata.Maintainer(name = "The Apache Software Foundation", email = "users@camel.apache.org"),
// provider = @CSVMetadata.Provider(name = "The Apache Software Foundation"),
// maturity = "alpha",
diff --git a/karavan-operator/src/main/resources/application.properties b/karavan-operator/src/main/resources/application.properties
index 703dde0..d4ec377 100644
--- a/karavan-operator/src/main/resources/application.properties
+++ b/karavan-operator/src/main/resources/application.properties
@@ -15,8 +15,8 @@ quarkus.kubernetes.add-version-to-label-selectors=false
quarkus.container-image.builder=jib
quarkus.container-image.group=ghcr.io/apache
quarkus.container-image.name=camel-karavan-operator
-quarkus.container-image.tag=3.18.5
+quarkus.container-image.tag=3.18.6
-karavan.version=3.18.5
+karavan.version=3.18.6
karavan.image=ghcr.io/apache/camel-karavan
karavan.quarkus-build-image=ghcr.io/apache/camel-karavan-builder
diff --git a/karavan-vscode/package.json b/karavan-vscode/package.json
index 96de9f8..652ed72 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.5",
+ "version": "3.18.6",
"license": "Apache-2.0",
"preview": true,
"bugs": {
@@ -483,6 +483,7 @@
"@types/node": "17.0.14",
"@types/react": "^17.0.5",
"@types/react-dom": "^17.0.4",
+ "@types/shelljs": "^0.8.10",
"@types/vscode": "^1.56.0",
"@typescript-eslint/eslint-plugin": "^4.14.1",
"@typescript-eslint/parser": "^4.14.1",
@@ -500,7 +501,6 @@
"mocha": "^10.0.0",
"prettier": "2.3.0",
"run-script-os": "^1.1.6",
- "@types/shelljs": "^0.8.10",
"static-site-generator-webpack-plugin": "^3.4.2",
"style-loader": "^2.0.0",
"ts-loader": "^8.0.14",
@@ -517,8 +517,8 @@
"@patternfly/react-table": "4.108.0",
"@types/js-yaml": "^4.0.5",
"@types/uuid": "8.3.4",
+ "html-to-image": "^1.10.8",
"js-yaml": "^4.1.0",
- "html-to-image": "^1.10.8",
"path-browserify": "^1.0.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
@@ -526,4 +526,4 @@
"shelljs": "^0.8.5",
"uuid": "8.3.2"
}
-}
\ No newline at end of file
+}