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
The following commit(s) were added to refs/heads/main by this push:
new a7d0ff47 Fix #642
a7d0ff47 is described below
commit a7d0ff4786c64b2e0233c0e095a5b38a12c2c2b1
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Tue Feb 7 14:51:58 2023 -0500
Fix #642
---
karavan-app/pom.xml | 2 +-
.../resources/snippets/spring-boot-kubernetes-application.properties | 2 +-
.../resources/snippets/spring-boot-openshift-application.properties | 2 +-
karavan-app/src/main/webui/src/designer/route/RouteDesignerLogic.tsx | 2 --
.../src/main/webui/src/designer/route/property/DslPropertyField.tsx | 2 +-
karavan-app/src/main/webui/src/designer/utils/CamelUi.tsx | 1 -
karavan-app/src/main/webui/src/designer/utils/KaravanComponents.tsx | 1 -
karavan-builder/Dockerfile | 2 +-
karavan-core/src/core/api/CamelDefinitionApi.ts | 1 +
karavan-core/src/core/api/CamelDefinitionYamlStep.ts | 1 +
karavan-core/src/core/model/CamelDefinition.ts | 1 +
karavan-core/src/core/model/CamelMetadata.ts | 1 +
karavan-demo/jms-to-kafka/docs/README.md | 2 +-
karavan-generator/pom.xml | 2 +-
.../src/main/resources/quarkus-builder-script-kubernetes.sh | 2 +-
.../src/main/resources/quarkus-builder-script-openshift.sh | 2 +-
.../src/main/resources/spring-boot-builder-script-kubernetes.sh | 2 +-
.../src/main/resources/spring-boot-builder-script-openshift.sh | 2 +-
karavan-vscode/CHANGELOG.md | 2 +-
karavan-vscode/README.md | 4 ++--
karavan-vscode/package.json | 4 ++--
21 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index 442f7738..402b8cde 100644
--- a/karavan-app/pom.xml
+++ b/karavan-app/pom.xml
@@ -31,7 +31,7 @@
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>2.16.0.Final</quarkus.platform.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
- <camel.version>3.20.1</camel.version>
+ <camel.version>3.20.2</camel.version>
<infinispan.version>14.0.5.Final</infinispan.version>
<tekton.version>6.2.0</tekton.version>
<jgit.version>2.3.1</jgit.version>
diff --git
a/karavan-app/src/main/resources/snippets/spring-boot-kubernetes-application.properties
b/karavan-app/src/main/resources/snippets/spring-boot-kubernetes-application.properties
index 4840b7b4..fe0f8cc4 100644
---
a/karavan-app/src/main/resources/snippets/spring-boot-kubernetes-application.properties
+++
b/karavan-app/src/main/resources/snippets/spring-boot-kubernetes-application.properties
@@ -3,7 +3,7 @@ camel.karavan.project-name={projectName}
camel.karavan.project-description={projectDescription}
camel.jbang.gav=org.camel.karavan.demo:{projectId}:1
camel.jbang.runtime=spring-boot
-camel.jbang.camelSpringBootVersion=3.20.1
+camel.jbang.camelSpringBootVersion=3.20.2
camel.jbang.springBootVersion=2.7.7
camel.jbang.dependencies=camel:microprofile-health
camel.health.enabled=true
diff --git
a/karavan-app/src/main/resources/snippets/spring-boot-openshift-application.properties
b/karavan-app/src/main/resources/snippets/spring-boot-openshift-application.properties
index c4a2cfb0..3bec7076 100644
---
a/karavan-app/src/main/resources/snippets/spring-boot-openshift-application.properties
+++
b/karavan-app/src/main/resources/snippets/spring-boot-openshift-application.properties
@@ -3,7 +3,7 @@ camel.karavan.project-name={projectName}
camel.karavan.project-description={projectDescription}
camel.jbang.gav=org.camel.karavan.demo:{projectId}:1
camel.jbang.runtime=spring-boot
-camel.jbang.camelSpringBootVersion=3.20.1
+camel.jbang.camelSpringBootVersion=3.20.2
camel.jbang.springBootVersion=2.7.7
camel.jbang.dependencies=camel:microprofile-health
camel.health.enabled=true
diff --git
a/karavan-app/src/main/webui/src/designer/route/RouteDesignerLogic.tsx
b/karavan-app/src/main/webui/src/designer/route/RouteDesignerLogic.tsx
index 18b2ce3c..fb366b4d 100644
--- a/karavan-app/src/main/webui/src/designer/route/RouteDesignerLogic.tsx
+++ b/karavan-app/src/main/webui/src/designer/route/RouteDesignerLogic.tsx
@@ -168,7 +168,6 @@ export class RouteDesignerLogic {
showDeleteConfirmation = (id: string) => {
let message: string;
let ce: CamelElement;
- let isRouteConfiguration: boolean = false;
ce =
CamelDefinitionApiExt.findElementInIntegration(this.routeDesigner.state.integration,
id)!;
if (ce.dslName === 'FromDefinition') { // Get the RouteDefinition for
this.routeDesigner. Use its uuid.
let flows = this.routeDesigner.state.integration.spec.flows!;
@@ -186,7 +185,6 @@ export class RouteDesignerLogic {
message = 'Delete route?';
} else if (ce.dslName === 'RouteConfigurationDefinition') {
message = 'Delete route configuration?';
- isRouteConfiguration = true;
} else {
message = 'Delete element from route?';
}
diff --git
a/karavan-app/src/main/webui/src/designer/route/property/DslPropertyField.tsx
b/karavan-app/src/main/webui/src/designer/route/property/DslPropertyField.tsx
index 8b9b57ab..e7fbfc65 100644
---
a/karavan-app/src/main/webui/src/designer/route/property/DslPropertyField.tsx
+++
b/karavan-app/src/main/webui/src/designer/route/property/DslPropertyField.tsx
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import React, {ReactElement} from 'react';
+import React from 'react';
import {
FormGroup,
TextInput,
diff --git a/karavan-app/src/main/webui/src/designer/utils/CamelUi.tsx
b/karavan-app/src/main/webui/src/designer/utils/CamelUi.tsx
index 3abb026b..334607ef 100644
--- a/karavan-app/src/main/webui/src/designer/utils/CamelUi.tsx
+++ b/karavan-app/src/main/webui/src/designer/utils/CamelUi.tsx
@@ -22,7 +22,6 @@ import {CamelMetadataApi} from
"karavan-core/lib/model/CamelMetadata";
import {CamelUtil} from "karavan-core/lib/api/CamelUtil";
import {CamelDefinitionApiExt} from
"karavan-core/lib/api/CamelDefinitionApiExt";
import {
- InterceptSendToEndpointDefinition,
NamedBeanDefinition,
RouteConfigurationDefinition,
RouteDefinition,
diff --git
a/karavan-app/src/main/webui/src/designer/utils/KaravanComponents.tsx
b/karavan-app/src/main/webui/src/designer/utils/KaravanComponents.tsx
index fa8c3bdb..72b92b93 100644
--- a/karavan-app/src/main/webui/src/designer/utils/KaravanComponents.tsx
+++ b/karavan-app/src/main/webui/src/designer/utils/KaravanComponents.tsx
@@ -16,7 +16,6 @@
*/
import React from 'react';
import {FormGroup, TextInput, Title} from "@patternfly/react-core";
-import {CamelUi} from "./CamelUi";
import {Integration} from "karavan-core/lib/model/IntegrationDefinition";
interface Props {
diff --git a/karavan-builder/Dockerfile b/karavan-builder/Dockerfile
index 53c02521..70ef2317 100644
--- a/karavan-builder/Dockerfile
+++ b/karavan-builder/Dockerfile
@@ -12,4 +12,4 @@ RUN mkdir /opt/mvnd && \
mv maven-mvnd-0.8.2-linux-amd64/* /opt/mvnd
WORKDIR /scripts
-ENTRYPOINT ["entrypoint", "-Dcamel.jbang.version=3.20.1", "camel@apache/camel"]
+ENTRYPOINT ["entrypoint", "-Dcamel.jbang.version=3.20.2", "camel@apache/camel"]
diff --git a/karavan-core/src/core/api/CamelDefinitionApi.ts
b/karavan-core/src/core/api/CamelDefinitionApi.ts
index 5b7d478b..e28891a5 100644
--- a/karavan-core/src/core/api/CamelDefinitionApi.ts
+++ b/karavan-core/src/core/api/CamelDefinitionApi.ts
@@ -2773,6 +2773,7 @@ export class CamelDefinitionApi {
const def = element ? new ParamDefinition({...element}) : new
ParamDefinition();
def.uuid = element?.uuid ? element.uuid : def.uuid;
def.allowableValues = element && element?.allowableValues ?
element?.allowableValues.map((x:any) =>
CamelDefinitionApi.createValueDefinition(x)) :[];
+ def.examples = element && element?.examples ?
element?.examples.map((x:any) =>
CamelDefinitionApi.createRestPropertyDefinition(x)) :[];
return def;
}
diff --git a/karavan-core/src/core/api/CamelDefinitionYamlStep.ts
b/karavan-core/src/core/api/CamelDefinitionYamlStep.ts
index d162dc11..c9b486a6 100644
--- a/karavan-core/src/core/api/CamelDefinitionYamlStep.ts
+++ b/karavan-core/src/core/api/CamelDefinitionYamlStep.ts
@@ -4354,6 +4354,7 @@ export class CamelDefinitionYamlStep {
const def = element ? new ParamDefinition({...element}) : new
ParamDefinition();
def.allowableValues = element && element?.allowableValues ?
element?.allowableValues.map((x:any) =>
CamelDefinitionYamlStep.readValueDefinition(x)) :[];
+ def.examples = element && element?.examples ?
element?.examples.map((x:any) =>
CamelDefinitionYamlStep.readRestPropertyDefinition(x)) :[];
return def;
}
diff --git a/karavan-core/src/core/model/CamelDefinition.ts
b/karavan-core/src/core/model/CamelDefinition.ts
index 1f9f8b49..9b8ac4af 100644
--- a/karavan-core/src/core/model/CamelDefinition.ts
+++ b/karavan-core/src/core/model/CamelDefinition.ts
@@ -3522,6 +3522,7 @@ export class ParamDefinition extends CamelElement {
dataType?: string;
dataFormat?: string;
allowableValues?: ValueDefinition[] = [];
+ examples?: RestPropertyDefinition[] = [];
description?: string;
public constructor(init?: Partial<ParamDefinition>) {
super('ParamDefinition');
diff --git a/karavan-core/src/core/model/CamelMetadata.ts
b/karavan-core/src/core/model/CamelMetadata.ts
index 9aeee5fd..5ff17adb 100644
--- a/karavan-core/src/core/model/CamelMetadata.ts
+++ b/karavan-core/src/core/model/CamelMetadata.ts
@@ -1149,6 +1149,7 @@ export const CamelModelMetadata: ElementMeta[] = [
new PropertyMeta('dataType', 'Data Type', "Sets the parameter data
type.", 'string', '', 'string', false, false, false, false, '', ''),
new PropertyMeta('dataFormat', 'Data Format', "Sets the parameter data
format.", 'string', '', '', false, false, false, false, '', ''),
new PropertyMeta('allowableValues', 'Allowable Values', "Sets the
parameter list of allowable values (enum).", 'ValueDefinition', '', '', false,
false, true, true, '', ''),
+ new PropertyMeta('examples', 'Examples', "Sets the parameter
examples.", 'RestPropertyDefinition', '', '', false, false, true, true, '', ''),
new PropertyMeta('description', 'Description', "Sets the parameter
description.", 'string', '', '', false, false, false, false, '', ''),
]),
new ElementMeta('throttle', 'ThrottleDefinition', 'Throttle', "Controls
the rate at which messages are passed to the next node in the route",
'eip,routing', [
diff --git a/karavan-demo/jms-to-kafka/docs/README.md
b/karavan-demo/jms-to-kafka/docs/README.md
index 7df307c2..e2a82df3 100644
--- a/karavan-demo/jms-to-kafka/docs/README.md
+++ b/karavan-demo/jms-to-kafka/docs/README.md
@@ -26,7 +26,7 @@ docker-compose up
### Start integration
```
-jbang -Dcamel.jbang.version=3.20.1 camel@apache/camel run *
+jbang -Dcamel.jbang.version=3.20.2 camel@apache/camel run *
```
### Publish payment to JMS
diff --git a/karavan-generator/pom.xml b/karavan-generator/pom.xml
index 59cecf95..467a15de 100644
--- a/karavan-generator/pom.xml
+++ b/karavan-generator/pom.xml
@@ -31,7 +31,7 @@
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>2.16.0.Final</quarkus.platform.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
- <version.camel-core>3.20.1</version.camel-core>
+ <version.camel-core>3.20.2</version.camel-core>
<version.camel-kamelet>3.20.1.1</version.camel-kamelet>
</properties>
<dependencyManagement>
diff --git
a/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
b/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
index 6c0e6c33..3b565426 100644
--- a/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
+++ b/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
@@ -14,7 +14,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=3.20.1 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.2 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
export LAST_COMMIT=$(git rev-parse --short HEAD)
export DATE=$(date '+%Y%m%d%H%M%S')
diff --git
a/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
b/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
index 5d834e53..734f01ba 100644
--- a/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
+++ b/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
@@ -14,7 +14,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=3.20.1 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.2 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
export LAST_COMMIT=$(git rev-parse --short HEAD)
export DATE=$(date '+%Y%m%d%H%M%S')
diff --git
a/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh
b/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh
index d4d24094..1e3c8e82 100644
---
a/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh
+++
b/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh
@@ -14,7 +14,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=3.20.1 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.2 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
export LAST_COMMIT=$(git rev-parse --short HEAD)
export DATE=$(date '+%Y%m%d%H%M%S')
diff --git
a/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh
b/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh
index 992eb4c2..a1755f89 100644
---
a/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh
+++
b/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh
@@ -14,7 +14,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=3.20.1 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=3.20.2 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
export LAST_COMMIT=$(git rev-parse --short HEAD)
export DATE=$(date '+%Y%m%d%H%M%S')
diff --git a/karavan-vscode/CHANGELOG.md b/karavan-vscode/CHANGELOG.md
index 8bc6eb52..ec4ca80f 100644
--- a/karavan-vscode/CHANGELOG.md
+++ b/karavan-vscode/CHANGELOG.md
@@ -1,7 +1,7 @@
# Changelog
## 3.20.1
-<!-- 0. Camel 3.20.2 -->
+0. Camel 3.20.2
## 3.20.0
0. Camel 3.20.1
diff --git a/karavan-vscode/README.md b/karavan-vscode/README.md
index edcfecda..a7d9c758 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=3.20.1 camel@apache/camel run
$INTEGRATION.yaml --max-messages=10 --logging-level=info
+ jbang -Dcamel.jbang.version=3.20.2 camel@apache/camel run
$INTEGRATION.yaml --max-messages=10 --logging-level=info
```
## Export integration to Maven project
@@ -82,7 +82,7 @@ Build-in catalogues:
* Export using CLI
```shell
- jbang -Dcamel.jbang.version=3.20.1 camel@apache/camel export
--directory=export
+ jbang -Dcamel.jbang.version=3.20.2 camel@apache/camel export
--directory=export
```
# Issues
diff --git a/karavan-vscode/package.json b/karavan-vscode/package.json
index 7ee77d84..fe2a85d9 100644
--- a/karavan-vscode/package.json
+++ b/karavan-vscode/package.json
@@ -64,7 +64,7 @@
"properties": {
"camel.version": {
"type": "string",
- "default": "3.20.1",
+ "default": "3.20.2",
"description": "Camel version",
"scope": "machine",
"order": 10
@@ -218,7 +218,7 @@
"camel.karavan.project-description=$NAME",
"camel.karavan.target=$TARGET",
"camel.jbang.gav=$GAV",
- "camel.jbang.camelSpringBootVersion=3.20.1",
+ "camel.jbang.camelSpringBootVersion=3.20.2",
"camel.jbang.springBootVersion=2.7.7",
"camel.jbang.runtime=$RUNTIME",
"camel.jbang.exportDir=.export",
