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 2024/08/09 19:15:25 UTC
(camel-karavan) branch main updated (b3c46107 -> a55227f5)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
from b3c46107 [feature] Add kubernetes probes (#1346)
new 6eac6af3 Fix #1353
new a55227f5 bump version to 4.7.1
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/app-oidc.yml | 2 +-
.github/workflows/app.yml | 2 +-
.github/workflows/docker-devmode.yml | 2 +-
.github/workflows/vscode.yml | 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 ++--
.../main/resources/configuration/docker/builder.docker-compose.yaml | 4 ++--
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 | 2 +-
karavan-generator/pom.xml | 2 +-
karavan-space/package-lock.json | 4 ++--
karavan-space/package.json | 2 +-
karavan-space/src/App.tsx | 2 +-
karavan-vscode/README.md | 2 +-
karavan-vscode/package-lock.json | 4 ++--
karavan-vscode/package.json | 2 +-
25 files changed, 33 insertions(+), 33 deletions(-)
(camel-karavan) 01/02: Fix #1353
Posted by ma...@apache.org.
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 6eac6af33029b0bb76f48becc19da11e4344fda8
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Fri Aug 9 15:10:48 2024 -0400
Fix #1353
---
.../main/resources/configuration/docker/builder.docker-compose.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/karavan-app/src/main/resources/configuration/docker/builder.docker-compose.yaml b/karavan-app/src/main/resources/configuration/docker/builder.docker-compose.yaml
index 1812366e..d2944428 100644
--- a/karavan-app/src/main/resources/configuration/docker/builder.docker-compose.yaml
+++ b/karavan-app/src/main/resources/configuration/docker/builder.docker-compose.yaml
@@ -9,5 +9,5 @@ services:
- GIT_BRANCH=${karavan.git.branch}
- IMAGE_REGISTRY=${karavan.container-image.registry}
- IMAGE_GROUP=${karavan.container-image.group}
- - IMAGE_REGISTRY_PASSWORD=${karavan.container-image.registry-username}
- - IMAGE_REGISTRY_USERNAME=${karavan.container-image.registry-password}
\ No newline at end of file
+ - IMAGE_REGISTRY_PASSWORD=${karavan.container-image.registry-password}
+ - IMAGE_REGISTRY_USERNAME=${karavan.container-image.registry-username}
\ No newline at end of file
(camel-karavan) 02/02: bump version to 4.7.1
Posted by ma...@apache.org.
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 a55227f5a95a4c4cabf1c855700b5710796c179a
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Fri Aug 9 15:15:09 2024 -0400
bump version to 4.7.1
---
.github/workflows/app-oidc.yml | 2 +-
.github/workflows/app.yml | 2 +-
.github/workflows/docker-devmode.yml | 2 +-
.github/workflows/vscode.yml | 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 ++--
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 | 2 +-
karavan-generator/pom.xml | 2 +-
karavan-space/package-lock.json | 4 ++--
karavan-space/package.json | 2 +-
karavan-space/src/App.tsx | 2 +-
karavan-vscode/README.md | 2 +-
karavan-vscode/package-lock.json | 4 ++--
karavan-vscode/package.json | 2 +-
24 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/.github/workflows/app-oidc.yml b/.github/workflows/app-oidc.yml
index 88cdd811..845ced1c 100644
--- a/.github/workflows/app-oidc.yml
+++ b/.github/workflows/app-oidc.yml
@@ -10,7 +10,7 @@ on:
env:
REGISTRY: ghcr.io
- TAG: 4.7.0
+ TAG: 4.7.1
jobs:
build:
diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml
index 6fe42611..9778a136 100644
--- a/.github/workflows/app.yml
+++ b/.github/workflows/app.yml
@@ -10,7 +10,7 @@ on:
env:
REGISTRY: ghcr.io
- TAG: 4.7.0
+ TAG: 4.7.1
jobs:
build:
diff --git a/.github/workflows/docker-devmode.yml b/.github/workflows/docker-devmode.yml
index b4be583a..c08e7010 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.7.0
+ TAG: 4.7.1
jobs:
docker:
diff --git a/.github/workflows/vscode.yml b/.github/workflows/vscode.yml
index 3cf3c857..8ad7314c 100644
--- a/.github/workflows/vscode.yml
+++ b/.github/workflows/vscode.yml
@@ -9,7 +9,7 @@ on:
branches: [ main ]
env:
- TAG: 4.7.0
+ TAG: 4.7.1
jobs:
build:
diff --git a/docs/install/karavan-docker/docker-compose.yaml b/docs/install/karavan-docker/docker-compose.yaml
index 4e5377bd..d31606ac 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.7.0
+ image: ghcr.io/apache/camel-karavan:4.7.1
ports:
- "8080:8080"
environment:
diff --git a/docs/install/karavan-kubernetes/deployment.yaml b/docs/install/karavan-kubernetes/deployment.yaml
index 685b1659..b71e9a95 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.7.0"
+ value: "ghcr.io/apache/camel-karavan-devmode:4.7.1"
- name: "karavan.git.repository"
valueFrom:
secretKeyRef:
@@ -75,7 +75,7 @@ spec:
fieldRef:
apiVersion: ""
fieldPath: "metadata.namespace"
- image: "ghcr.io/apache/camel-karavan:4.7.0"
+ image: "ghcr.io/apache/camel-karavan:4.7.1"
imagePullPolicy: "Always"
name: "karavan"
ports:
diff --git a/docs/install/karavan-kubernetes/kustomization.yaml b/docs/install/karavan-kubernetes/kustomization.yaml
index fe491bae..85570f3f 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.7.0"
+ app.kubernetes.io/version: "4.7.1"
namespace: "karavan"
resources:
- secret.yaml
diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index 46b58445..968d3619 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.7.0</version>
+ <version>4.7.1</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 a4bb9dec..59a35400 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.7.0"
+LABEL "org.opencontainers.image.version"="4.7.1"
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 6ca8e803..7fc21984 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.7.0
+karavan.version=4.7.1
karavan.environment=dev
karavan.camel.status.interval=2s
@@ -25,7 +25,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.7.0
+karavan.devmode.image=ghcr.io/apache/camel-karavan-devmode:4.7.1
karavan.devmode.create-pvc=false
karavan.devmode.service.account=karavan
karavan.builder.service.account=karavan
diff --git a/karavan-app/src/main/webui/package-lock.json b/karavan-app/src/main/webui/package-lock.json
index dfa3e074..7f528263 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.7.0",
+ "version": "4.7.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "karavan",
- "version": "4.7.0",
+ "version": "4.7.1",
"dependencies": {
"@microsoft/fetch-event-source": "^2.0.1",
"@monaco-editor/react": "4.6.0",
diff --git a/karavan-app/src/main/webui/package.json b/karavan-app/src/main/webui/package.json
index 3b9b5998..ea5e3863 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.7.0",
+ "version": "4.7.1",
"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 3a408435..6e6b9c8f 100644
--- a/karavan-core/package-lock.json
+++ b/karavan-core/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "karavan-core",
- "version": "4.7.0",
+ "version": "4.7.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "karavan-core",
- "version": "4.7.0",
+ "version": "4.7.1",
"license": "Apache-2.0",
"dependencies": {
"@types/js-yaml": "^4.0.9",
diff --git a/karavan-core/package.json b/karavan-core/package.json
index 3f74d938..6428c54d 100644
--- a/karavan-core/package.json
+++ b/karavan-core/package.json
@@ -1,7 +1,7 @@
{
"name": "karavan-core",
"publisher": "camel-karavan",
- "version": "4.7.0",
+ "version": "4.7.1",
"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 f17dffe2..6526b26f 100644
--- a/karavan-designer/package-lock.json
+++ b/karavan-designer/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "karavan-designer",
- "version": "4.7.0",
+ "version": "4.7.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "karavan-designer",
- "version": "4.7.0",
+ "version": "4.7.1",
"license": "Apache-2.0",
"dependencies": {
"@monaco-editor/react": "^4.6.0",
diff --git a/karavan-designer/package.json b/karavan-designer/package.json
index d5ec1cb9..72654345 100644
--- a/karavan-designer/package.json
+++ b/karavan-designer/package.json
@@ -1,6 +1,6 @@
{
"name": "karavan-designer",
- "version": "4.7.0",
+ "version": "4.7.1",
"license": "Apache-2.0",
"scripts": {
"start": "react-scripts start",
diff --git a/karavan-devmode/Dockerfile b/karavan-devmode/Dockerfile
index 7e980d21..897b2e46 100644
--- a/karavan-devmode/Dockerfile
+++ b/karavan-devmode/Dockerfile
@@ -19,7 +19,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.7.0"
+LABEL "org.opencontainers.image.version"="4.7.1"
RUN apt-get update && apt-get install git && apt-get clean
diff --git a/karavan-generator/pom.xml b/karavan-generator/pom.xml
index 9569bd11..3f6752f1 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.7.0</version>
+ <version>4.7.1</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 d4eb74e2..793a0dd1 100644
--- a/karavan-space/package-lock.json
+++ b/karavan-space/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "karavan-space",
- "version": "4.7.0",
+ "version": "4.7.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "karavan-space",
- "version": "4.7.0",
+ "version": "4.7.1",
"license": "Apache-2.0",
"dependencies": {
"@monaco-editor/react": "^4.6.0",
diff --git a/karavan-space/package.json b/karavan-space/package.json
index 9e33a62d..9d61a016 100644
--- a/karavan-space/package.json
+++ b/karavan-space/package.json
@@ -1,6 +1,6 @@
{
"name": "karavan-space",
- "version": "4.7.0",
+ "version": "4.7.1",
"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 f3973b63..bf0945ea 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.7.0"}
+ <Tooltip className="logo-tooltip" content={"Apache Camel Karavan 4.7.1"}
position={"right"}>
{KaravanIcon()}
</Tooltip>
diff --git a/karavan-vscode/README.md b/karavan-vscode/README.md
index 2c4e1b18..55d4859e 100644
--- a/karavan-vscode/README.md
+++ b/karavan-vscode/README.md
@@ -72,7 +72,7 @@ Build-in catalogues:
* Run using CLI
```shell
- jbang -Dcamel.jbang.version=4.7.0 camel@apache/camel run $INTEGRATION.yaml --max-messages=10 --logging-level=info
+ jbang -Dcamel.jbang.version=4.7.1 camel@apache/camel run $INTEGRATION.yaml --max-messages=10 --logging-level=info
```
## Export integration to Maven project
diff --git a/karavan-vscode/package-lock.json b/karavan-vscode/package-lock.json
index 2d31dd35..86ac5971 100644
--- a/karavan-vscode/package-lock.json
+++ b/karavan-vscode/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "karavan",
- "version": "4.7.0",
+ "version": "4.7.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "karavan",
- "version": "4.7.0",
+ "version": "4.7.1",
"license": "Apache-2.0",
"dependencies": {
"@monaco-editor/react": "^4.6.0",
diff --git a/karavan-vscode/package.json b/karavan-vscode/package.json
index 5026f2e0..1ff62176 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.7.0",
+ "version": "4.7.1",
"license": "Apache-2.0",
"preview": false,
"bugs": {