(camel-spring-boot) branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 64aa75990e3 Regen
64aa75990e3 is described below
commit 64aa75990e3e7246dc67feb791dbe0eb1482a86b
Author: Claus Ibsen
AuthorDate: Wed Mar 13 06:57:39 2024 +0100
Regen
---
.../apache/camel/springboot/catalog/components/aws-bedrock-agent.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock-agent.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock-agent.json
index dac4c00a14f..09ba54b9ac8 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock-agent.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock-agent.json
@@ -27,7 +27,7 @@
"dataSourceId": { "index": 1, "kind": "property", "displayName": "Data
Source Id", "group": "common", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "Define the Data source
Id we are going to use" },
"knowledgeBaseId": { "index": 2, "kind": "property", "displayName":
"Knowledge Base Id", "group": "common", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "Define the Knowledge
Base Id we are going to use" },
"modelId": { "index": 3, "kind": "property", "displayName": "Model Id",
"group": "common", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "enum": [ "anthropic.claude-instant-v1",
"anthropic.claude-v2", "anthropic.claude-v2:1" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "descrip [...]
-"operation": { "index": 4, "kind": "property", "displayName": "Operation",
"group": "common", "label": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentOperations", "enum":
[ "startIngestionJob", "listIngestionJobs" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "config [...]
+"operation": { "index": 4, "kind": "property", "displayName": "Operation",
"group": "common", "label": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentOperations", "enum":
[ "startIngestionJob", "listIngestionJobs", "getIngestionJob" ], "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configura [...]
"overrideEndpoint": { "index": 5, "kind": "property", "displayName":
"Override Endpoint", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "Set the need for
overriding the endpoint. This option needs to be used i [...]
"pojoRequest": { "index": 6, "kind": "property", "displayName": "Pojo
Request", "group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "If we want to use a POJO
request as body or not" },
"profileCredentialsName": { "index": 7, "kind": "property", "displayName":
"Profile Credentials Name", "group": "common", "label": "", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "false",
"configurationClass":
Re: [PR] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
oscerd closed pull request #1105: [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) URL: https://github.com/apache/camel-spring-boot/pull/1105 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-kamelets) branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git The following commit(s) were added to refs/heads/main by this push: new 6d7a8091 Updated CHANGELOG.md 6d7a8091 is described below commit 6d7a8091227e651912833f57ba715443ac17452a Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Mar 13 03:08:00 2024 + Updated CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd4f4ae7..c7f5dac2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ **Closed issues:** +- Spring RabbitMQ Sink Kamelet: Support autoDeclareProducer as parameter [\#1943](https://github.com/apache/camel-kamelets/issues/1943) +- Support topicIsPattern as Kafka Source Kamelets parameter [\#1939](https://github.com/apache/camel-kamelets/issues/1939) - CDC Storage Source Kamelets, rename to -event-based instead of cdc [\#1930](https://github.com/apache/camel-kamelets/issues/1930) - Add Kafka Batch with Apicurio with keycloak support [\#1922](https://github.com/apache/camel-kamelets/issues/1922) - Kafka Apicurio Secured Sink Kamelet [\#1916](https://github.com/apache/camel-kamelets/issues/1916)
Re: [I] [CI] - Quarkus Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1993187961 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 8258449606-1420-3e73290d-4aaf-4bf9-94f3-eafaa6a2abf2 * Camel Quarkus Commit: 80d8aa1370583ba5d456c16077b921cde6b3b43d * Quarkus Main Commit: ba5d6006e2470564374fbdbf9e1d3929b1fffc80 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/8258449606 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch dependabot/maven/com.unboundid-unboundid-ldapsdk-7.0.0 deleted (was 31d56fb7aa)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.unboundid-unboundid-ldapsdk-7.0.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git was 31d56fb7aa Bump com.unboundid:unboundid-ldapsdk from 6.0.11 to 7.0.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-quarkus) branch main updated (ba5d6006e2 -> de8ab18f63)
This is an automated email from the ASF dual-hosted git repository. zhfeng pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from ba5d6006e2 Move main-xml-io-with-beans tests into main-xml-io add de8ab18f63 Add profile to debug camel-k-maven-plugin integration tests (#5864) No new revisions were added by this update. Summary of changes: tooling/camel-k-maven-plugin/pom.xml | 20 +++- 1 file changed, 19 insertions(+), 1 deletion(-)
Re: [PR] Add profile to debug camel-k-maven-plugin integration tests [camel-quarkus]
zhfeng merged PR #5864: URL: https://github.com/apache/camel-quarkus/pull/5864 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch main updated: Bump com.unboundid:unboundid-ldapsdk from 6.0.11 to 7.0.0 (#5865)
This is an automated email from the ASF dual-hosted git repository.
zhfeng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new fba808559d Bump com.unboundid:unboundid-ldapsdk from 6.0.11 to 7.0.0
(#5865)
fba808559d is described below
commit fba808559d8f3907fff1e72083ae6cadebaddce0
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Wed Mar 13 10:32:56 2024 +0800
Bump com.unboundid:unboundid-ldapsdk from 6.0.11 to 7.0.0 (#5865)
Bumps
[com.unboundid:unboundid-ldapsdk](https://github.com/pingidentity/ldapsdk) from
6.0.11 to 7.0.0.
- [Release notes](https://github.com/pingidentity/ldapsdk/releases)
-
[Changelog](https://github.com/pingidentity/ldapsdk/blob/master/docs/release-notes.html)
- [Commits](https://github.com/pingidentity/ldapsdk/commits)
---
updated-dependencies:
- dependency-name: com.unboundid:unboundid-ldapsdk
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index e25acfcea9..6a8ef8e35c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,7 +170,7 @@
4.13.0
${pdfbox-version}
2.12.0
-6.0.11
+7.0.0
3.3.1
1.12
Re: [PR] Bump com.unboundid:unboundid-ldapsdk from 6.0.11 to 7.0.0 [camel-quarkus]
zhfeng merged PR #5865: URL: https://github.com/apache/camel-quarkus/pull/5865 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [CI] - Camel Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1992943553 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 8257342541-1316-07177747-483b-4873-9255-a9be60c59853 * Camel Quarkus Commit: 263af2097f110b397e3cdc164a1c0c03a53c35e1 * Camel Main Commit: ba5d6006e2470564374fbdbf9e1d3929b1fffc80 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/8257342541 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
github-actions[bot] opened a new pull request, #1105: URL: https://github.com/apache/camel-spring-boot/pull/1105 Periodic Sync of Camel Spring Boot Main Branch with main Camel Main. see https://github.com/apache/camel-spring-boot/blob/main/.github/workflows/automatic-sync-main.yml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-spring-boot) 01/01: [create-pull-request] automated change
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch automatic-periodic-sync
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 6c379db6d6bab29fbf155f84040651edd89d715a
Author: oscerd <5106647+osc...@users.noreply.github.com>
AuthorDate: Wed Mar 13 00:22:21 2024 +
[create-pull-request] automated change
---
.../apache/camel/springboot/catalog/components/aws-bedrock-agent.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock-agent.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock-agent.json
index dac4c00a14f..09ba54b9ac8 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock-agent.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock-agent.json
@@ -27,7 +27,7 @@
"dataSourceId": { "index": 1, "kind": "property", "displayName": "Data
Source Id", "group": "common", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "Define the Data source
Id we are going to use" },
"knowledgeBaseId": { "index": 2, "kind": "property", "displayName":
"Knowledge Base Id", "group": "common", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "Define the Knowledge
Base Id we are going to use" },
"modelId": { "index": 3, "kind": "property", "displayName": "Model Id",
"group": "common", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "enum": [ "anthropic.claude-instant-v1",
"anthropic.claude-v2", "anthropic.claude-v2:1" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "descrip [...]
-"operation": { "index": 4, "kind": "property", "displayName": "Operation",
"group": "common", "label": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentOperations", "enum":
[ "startIngestionJob", "listIngestionJobs" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "config [...]
+"operation": { "index": 4, "kind": "property", "displayName": "Operation",
"group": "common", "label": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentOperations", "enum":
[ "startIngestionJob", "listIngestionJobs", "getIngestionJob" ], "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configura [...]
"overrideEndpoint": { "index": 5, "kind": "property", "displayName":
"Override Endpoint", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "Set the need for
overriding the endpoint. This option needs to be used i [...]
"pojoRequest": { "index": 6, "kind": "property", "displayName": "Pojo
Request", "group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "If we want to use a POJO
request as body or not" },
"profileCredentialsName": { "index": 7, "kind": "property", "displayName":
"Profile Credentials Name", "group": "common", "label": "", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "false",
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
(camel-k) branch main updated: chore: nightly automatic updates
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 2856021c3 chore: nightly automatic updates 2856021c3 is described below commit 2856021c3cc03b222c86fa0bce5b0d2ff36fbfd0 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Mar 12 23:46:34 2024 + chore: nightly automatic updates --- CHANGELOG.md | 2 + README.adoc | 2 +- badge.out| 2 +- coverage | 2 +- coverage.out | 174 +-- 5 files changed, 91 insertions(+), 91 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2eb578aec..1c516a810 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,7 @@ **Merged pull requests:** +- Azure Key Vault Trait: Support Azure Identity as authentication method [\#5244](https://github.com/apache/camel-k/pull/5244) ([oscerd](https://github.com/oscerd)) - chore\(e2e\): Fix smoke tests [\#5240](https://github.com/apache/camel-k/pull/5240) ([christophd](https://github.com/christophd)) - fix\(cmd\): delete KameletBinding until they exists [\#5237](https://github.com/apache/camel-k/pull/5237) ([squakez](https://github.com/squakez)) - fix\(ctrl\): message digest change [\#5236](https://github.com/apache/camel-k/pull/5236) ([squakez](https://github.com/squakez)) @@ -65,6 +66,7 @@ - \[Regression\] fix\(quarkus\): don't override application.properties [\#5234](https://github.com/apache/camel-k/pull/5234) ([squakez](https://github.com/squakez)) - fix\(trait\): revert persisted status [\#5233](https://github.com/apache/camel-k/pull/5233) ([squakez](https://github.com/squakez)) - chore\(deps\): bump github.com/prometheus/common from 0.48.0 to 0.50.0 [\#5232](https://github.com/apache/camel-k/pull/5232) ([dependabot[bot]](https://github.com/apps/dependabot)) +- fix\(traits\): use Comparable matches [\#5230](https://github.com/apache/camel-k/pull/5230) ([squakez](https://github.com/squakez)) - fix\(trait\): Add documentation and test on multiple sources [\#5229](https://github.com/apache/camel-k/pull/5229) ([gansheer](https://github.com/gansheer)) - chore\(deps\): bump github.com/cloudevents/sdk-go/v2 from 2.13.0 to 2.15.2 [\#5228](https://github.com/apache/camel-k/pull/5228) ([dependabot[bot]](https://github.com/apps/dependabot)) - chore\(lint\): Update golangci-lint version to 1.55 [\#5227](https://github.com/apache/camel-k/pull/5227) ([christophd](https://github.com/christophd)) diff --git a/README.adoc b/README.adoc index 5eee363a2..6f602ad4e 100644 --- a/README.adoc +++ b/README.adoc @@ -11,7 +11,7 @@ image:https://github.com/apache/camel-k/workflows/kubernetes/badge.svg["Kubernet image:https://github.com/apache/camel-k/workflows/knative/badge.svg["Knative;, link="https://github.com/apache/camel-k/actions/workflows/knative.yml;] image:https://github.com/apache/camel-k/actions/workflows/nightly-release.yml/badge.svg["Nightly releases", link="https://github.com/apache/camel-k/actions/workflows/nightly-release.yml;] image:https://github.com/apache/camel-k/actions/workflows/nightly-native-test.yml/badge.svg["Quarkus native", link="https://github.com/apache/camel-k/actions/workflows/nightly-native-test.yml;] -image:https://img.shields.io/badge/Coverage-36.9%25-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml;] +image:https://img.shields.io/badge/Coverage-37.2%25-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml;] image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg["Chat on Zulip", link="https://camel.zulipchat.com;] Apache Camel K is a lightweight integration framework built from **Apache Camel** that runs natively on Kubernetes and is specifically designed for serverless and microservice architectures. Users of `Camel K` can instantly run integration code written in Camel DSL on their preferred **Cloud** provider. diff --git a/badge.out b/badge.out index 3f7e3235f..1707b478f 100644 --- a/badge.out +++ b/badge.out @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/coverage b/coverage index 4282804f3..ad4af79d8 100644 --- a/coverage +++ b/coverage @@ -1 +1 @@ -36.9 +37.2 diff --git a/coverage.out b/coverage.out index a53803db5..0f0157fa1 100644 --- a/coverage.out +++ b/coverage.out @@ -44,9 +44,9 @@ github.com/apache/camel-k/v2/addons/tracing/tracing.go:125: Apply 93. github.com/apache/camel-k/v2/addons/vault/aws/aws_secrets_manager.go:79:
(camel-k-runtime) branch main updated: chore: update changelog
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/main by this push: new a7344117 chore: update changelog a7344117 is described below commit a73441177e55b0780040311d673cb9593f49f6e0 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Mar 12 23:33:05 2024 + chore: update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7672a10..e9ff3c3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Merged pull requests:** +- build\(deps\): bump org.apache.maven.plugins:maven-assembly-plugin from 3.6.0 to 3.7.0 [\#1182](https://github.com/apache/camel-k-runtime/pull/1182) ([dependabot[bot]](https://github.com/apps/dependabot)) - build\(deps\): bump groovy-version from 4.0.18 to 4.0.19 [\#1179](https://github.com/apache/camel-k-runtime/pull/1179) ([dependabot[bot]](https://github.com/apps/dependabot)) - feat: Bump to CQ 3.8.0 [\#1178](https://github.com/apache/camel-k-runtime/pull/1178) ([squakez](https://github.com/squakez)) - build\(deps\): bump com.google.cloud.tools:jib-maven-plugin from 3.4.0 to 3.4.1 [\#1177](https://github.com/apache/camel-k-runtime/pull/1177) ([dependabot[bot]](https://github.com/apps/dependabot))
(camel-quarkus) branch dependabot/maven/com.unboundid-unboundid-ldapsdk-7.0.0 created (now 31d56fb7aa)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.unboundid-unboundid-ldapsdk-7.0.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 31d56fb7aa Bump com.unboundid:unboundid-ldapsdk from 6.0.11 to 7.0.0 No new revisions were added by this update.
[PR] Bump com.unboundid:unboundid-ldapsdk from 6.0.11 to 7.0.0 [camel-quarkus]
dependabot[bot] opened a new pull request, #5865:
URL: https://github.com/apache/camel-quarkus/pull/5865
Bumps
[com.unboundid:unboundid-ldapsdk](https://github.com/pingidentity/ldapsdk) from
6.0.11 to 7.0.0.
Changelog
Sourced from https://github.com/pingidentity/ldapsdk/blob/master/docs/release-notes.html;>com.unboundid:unboundid-ldapsdk's
changelog.
div align=right
${TARGET=offline}LDAP SDK Home Page
${TARGET=offline}
Product Information
h2Release Notes/h2
lt;h3gt;Version 7.0.0lt;/h3gt;
lt;pgt;
The following changes were made between the 6.0.11 and 7.0.0
releases:
lt;/pgt;
lt;ulgt;
lt;ligt;
Updated the LDAP SDK to require Java SE 8 or later. As of the
7.0.0 release,
Java 7 is no longer supported.
lt;brgt;lt;brgt;
lt;/ligt;
lt;ligt;
Updated the LDAPConnectionPool behavior in the case that an
attempt to check out
a connection from the pool first encounters an existing connection
that is deemed
not valid by the configured health check. Previously, it would
close that
connection as defunct and try to create a new connection to
replace it, but if
that attempt was successful, the newly created connection would be
added to the
end of the pool's set of potentially available connections, and it
would continue
iterating through the set of connections to try to find one that
is valid. Now,
if the pool is able to successfully create a new connection to
replace the
existing defunct connection, it will immediately return that new
connection
without checking any of the other existing connections. This
should
substantially improve performance in the case that the pool has
several
connections that are already established but have become invalid
for some reason
in a way that does not prevent successfully establishing new
connections.
lt;brgt;lt;brgt;
lt;/ligt;
lt;ligt;
Added a compare-ldap-schemas command-line tool that can be used to
identify
differences between the schemas of two LDAP servers.
lt;brgt;lt;brgt;
lt;/ligt;
lt;ligt;
Added the ability to reuse automatically generated JAAS
configuration files if
possible when attempting a SASL GSSAPI bind. Previously, if the
caller didn't
explicitly provide a JAAS config file, the LDAP SDK would generate
one based on
the provided bind request properties. It would do this for every
GSSAPI bind
attempt, even if they all used the same properties, which means
that it could
... (truncated)
Commits
See full diff in https://github.com/pingidentity/ldapsdk/commits;>compare view
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that
have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI
passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and
block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it.
You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all of
the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen the PR
or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen the PR
or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen
Re: [PR] fix(#5242): Disable noErrorHandler setting for Camel 4.4.0 [camel-k]
github-actions[bot] commented on PR #5245: URL: https://github.com/apache/camel-k/pull/5245#issuecomment-1992592391 :heavy_check_mark: Unit test coverage report - coverage increased from 37.2% to 37.3% (**+0.1%**) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k-runtime) branch dependabot/maven/org.apache.maven.plugins-maven-remote-resources-plugin-3.2.0 created (now 8268c84e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-remote-resources-plugin-3.2.0 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git at 8268c84e build(deps): bump org.apache.maven.plugins:maven-remote-resources-plugin No new revisions were added by this update.
[PR] build(deps): bump org.apache.maven.plugins:maven-remote-resources-plugin from 3.1.0 to 3.2.0 [camel-k-runtime]
dependabot[bot] opened a new pull request, #1183: URL: https://github.com/apache/camel-k-runtime/pull/1183 Bumps [org.apache.maven.plugins:maven-remote-resources-plugin](https://github.com/apache/maven-remote-resources-plugin) from 3.1.0 to 3.2.0. Release notes Sourced from https://github.com/apache/maven-remote-resources-plugin/releases;>org.apache.maven.plugins:maven-remote-resources-plugin's releases. 3.2.0 New features and improvements https://issues.apache.org/jira/browse/MRRESOURCES-145;>[MRRESOURCES-145] - Avoid overwriting the generated file with the same content (https://redirect.github.com/apache/maven-remote-resources-plugin/pull/50;>#50) https://github.com/gnodet;>@gnodet https://issues.apache.org/jira/browse/MRRESOURCES-143;>[MRRESOURCES-143] - Maven 3.6.3 as minimum requirements (https://redirect.github.com/apache/maven-remote-resources-plugin/pull/51;>#51) https://github.com/slawekjaranowski;>@slawekjaranowski Bug Fixes https://issues.apache.org/jira/browse/MRRESOURCES-135;>[MRRESOURCES-135] - Show projectTimespan year in UTC (https://redirect.github.com/apache/maven-remote-resources-plugin/pull/39;>#39) https://github.com/raboof;>@raboof Dependency updates https://issues.apache.org/jira/browse/MRRESOURCES-144;>[MRRESOURCES-144] - Bump org.codehaus.plexus:plexus-resources from 1.2.0 to 1.3.0 (https://redirect.github.com/apache/maven-remote-resources-plugin/pull/49;>#49) https://github.com/dependabot;>@dependabot https://issues.apache.org/jira/browse/MRRESOURCES-136;>[MRRESOURCES-136] - Bump org.apache.maven.plugins:maven-plugins from 40 to 41 (https://redirect.github.com/apache/maven-remote-resources-plugin/pull/47;>#47) https://github.com/dependabot;>@dependabot https://issues.apache.org/jira/browse/MRRESOURCES-142;>[MRRESOURCES-142] - Bump commons-io:commons-io from 2.14.0 to 2.15.1 (https://redirect.github.com/apache/maven-remote-resources-plugin/pull/48;>#48) https://github.com/dependabot;>@dependabot https://issues.apache.org/jira/browse/MRRESOURCES-142;>[MRRESOURCES-142] - Bump commons-io from 2.13.0 to 2.14.0 (https://redirect.github.com/apache/maven-remote-resources-plugin/pull/46;>#46) https://github.com/slawekjaranowski;>@slawekjaranowski https://issues.apache.org/jira/browse/MRRESOURCES-140;>[MRRESOURCES-140] - Bump plexus-utils from 3.5.1 to 4.0.0 and plexus-xml 3.0.0 (https://redirect.github.com/apache/maven-remote-resources-plugin/pull/44;>#44) https://github.com/slawekjaranowski;>@slawekjaranowski https://issues.apache.org/jira/browse/MRRESOURCES-139;>[MRRESOURCES-139] - Bump Bump maven-archiver from 3.6.0 to 3.6.1 (https://redirect.github.com/apache/maven-remote-resources-plugin/pull/43;>#43) https://github.com/slawekjaranowski;>@slawekjaranowski https://issues.apache.org/jira/browse/MRRESOURCES-138;>[MRRESOURCES-138] - Bump maven-filtering from 3.3.0 to 3.3.1 (https://redirect.github.com/apache/maven-remote-resources-plugin/pull/42;>#42) https://github.com/slawekjaranowski;>@slawekjaranowski https://issues.apache.org/jira/browse/MRRESOURCES-137;>[MRRESOURCES-137] - Bump commons-io from 2.11.0 to 2.13.0 (https://redirect.github.com/apache/maven-remote-resources-plugin/pull/41;>#41) https://github.com/slawekjaranowski;>@slawekjaranowski https://issues.apache.org/jira/browse/MRRESOURCES-136;>[MRRESOURCES-136] - Upgrade Parent to 40 (https://redirect.github.com/apache/maven-remote-resources-plugin/pull/40;>#40) https://github.com/slawekjaranowski;>@slawekjaranowski Maintenance https://issues.apache.org/jira/browse/MNG-6829;>[MNG-6829] - Replace any StringUtils#isEmpty(String) and #isNotEmpty(String) (https://redirect.github.com/apache/maven-remote-resources-plugin/pull/38;>#38) https://github.com/timtebeek;>@timtebeek Commits https://github.com/apache/maven-remote-resources-plugin/commit/e6b30b157d12095134e816d8586519995230ed64;>e6b30b1 [maven-release-plugin] prepare release maven-remote-resources-plugin-3.2.0 https://github.com/apache/maven-remote-resources-plugin/commit/9f5b05724b10fcb248764fb2605f01dea835303a;>9f5b057 [MRRESOURCES-145] Avoid overwriting the generated file with the same content ... https://github.com/apache/maven-remote-resources-plugin/commit/190ec3464ca5e81119f97d4ede875ffd0636ff2f;>190ec34 [MRRESOURCES-143] Maven 3.6.3 as minimum requirements https://github.com/apache/maven-remote-resources-plugin/commit/2570ff4bfcf09d555247f76478d6d3d496bb4e64;>2570ff4 [MRRESOURCES-144] Bump org.codehaus.plexus:plexus-resources from 1.2.0 to 1.3... https://github.com/apache/maven-remote-resources-plugin/commit/e29120831dd62a3ac34c3ad1953d11fb27ef043e;>e291208 [MRRESOURCES-136] Bump org.apache.maven.plugins:maven-plugins from 40 to 41 (... https://github.com/apache/maven-remote-resources-plugin/commit/3eca62783c734c9f48162b88bb6cf459540d7545;>3eca627 [MRRESOURCES-142]
Re: [PR] Camel 20341 [camel]
cziesman commented on code in PR #13447:
URL: https://github.com/apache/camel/pull/13447#discussion_r1522046054
##
components/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/QdrantUpsertManualIT.java:
##
@@ -31,7 +31,7 @@
import static io.qdrant.client.ValueFactory.value;
import static org.assertj.core.api.Assertions.assertThat;
-public class QdrantUpsertTest extends QdrantTestSupport {
+public class QdrantUpsertManualIT extends QdrantTestSupport {
Review Comment:
My apologies for renaming the Quadrant test classes in error. When I started
working on these fixes, the Quadrant tests were failing due to Docker errors,
so I assumed that they needed to be run manually. The tests are no longer
failing, so I have reverted the class names. Thanks for catching this.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] fix(#5242): Disable noErrorHandler setting for Camel 4.4.0 [camel-k]
github-actions[bot] commented on PR #5245: URL: https://github.com/apache/camel-k/pull/5245#issuecomment-1992465234 :heavy_check_mark: Unit test coverage report - coverage increased from 37.2% to 37.3% (**+0.1%**) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] fix(#5242): Disable noErrorHandler setting for Camel 4.4.0 [camel-k]
christophd commented on PR #5245: URL: https://github.com/apache/camel-k/pull/5245#issuecomment-1992441398 Fixes #5242 and the nightly runtime check -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] fix(#5242): Disable noErrorHandler setting for Camel 4.4.0 [camel-k]
christophd opened a new pull request, #5245: URL: https://github.com/apache/camel-k/pull/5245 - Runtime version 3.8.0+ requires this setting so pipe error handler works as expected - noErrorHandler is set for Kamelets by default since Camel 4.4.0 **Release Note** ```release-note fix(#5242): Disable noErrorHandler setting for Camel 4.4.0 to make pipe error handler work ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Camel 20341 [camel]
cziesman commented on code in PR #13447:
URL: https://github.com/apache/camel/pull/13447#discussion_r1521889388
##
components/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/QdrantUpsertManualIT.java:
##
@@ -31,7 +31,7 @@
import static io.qdrant.client.ValueFactory.value;
import static org.assertj.core.api.Assertions.assertThat;
-public class QdrantUpsertTest extends QdrantTestSupport {
+public class QdrantUpsertManualIT extends QdrantTestSupport {
Review Comment:
The Quadrant tests break the unit test build because they assume the
presence of Docker without using TestContainers. Unit tests by definition
should be self contained and not depend on external resources. I can revert the
class names but there are many tests within Camel that depend on Docker that
use the `*ManualIT.java` naming convention.
Perhaps there should be a Camel standard that (1) Docker is only used with
TestContainers, or that (2) tests that depend on Docker should be named
appropriately and run manually.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [I] Add support for dynamic properties [camel-karavan]
oscerd commented on issue #1138: URL: https://github.com/apache/camel-karavan/issues/1138#issuecomment-1992247956 It would be a good addition to the official catalog btw -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] vscode: Respect .gitignore when scanning for kamlets [camel-karavan]
mgubaidullin commented on issue #1151: URL: https://github.com/apache/camel-karavan/issues/1151#issuecomment-1992237075 karavan project suppose to be a simple folder with files -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Add support for dynamic properties [camel-karavan]
mgubaidullin commented on issue #1138: URL: https://github.com/apache/camel-karavan/issues/1138#issuecomment-1992232994 Karavan uses Kamelet spec. react-jsonschema-form or Patterfly has nothing to do with that. If your Kamelet is following Kamelet spec and are not visualized correctly in Karavan, please provide Kamelet yaml file. If you want to change Kamelet spec, please create an issue in Kamelet project: https://github.com/apache/camel-kamelets -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Camel 20341 [camel]
cziesman commented on code in PR #13447:
URL: https://github.com/apache/camel/pull/13447#discussion_r1521889388
##
components/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/QdrantUpsertManualIT.java:
##
@@ -31,7 +31,7 @@
import static io.qdrant.client.ValueFactory.value;
import static org.assertj.core.api.Assertions.assertThat;
-public class QdrantUpsertTest extends QdrantTestSupport {
+public class QdrantUpsertManualIT extends QdrantTestSupport {
Review Comment:
The Quadrant tests break the unit test build because they assume the
presence of Docker without using TestContainers. Unit tests by definition
should be self contained and not depend on external resources. I can revert the
class names but there are many tests within Camel that depend on Docker that
use the `*ManualIT.java` naming convention.
Perhaps there should be a Camel standard that (1) Docker is only used with
TestContainers, or that (2) tests that depend on Docker should be named
appropriately and run manually.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Camel 20341 [camel]
orpiske commented on code in PR #13447:
URL: https://github.com/apache/camel/pull/13447#discussion_r1521838890
##
core/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java:
##
@@ -258,7 +773,55 @@ protected T
resolveMandatoryEndpoint(String uri, Class e
* @return the mandatory mock endpoint or an exception is thrown if it
could not be resolved
*/
protected MockEndpoint getMockEndpoint(String uri) {
-return resolveMandatoryEndpoint(uri, MockEndpoint.class);
+return getMockEndpoint(uri, true);
+}
+
+/**
+ * Resolves the {@link MockEndpoint} using a URI of the form
mock:someName, optionally creating it if
+ * it does not exist. This implementation will lookup existing mock
endpoints and match on the mock queue name, eg
+ * mock:foo and mock:foo?retainFirst=5 would match as the queue name is
foo.
+ *
+ * @param uri the URI which typically starts with
"mock:" and has some name
+ * @param create whether or not to allow the endpoint to
be created if it doesn't exist
+ * @return the mock endpoint or an {@link
NoSuchEndpointException} is thrown if it could not
+ * be resolved
+ * @throws NoSuchEndpointException is the mock endpoint does not exist
+ */
+protected MockEndpoint getMockEndpoint(String uri, boolean create) throws
NoSuchEndpointException {
+// look for existing mock endpoints that have the same queue name, and
+// to
+// do that we need to normalize uri and strip out query parameters and
+// whatnot
+String n;
+try {
+n = URISupport.normalizeUri(uri);
+} catch (URISyntaxException e) {
+throw RuntimeCamelException.wrapRuntimeException(e);
+}
+// strip query
+final String target = StringHelper.before(n, "?", n);
+
+// lookup endpoints in registry and try to find it
+MockEndpoint found = (MockEndpoint)
context.getEndpointRegistry().values().stream()
+.filter(e -> e instanceof MockEndpoint).filter(e -> {
+String t = e.getEndpointUri();
+// strip query
+int idx2 = t.indexOf('?');
+if (idx2 != -1) {
+t = t.substring(0, idx2);
+}
+return t.equals(target);
+}).findFirst().orElse(null);
+
+if (found != null) {
+return found;
+}
+
+if (create) {
+return resolveMandatoryEndpoint(uri, MockEndpoint.class);
+} else {
+throw new NoSuchEndpointException(String.format("MockEndpoint %s
does not exist.", uri));
+}
Review Comment:
It's not about the class. It's about the body of the method.
The duplication can be resolved by creating a new component and properly
adjusting the code.
But, in retrospect, I don't think you need to do anything here. This type of
fixes is better done by those of us with more experience on the code base.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Camel 20341 [camel]
orpiske commented on code in PR #13447:
URL: https://github.com/apache/camel/pull/13447#discussion_r1521831278
##
components/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/QdrantUpsertManualIT.java:
##
@@ -31,7 +31,7 @@
import static io.qdrant.client.ValueFactory.value;
import static org.assertj.core.api.Assertions.assertThat;
-public class QdrantUpsertTest extends QdrantTestSupport {
+public class QdrantUpsertManualIT extends QdrantTestSupport {
Review Comment:
1. Why would these tests break anything here?
2. These tests are not manual tests
So, leave them outside the scope of this change.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Add Qdrant JVM only extension [camel-quarkus]
aldettinger commented on PR #5861: URL: https://github.com/apache/camel-quarkus/pull/5861#issuecomment-1992062019 The failing tests are not related. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Camel 20341 [camel]
cziesman commented on code in PR #13447:
URL: https://github.com/apache/camel/pull/13447#discussion_r1521770015
##
components/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/QdrantUpsertManualIT.java:
##
@@ -31,7 +31,7 @@
import static io.qdrant.client.ValueFactory.value;
import static org.assertj.core.api.Assertions.assertThat;
-public class QdrantUpsertTest extends QdrantTestSupport {
+public class QdrantUpsertManualIT extends QdrantTestSupport {
Review Comment:
Is there a process in place when reviewing code submissions to make sure
that manual tests are named appropriately such that they do not run as part of
the unit tests?
These changes are technically outside the scope of this PR, but these manual
tests were breaking the unit tests, so they needed to be renamed to match their
purpose.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Camel 20341 [camel]
cziesman commented on code in PR #13447:
URL: https://github.com/apache/camel/pull/13447#discussion_r1521762957
##
core/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java:
##
@@ -258,7 +773,55 @@ protected T
resolveMandatoryEndpoint(String uri, Class e
* @return the mandatory mock endpoint or an exception is thrown if it
could not be resolved
*/
protected MockEndpoint getMockEndpoint(String uri) {
-return resolveMandatoryEndpoint(uri, MockEndpoint.class);
+return getMockEndpoint(uri, true);
+}
+
+/**
+ * Resolves the {@link MockEndpoint} using a URI of the form
mock:someName, optionally creating it if
+ * it does not exist. This implementation will lookup existing mock
endpoints and match on the mock queue name, eg
+ * mock:foo and mock:foo?retainFirst=5 would match as the queue name is
foo.
+ *
+ * @param uri the URI which typically starts with
"mock:" and has some name
+ * @param create whether or not to allow the endpoint to
be created if it doesn't exist
+ * @return the mock endpoint or an {@link
NoSuchEndpointException} is thrown if it could not
+ * be resolved
+ * @throws NoSuchEndpointException is the mock endpoint does not exist
+ */
+protected MockEndpoint getMockEndpoint(String uri, boolean create) throws
NoSuchEndpointException {
+// look for existing mock endpoints that have the same queue name, and
+// to
+// do that we need to normalize uri and strip out query parameters and
+// whatnot
+String n;
+try {
+n = URISupport.normalizeUri(uri);
+} catch (URISyntaxException e) {
+throw RuntimeCamelException.wrapRuntimeException(e);
+}
+// strip query
+final String target = StringHelper.before(n, "?", n);
+
+// lookup endpoints in registry and try to find it
+MockEndpoint found = (MockEndpoint)
context.getEndpointRegistry().values().stream()
+.filter(e -> e instanceof MockEndpoint).filter(e -> {
+String t = e.getEndpointUri();
+// strip query
+int idx2 = t.indexOf('?');
+if (idx2 != -1) {
+t = t.substring(0, idx2);
+}
+return t.equals(target);
+}).findFirst().orElse(null);
+
+if (found != null) {
+return found;
+}
+
+if (create) {
+return resolveMandatoryEndpoint(uri, MockEndpoint.class);
+} else {
+throw new NoSuchEndpointException(String.format("MockEndpoint %s
does not exist.", uri));
+}
Review Comment:
Per my conversation with Claus, both classes are needed since `came-core`
cannot use `camel-test` due to circular dependencies, and `ContextTestSupport`
is not intended for use outside of `camel-core`'. As a result,
`CamelContextSupport` and `ContextTestSupport` will contain duplicated code.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
(camel-quarkus) 01/02: Upgrade Quarkus to 3.9.0.CR1
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 95d782784beee73f569f8f620585e96f8600946d
Author: James Netherton
AuthorDate: Wed Feb 28 08:13:46 2024 +
Upgrade Quarkus to 3.9.0.CR1
---
docs/antora.yml | 2 +-
extensions/google-bigquery/deployment/pom.xml | 4
extensions/google-bigquery/runtime/pom.xml| 4
extensions/google-pubsub/deployment/pom.xml | 4
extensions/google-pubsub/runtime/pom.xml | 4
extensions/grpc/deployment/pom.xml| 4
extensions/grpc/runtime/pom.xml | 8
extensions/js-dsl/runtime/pom.xml | 4
extensions/opentelemetry/deployment/pom.xml | 5 +
extensions/salesforce/deployment/pom.xml | 4
extensions/salesforce/runtime/pom.xml | 4
.../test/resources/container-license-acceptance.txt | 2 +-
pom.xml | 10 +-
poms/bom/pom.xml | 8 +++-
poms/bom/src/main/generated/flattened-full-pom.xml| 19 +++
poms/bom/src/main/generated/flattened-reduced-pom.xml | 12 +---
.../main/generated/flattened-reduced-verbose-pom.xml | 12 +---
.../apache/camel/quarkus/test/AfterEachCallback.java | 1 +
.../apache/camel/quarkus/test/BeforeEachCallback.java | 1 +
.../AdviceInDoBeforeEachMethodsTest.java | 6 +++---
20 files changed, 97 insertions(+), 21 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 3bb969c940..b70e7dca08 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -32,7 +32,7 @@ asciidoc:
camel-docs-version: 4.4.x
camel-quarkus-version: 3.9.0 # replace ${camel-quarkus.version}
quarkus-version: 3.8.2 # replace ${quarkus.version}
-graalvm-version: 23.0.1 # replace ${graalvm.version}
+graalvm-version: 23.1.2 # replace ${graalvm.version}
graalvm-docs-version: jdk21 # replace ${graalvm-docs.version}
mapstruct-version: 1.5.5.Final # replace ${mapstruct.version}
min-maven-version: 3.8.2 # replace ${min-maven-version}
diff --git a/extensions/google-bigquery/deployment/pom.xml
b/extensions/google-bigquery/deployment/pom.xml
index e4cb3b702f..193d2935dc 100644
--- a/extensions/google-bigquery/deployment/pom.xml
+++ b/extensions/google-bigquery/deployment/pom.xml
@@ -54,6 +54,10 @@
io.vertx
vertx-grpc-server
+
+org.checkerframework
+checker-qual
+
diff --git a/extensions/google-bigquery/runtime/pom.xml
b/extensions/google-bigquery/runtime/pom.xml
index 15a4b77477..9dfe0da15d 100644
--- a/extensions/google-bigquery/runtime/pom.xml
+++ b/extensions/google-bigquery/runtime/pom.xml
@@ -90,6 +90,10 @@
io.grpc
grpc-netty
+
+com.google.code.findbugs
+jsr305
+
com.google.android
annotations
diff --git a/extensions/google-pubsub/deployment/pom.xml
b/extensions/google-pubsub/deployment/pom.xml
index 31b8b31739..3820cbf30b 100644
--- a/extensions/google-pubsub/deployment/pom.xml
+++ b/extensions/google-pubsub/deployment/pom.xml
@@ -58,6 +58,10 @@
io.vertx
vertx-grpc-server
+
+org.checkerframework
+checker-qual
+
diff --git a/extensions/google-pubsub/runtime/pom.xml
b/extensions/google-pubsub/runtime/pom.xml
index 9161883ace..437a7ebb91 100644
--- a/extensions/google-pubsub/runtime/pom.xml
+++ b/extensions/google-pubsub/runtime/pom.xml
@@ -113,6 +113,10 @@
com.google.android
annotations
+
+com.google.code.findbugs
+jsr305
+
commons-logging
commons-logging
diff --git a/extensions/grpc/deployment/pom.xml
b/extensions/grpc/deployment/pom.xml
index db1b712e67..e606eeb03e 100644
--- a/extensions/grpc/deployment/pom.xml
+++ b/extensions/grpc/deployment/pom.xml
@@ -50,6 +50,10 @@
io.vertx
vertx-grpc-server
+
+org.checkerframework
+checker-qual
+
diff --git a/extensions/grpc/runtime/pom.xml b/extensions/grpc/runtime/pom.xml
index bc4e5e3974..b58d4f005d 100644
---
(camel-quarkus) branch quarkus-main updated (81223288a1 -> 80d8aa1370)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
discard 81223288a1 Disable Infinispan tests due to #5844
discard 7dbb9d484f Upgrade Quarkus to 3.9.0.CR1
add b2930ef0dc Bump io.quarkiverse.artemis:quarkus-artemis-bom from 3.2.0
to 3.2.1 (#5854)
add 3db087eed5 Regen SBOM from commit
b2930ef0dcb3aa8b9259d650cf6c8abb974b1ec3 (#5856)
add ce6eb50966 Fix typo in servlet name configuration code snippet
add bd592a114f Exclude CloudEvents transformer services unless
camel-quarkus-cloudevents is on the classpath
add ba5d6006e2 Move main-xml-io-with-beans tests into main-xml-io
new 95d782784b Upgrade Quarkus to 3.9.0.CR1
new 80d8aa1370 Disable Infinispan tests due to #5844
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (81223288a1)
\
N -- N -- N refs/heads/quarkus-main (80d8aa1370)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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:
camel-quarkus-sbom/camel-quarkus-sbom.json | 10556 +-
camel-quarkus-sbom/camel-quarkus-sbom.xml | 10588 +--
docs/antora.yml| 2 +-
.../ROOT/pages/reference/extensions/servlet.adoc | 2 +-
.../quarkus/core/deployment/CamelProcessor.java|14 +
.../camel/quarkus/core/CamelCapabilities.java | 1 +
extensions/aws2-s3/deployment/pom.xml | 4 -
extensions/aws2-s3/runtime/pom.xml | 4 -
extensions/aws2-sqs/deployment/pom.xml | 4 -
extensions/aws2-sqs/runtime/pom.xml| 4 -
extensions/azure-storage-blob/deployment/pom.xml | 4 -
extensions/azure-storage-blob/runtime/pom.xml | 4 -
extensions/azure-storage-queue/deployment/pom.xml | 4 -
extensions/azure-storage-queue/runtime/pom.xml | 4 -
extensions/cloudevents/runtime/pom.xml | 5 +
extensions/google-storage/deployment/pom.xml | 4 -
extensions/google-storage/runtime/pom.xml | 4 -
extensions/js-dsl/runtime/pom.xml | 4 +
extensions/servlet/runtime/src/main/doc/usage.adoc | 2 +-
integration-tests/main-xml-io-with-beans/pom.xml | 152 -
.../main/CoreMainXmlIoWithBeansResource.java |52 -
.../src/main/resources/application.properties |29 -
.../quarkus/main/CoreMainXmlIoWithBeansIT.java |23 -
.../quarkus/main/CoreMainXmlIoWithBeansTest.java |39 -
integration-tests/main-xml-io/pom.xml |17 +
.../java/org/apache/camel/quarkus/main/MyBean.java | 0
.../src/main/resources/application.properties | 2 +-
.../resources/routes/my-route-with-beanType.xml| 0
.../camel/quarkus/main/CoreMainXmlIoTest.java |10 +
integration-tests/pom.xml | 1 -
pom.xml| 4 +-
poms/bom/pom.xml | 8 +-
poms/bom/src/main/generated/flattened-full-pom.xml |17 +-
.../src/main/generated/flattened-reduced-pom.xml |10 +-
.../generated/flattened-reduced-verbose-pom.xml|10 +-
tooling/scripts/test-categories.yaml | 1 -
36 files changed, 10606 insertions(+), 10983 deletions(-)
delete mode 100644 integration-tests/main-xml-io-with-beans/pom.xml
delete mode 100644
integration-tests/main-xml-io-with-beans/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlIoWithBeansResource.java
delete mode 100644
integration-tests/main-xml-io-with-beans/src/main/resources/application.properties
delete mode 100644
integration-tests/main-xml-io-with-beans/src/test/java/org/apache/camel/quarkus/main/CoreMainXmlIoWithBeansIT.java
delete mode 100644
integration-tests/main-xml-io-with-beans/src/test/java/org/apache/camel/quarkus/main/CoreMainXmlIoWithBeansTest.java
rename integration-tests/{main-xml-io-with-beans =>
main-xml-io}/src/main/java/org/apache/camel/quarkus/main/MyBean.java (100%)
rename integration-tests/{main-xml-io-with-beans =>
main-xml-io}/src/main/resources/routes/my-route-with-beanType.xml (100%)
(camel-quarkus) 02/02: Disable Infinispan tests due to #5844
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 80d8aa1370583ba5d456c16077b921cde6b3b43d
Author: James Netherton
AuthorDate: Wed Mar 6 16:06:31 2024 +
Disable Infinispan tests due to #5844
---
integration-tests/infinispan-quarkus-client/pom.xml | 2 ++
integration-tests/infinispan/pom.xml | 2 ++
.../apache/camel/quarkus/component/infinispan/InfinispanIT.java | 2 ++
.../camel/quarkus/component/infinispan/InfinispanTest.java | 1 +
poms/bom/pom.xml | 9 +
poms/bom/src/main/generated/flattened-full-pom.xml | 8
poms/bom/src/main/generated/flattened-reduced-pom.xml| 8
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml| 8
8 files changed, 40 insertions(+)
diff --git a/integration-tests/infinispan-quarkus-client/pom.xml
b/integration-tests/infinispan-quarkus-client/pom.xml
index a87b90409d..d77f674203 100644
--- a/integration-tests/infinispan-quarkus-client/pom.xml
+++ b/integration-tests/infinispan-quarkus-client/pom.xml
@@ -70,6 +70,7 @@
+
virtualDependencies
diff --git a/integration-tests/infinispan/pom.xml
b/integration-tests/infinispan/pom.xml
index 90f2f30fc9..e5514af2dd 100644
--- a/integration-tests/infinispan/pom.xml
+++ b/integration-tests/infinispan/pom.xml
@@ -82,6 +82,7 @@
+
virtualDependencies
diff --git
a/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanIT.java
b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanIT.java
index 25a4208dc0..f63f2c078d 100644
---
a/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanIT.java
+++
b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanIT.java
@@ -17,7 +17,9 @@
package org.apache.camel.quarkus.component.infinispan;
import io.quarkus.test.junit.QuarkusIntegrationTest;
+import org.junit.jupiter.api.Disabled;
+@Disabled("https://github.com/apache/camel-quarkus/issues/5844;)
@QuarkusIntegrationTest
public class InfinispanIT extends InfinispanTest {
}
diff --git
a/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanTest.java
b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanTest.java
index 637fa714a2..b469e343c3 100644
---
a/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanTest.java
+++
b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanTest.java
@@ -26,6 +26,7 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.Matchers.is;
+@Disabled("https://github.com/apache/camel-quarkus/issues/5844;)
@QuarkusTest
@QuarkusTestResource(InfinispanServerTestResource.class)
public class InfinispanTest extends InfinispanCommonTest {
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index dfcdbb219c..b610de81dc 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -1426,6 +1426,15 @@
camel-infinispan
${camel.version}
+
+
+org.infinispan
+infinispan-commons-jakarta
+
+
+org.infinispan
+
infinispan-client-hotrod-jakarta
+
org.slf4j
jcl-over-slf4j
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index de6b4d29ae..6847d9d0fa 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -1364,6 +1364,14 @@
camel-infinispan
4.4.0
+
+org.infinispan
+infinispan-commons-jakarta
+
+
+org.infinispan
+infinispan-client-hotrod-jakarta
+
org.slf4j
jcl-over-slf4j
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 9267de8d8c..6715229fd3 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -1364,6 +1364,14 @@
camel-infinispan
4.4.0
+
+org.infinispan
+infinispan-commons-jakarta
+
+
+
Re: [PR] Camel 20341 [camel]
cziesman commented on code in PR #13447:
URL: https://github.com/apache/camel/pull/13447#discussion_r1521755250
##
core/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java:
##
@@ -338,53 +919,86 @@ protected void assertPredicate(String languageName,
String expressionText, Excha
Predicate predicate = language.createPredicate(expressionText);
assertNotNull(predicate, "No Predicate could be created for text: " +
expressionText + " language: " + language);
-assertPredicate(predicate, exchange, expected);
+TestSupport.assertPredicate(predicate, exchange, expected);
}
/**
* Asserts that the language name can be resolved
*/
protected Language assertResolveLanguage(String languageName) {
Language language = context.resolveLanguage(languageName);
-assertNotNull(language, "No language found for name: " + languageName);
+assertNotNull(language, "Nog language found for name: " +
languageName);
Review Comment:
Fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[PR] Add profile to debug camel-k-maven-plugin integration tests [camel-quarkus]
jamesnetherton opened a new pull request, #5864: URL: https://github.com/apache/camel-quarkus/pull/5864 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch main updated: Move main-xml-io-with-beans tests into main-xml-io
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new ba5d6006e2 Move main-xml-io-with-beans tests into main-xml-io
ba5d6006e2 is described below
commit ba5d6006e2470564374fbdbf9e1d3929b1fffc80
Author: James Netherton
AuthorDate: Tue Mar 12 10:49:09 2024 +
Move main-xml-io-with-beans tests into main-xml-io
---
integration-tests/main-xml-io-with-beans/pom.xml | 152 -
.../main/CoreMainXmlIoWithBeansResource.java | 52 ---
.../src/main/resources/application.properties | 29
.../quarkus/main/CoreMainXmlIoWithBeansIT.java | 23
.../quarkus/main/CoreMainXmlIoWithBeansTest.java | 39 --
integration-tests/main-xml-io/pom.xml | 17 +++
.../java/org/apache/camel/quarkus/main/MyBean.java | 0
.../src/main/resources/application.properties | 2 +-
.../resources/routes/my-route-with-beanType.xml| 0
.../camel/quarkus/main/CoreMainXmlIoTest.java | 10 ++
integration-tests/pom.xml | 1 -
tooling/scripts/test-categories.yaml | 1 -
12 files changed, 28 insertions(+), 298 deletions(-)
diff --git a/integration-tests/main-xml-io-with-beans/pom.xml
b/integration-tests/main-xml-io-with-beans/pom.xml
deleted file mode 100644
index 39e4d9004b..00
--- a/integration-tests/main-xml-io-with-beans/pom.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-4.0.0
-
-org.apache.camel.quarkus
-camel-quarkus-build-parent-it
-3.9.0-SNAPSHOT
-../../poms/build-parent-it/pom.xml
-
-
-
camel-quarkus-integration-test-main-xml-io-with-beans
-Camel Quarkus :: Integration Tests :: Main XML Io With Beans ::
Tests
-The camel integration tests
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-xml-io-dsl
-
-
-org.apache.camel.quarkus
-camel-quarkus-bean
-
-
-org.apache.camel.quarkus
-camel-quarkus-direct
-
-
-io.quarkus
-quarkus-resteasy
-
-
-
-
-io.quarkus
-quarkus-junit5
-test
-
-
-io.rest-assured
-rest-assured
-test
-
-
-org.assertj
-assertj-core
-test
-
-
-
-
-
-
-
-native
-
-
-native
-
-
-
-native
-
-
-
-
-org.apache.maven.plugins
-maven-failsafe-plugin
-
-
-
-integration-test
-verify
-
-
-
-
-
-
-
-
-virtualDependencies
-
-
-!noVirtualDependencies
-
-
-
-
-
-org.apache.camel.quarkus
-
camel-quarkus-xml-io-dsl-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-bean-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-direct-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
-
-
-
-
-
-
diff --git
a/integration-tests/main-xml-io-with-beans/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlIoWithBeansResource.java
Re: [PR] Move main-xml-io-with-beans tests into main-xml-io [camel-quarkus]
jamesnetherton merged PR #5863: URL: https://github.com/apache/camel-quarkus/pull/5863 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch main updated: Exclude CloudEvents transformer services unless camel-quarkus-cloudevents is on the classpath
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new bd592a114f Exclude CloudEvents transformer services unless
camel-quarkus-cloudevents is on the classpath
bd592a114f is described below
commit bd592a114f4e6d708cd6c914e102410b06386cb1
Author: James Netherton
AuthorDate: Tue Mar 12 09:47:52 2024 +
Exclude CloudEvents transformer services unless camel-quarkus-cloudevents
is on the classpath
Fixes #5853
---
.../camel/quarkus/core/deployment/CamelProcessor.java | 14 ++
.../org/apache/camel/quarkus/core/CamelCapabilities.java | 1 +
extensions/aws2-s3/deployment/pom.xml | 4
extensions/aws2-s3/runtime/pom.xml | 4
extensions/aws2-sqs/deployment/pom.xml | 4
extensions/aws2-sqs/runtime/pom.xml| 4
extensions/azure-storage-blob/deployment/pom.xml | 4
extensions/azure-storage-blob/runtime/pom.xml | 4
extensions/azure-storage-queue/deployment/pom.xml | 4
extensions/azure-storage-queue/runtime/pom.xml | 4
extensions/cloudevents/runtime/pom.xml | 5 +
extensions/google-storage/deployment/pom.xml | 4
extensions/google-storage/runtime/pom.xml | 4
13 files changed, 20 insertions(+), 40 deletions(-)
diff --git
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
index 97a0be5c89..cec76d1c94 100644
---
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
+++
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
@@ -84,6 +84,8 @@ import org.jboss.jandex.Type;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.quarkus.core.CamelCapabilities.CLOUD_EVENTS;
+
class CamelProcessor {
private static final Logger LOGGER =
LoggerFactory.getLogger(CamelProcessor.class);
@@ -206,6 +208,18 @@ class CamelProcessor {
list)));
}
+@BuildStep
+CamelServicePatternBuildItem
conditionalCloudEventsTransformerServiceExcludePattern(Capabilities
capabilities) {
+// Exclude cloudevents transformers unless optional
camel-quarkus-cloudevents is present
+if (capabilities.isMissing(CLOUD_EVENTS)) {
+return new CamelServicePatternBuildItem(
+CamelServiceDestination.DISCOVERY,
+false,
+
"META-INF/services/org/apache/camel/transformer/*cloudevents*");
+}
+return null;
+}
+
@BuildStep
void camelServices(
ApplicationArchivesBuildItem applicationArchives,
diff --git
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelCapabilities.java
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelCapabilities.java
index 8a873e865c..aeb6e7389e 100644
---
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelCapabilities.java
+++
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelCapabilities.java
@@ -18,6 +18,7 @@ package org.apache.camel.quarkus.core;
public final class CamelCapabilities {
public static final String BEAN = "org.apache.camel.bean";
+public static final String CLOUD_EVENTS = "org.apache.camel.cloudevents";
public static final String CORE = "org.apache.camel";
public static final String XML = "org.apache.camel.xml";
public static final String XML_IO_DSL = "org.apache.camel.xml.io.dsl";
diff --git a/extensions/aws2-s3/deployment/pom.xml
b/extensions/aws2-s3/deployment/pom.xml
index 8a48305194..d92ed4ec74 100644
--- a/extensions/aws2-s3/deployment/pom.xml
+++ b/extensions/aws2-s3/deployment/pom.xml
@@ -46,10 +46,6 @@
org.apache.camel.quarkus
camel-quarkus-support-aws2-deployment
-
-org.apache.camel.quarkus
-camel-quarkus-cloudevents-deployment
-
diff --git a/extensions/aws2-s3/runtime/pom.xml
b/extensions/aws2-s3/runtime/pom.xml
index 2c8281d94c..edb44fea4a 100644
--- a/extensions/aws2-s3/runtime/pom.xml
+++ b/extensions/aws2-s3/runtime/pom.xml
@@ -50,10 +50,6 @@
org.apache.camel.quarkus
camel-quarkus-support-aws2
-
-org.apache.camel.quarkus
-camel-quarkus-cloudevents
-
io.quarkus
quarkus-jaxp
diff --git
Re: [I] Only include CloudEvents transformer service pattern if camel-quarkus-cloudevents is on the classpath [camel-quarkus]
jamesnetherton closed issue #5853: Only include CloudEvents transformer service pattern if camel-quarkus-cloudevents is on the classpath URL: https://github.com/apache/camel-quarkus/issues/5853 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Exclude CloudEvents transformer services unless camel-quarkus-cloudevents is on the classpath [camel-quarkus]
jamesnetherton merged PR #5862: URL: https://github.com/apache/camel-quarkus/pull/5862 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch camel-main updated: Fix path to custom component JSON metadata
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-main by this push:
new 58991cded4 Fix path to custom component JSON metadata
58991cded4 is described below
commit 58991cded4287a7c7d4bc279d062f8ab138c064a
Author: James Netherton
AuthorDate: Tue Mar 12 15:52:13 2024 +
Fix path to custom component JSON metadata
---
.../java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java
index 4c9e91aed6..625eafdacc 100644
---
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java
+++
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java
@@ -95,7 +95,7 @@ public class PrepareCatalogQuarkusMojo extends
AbstractExtensionListMojo {
final String artifactIdBase = ext.getArtifactIdBase();
final Path schemaFile = ext
.getExtensionDir()
-
.resolve("component/src/generated/resources/org/apache/camel/component/"
+
.resolve("component/src/generated/resources/META-INF/org/apache/camel/component/"
+ artifactIdBase + "/" + artifactIdBase +
".json")
.toAbsolutePath().normalize();
if (Files.isRegularFile(schemaFile)) {
Re: [PR] CAMEL-20095 : add langchain component [camel]
aldettinger commented on code in PR #13341:
URL: https://github.com/apache/camel/pull/13341#discussion_r1521709269
##
components/camel-ai/camel-langchain-embeddings/src/main/java/org/apache/camel/component/langchain/embeddings/LangchainEmbeddingsConverter.java:
##
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.langchain.embeddings;
+
+import java.util.List;
+
+import dev.langchain4j.data.embedding.Embedding;
+import dev.langchain4j.data.segment.TextSegment;
+import org.apache.camel.Converter;
+
+/**
+ * Converter methods to convert from / to langchain4j embedding types.
+ */
+@Converter(generateLoader = true)
+public class LangchainEmbeddingsConverter {
+
Review Comment:
Really nice :+1:
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [I] Kubernetes Install Failing [camel-karavan]
skumaravelan commented on issue #1165: URL: https://github.com/apache/camel-karavan/issues/1165#issuecomment-1991954586 In addition , I need to update secret.yaml to have these key entries . Secret names with prefix "karavan" doesn't work. Please update and fix them as well. git-repository: git-username: git-password: git-branch: image-registry: image-group: image-registry-username: image-registry-password : -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20095 : add langchain component [camel]
aldettinger commented on code in PR #13341:
URL: https://github.com/apache/camel/pull/13341#discussion_r1521688224
##
components/camel-ai/camel-langchain-chat/src/test/java/org/apache/camel/component/chat/OllamaTestSupport.java:
##
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.chat;
+
+import dev.langchain4j.model.chat.ChatLanguageModel;
+import dev.langchain4j.model.ollama.OllamaChatModel;
+import org.apache.camel.test.infra.ollama.services.OllamaService;
+import org.apache.camel.test.infra.ollama.services.OllamaServiceFactory;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import static java.time.Duration.ofSeconds;
+
+public class OllamaTestSupport extends CamelTestSupport {
+
+protected ChatLanguageModel chatLanguageModel;
+
+@RegisterExtension
+static OllamaService OLLAMA = OllamaServiceFactory.createService();
+
+@Override
+protected void setupResources() throws Exception {
+super.setupResources();
+
+chatLanguageModel = createModel();
+}
+
+public ChatLanguageModel createModel() {
+return OllamaChatModel.builder()
+.baseUrl(OLLAMA.getBaseUrl())
+.modelName(OLLAMA.getModel())
+.temperature(0.5)
Review Comment:
Better use low temperature for deterministic tests ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
(camel-k) branch 4983 deleted (was 8896d4f18)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch 4983 in repository https://gitbox.apache.org/repos/asf/camel-k.git was 8896d4f18 Azure Key Vault Trait: Support Azure Identity as authentication method The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] Azure Key Vault Trait: Support Azure Identity as authentication method [camel-k]
oscerd merged PR #5244: URL: https://github.com/apache/camel-k/pull/5244 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) branch main updated: Azure Key Vault Trait: Support Azure Identity as authentication method (#5244)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 5999bc8d1 Azure Key Vault Trait: Support Azure Identity as
authentication method (#5244)
5999bc8d1 is described below
commit 5999bc8d17a384867b87967c9d4d36c58e54e3c7
Author: Andrea Cosentino
AuthorDate: Tue Mar 12 16:24:32 2024 +0100
Azure Key Vault Trait: Support Azure Identity as authentication method
(#5244)
Signed-off-by: Andrea Cosentino
---
addons/vault/azure/azure_key_vault.go | 9 -
addons/vault/azure/azure_key_vault_test.go | 49 ++
docs/modules/traits/pages/azure-key-vault.adoc | 6 +++-
3 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/addons/vault/azure/azure_key_vault.go
b/addons/vault/azure/azure_key_vault.go
index 6a639442b..a02fd2c17 100644
--- a/addons/vault/azure/azure_key_vault.go
+++ b/addons/vault/azure/azure_key_vault.go
@@ -42,7 +42,7 @@ import (
//
// To enable the automatic context reload on secrets updates you should define
// the following trait options:
-// -t azure-key-vault.enabled=true -t azure-key-vault.tenant-id="tenant-id" -t
azure-key-vault.client-id="client-id" -t
azure-key-vault.client-secret="client-secret" -t
azure-key-vault.vault-name="vault-name" -t
azure-key-vault.context-reload-enabled="true" -t
azure-key-vault.refresh-enabled="true" -t
azure-key-vault.refresh-period="3" -t azure-key-vault.secrets="test*" -t
azure-key-vault.eventhub-connection-string="connection-string" -t
azure-key-vault.blob-account-name="account-nam [...]
+// -t azure-key-vault.enabled=true -t azure-key-vault.tenant-id="tenant-id" -t
azure-key-vault.client-id="client-id" -t
azure-key-vault.client-secret="client-secret" -t
azure-key-vault.vault-name="vault-name" -t
azure-key-vault.context-reload-enabled="true" -t
azure-key-vault.refresh-enabled="true" -t
azure-key-vault.refresh-period="3" -t azure-key-vault.secrets="test*" -t
azure-key-vault.eventhub-connection-string="connection-string" -t
azure-key-vault.blob-account-name="account-nam [...]
//
// +camel-k:trait=azure-key-vault.
type Trait struct {
@@ -63,6 +63,8 @@ type Trait struct {
ContextReloadEnabled *bool `property:"context-reload-enabled"
json:"contextReloadEnabled,omitempty"`
// Define if we want to use the Refresh Feature for secrets
RefreshEnabled *bool `property:"refresh-enabled"
json:"refreshEnabled,omitempty"`
+ // Whether the Azure Identity Authentication should be used or not
+ AzureIdentityEnabled *bool `property:"azure-identity-enabled"
json:"azureIdentityEnabled,omitempty"`
// If Refresh is enabled, this defines the interval to check the
refresh event
RefreshPeriod string `property:"refresh-period"
json:"refreshPeriod,omitempty"`
// If Refresh is enabled, the regular expression representing the
secrets we want to track
@@ -107,6 +109,10 @@ func (t *azureKeyVaultTrait) Configure(environment
*trait.Environment) (bool, *t
t.RefreshEnabled = pointer.Bool(false)
}
+ if t.AzureIdentityEnabled == nil {
+ t.AzureIdentityEnabled = pointer.Bool(false)
+ }
+
return true, nil, nil
}
@@ -143,6 +149,7 @@ func (t *azureKeyVaultTrait) Apply(environment
*trait.Environment) error {
environment.ApplicationProperties["camel.vault.azure.clientId"]
= t.ClientID
environment.ApplicationProperties["camel.vault.azure.vaultName"] = t.VaultName
environment.ApplicationProperties["camel.vault.azure.refreshEnabled"] =
strconv.FormatBool(*t.RefreshEnabled)
+
environment.ApplicationProperties["camel.vault.azure.azureIdentityEnabled"] =
strconv.FormatBool(*t.AzureIdentityEnabled)
environment.ApplicationProperties["camel.main.context-reload-enabled"] =
strconv.FormatBool(*t.ContextReloadEnabled)
environment.ApplicationProperties["camel.vault.azure.refreshPeriod"] =
t.RefreshPeriod
if t.Secrets != "" {
diff --git a/addons/vault/azure/azure_key_vault_test.go
b/addons/vault/azure/azure_key_vault_test.go
index 202efe9be..cc9c61171 100644
--- a/addons/vault/azure/azure_key_vault_test.go
+++ b/addons/vault/azure/azure_key_vault_test.go
@@ -152,6 +152,55 @@ func TestAzureKeyVaultTraitApplyWithSecretAndRefresh(t
*testing.T) {
assert.True(t, true,
e.ApplicationProperties["camel.vault.azure.refreshEnabled"])
}
+func TestAzureKeyVaultTraitAzureIdentityEnabledApplyWithSecretAndRefresh(t
*testing.T) {
+ e := createEnvironment(t, camel.QuarkusCatalog, {
+ ObjectMeta: metav1.ObjectMeta{
+ Namespace: "test",
+ Name: "my-secret1",
+ },
+ Data: map[string][]byte{
+
Re: [PR] CAMEL-20095 : add langchain component [camel]
orpiske commented on code in PR #13341:
URL: https://github.com/apache/camel/pull/13341#discussion_r1521651406
##
components/camel-ai/camel-langchain-chat/src/main/java/docs/langchain-chat-component.adoc:
##
@@ -0,0 +1,146 @@
+= Langchain4j Chat Component
+:doctitle: Langchain4j Chat
+:shortname: langchain-chat
+:artifactid: camel-langchain-chat
+:description: Langchain4j Chat
+:since: 4.5
+:supportlevel: Preview
+:tabs-sync-option:
+:component-header: Only producer is supported
+//Manually maintained attributes
+:camel-spring-boot-name: langchain-chat
+
+*Since Camel {since}*
+
+*{component-header}*
+
+The Langchain Chat Component allows you to integrate with any LLM supported by
https://github.com/langchain4j/langchain4j[Langchain4j].
+
+Maven users will need to add the following dependency to their `pom.xml`
+for this component:
+
+[source,xml]
+
+
+org.apache.camel
+camel-langchain-chat
+x.x.x
+
+
+
+
+== URI format
+
+[source]
+
+langchain-chat:chatIdId[?options]
+
+
+Where *chatId* can be any string to uniquely identify the endpoint
+
+
+// component-configure options: START
+
+// component-configure options: END
+
+// component options: START
+include::partial$component-configure-options.adoc[]
+include::partial$component-endpoint-options.adoc[]
+// component options: END
+
+// endpoint options: START
+
+// endpoint options: END
+
+include::spring-boot:partial$starter.adoc[]
+
+== Using a specific Chat Model
+The Camel Langchain chat component provides an abstraction for interacting
with various types of Large Language Models supported by
https://github.com/langchain4j/langchain4j[Langchain4j].
+
+To integrate with a specific Large Language Model, users should follow these
steps:
+
+=== Example of Integrating with OpenAI
+Add the dependency for Langchain4j OpenAI support:
+
+[source,xml]
+
+
+ dev.langchain4j
+ langchain4j-open-ai
+x.x.x
+
+
+
+Init the OpenAI Chat Language Model, add add it to the Camel Registry:
+[source, java]
+
+ChatLanguageModel model = OpenAiChatModel.builder()
+.apiKey(openApiKey)
+.modelName(GPT_3_5_TURBO)
+.temperature(0.3)
+.timeout(ofSeconds(3000))
+.build();
+context.getRegistry().bind("chatModel", model);
+
+
+Use the model in the Camel Langchain Chat Producer
+[source, java]
+
+ from("direct:chat")
+ .to("langchain-chat:test?chatModel=#chatModel")
+
+
+
+_NOTE:_ To switch to another Large Language Model and its corresponding
dependency, simply replace the `langchain4j-open-ai` dependency with the
appropriate dependency for the desired model. Update the initialization
parameters accordingly in the code snippet provided above.
Review Comment:
Use this: ```NOTE: To switch to another Large Language Model and its
corresponding dependency...``` so it's properly rendered on the website as a
note paragraph. Alternatively:
```
NOTE
=
text goes here
=
```
##
components/camel-ai/camel-langchain-chat/src/main/java/docs/langchain-chat-component.adoc:
##
@@ -0,0 +1,146 @@
+= Langchain4j Chat Component
+:doctitle: Langchain4j Chat
+:shortname: langchain-chat
+:artifactid: camel-langchain-chat
+:description: Langchain4j Chat
+:since: 4.5
+:supportlevel: Preview
+:tabs-sync-option:
+:component-header: Only producer is supported
+//Manually maintained attributes
+:camel-spring-boot-name: langchain-chat
+
+*Since Camel {since}*
+
+*{component-header}*
+
+The Langchain Chat Component allows you to integrate with any LLM supported by
https://github.com/langchain4j/langchain4j[Langchain4j].
+
+Maven users will need to add the following dependency to their `pom.xml`
+for this component:
+
+[source,xml]
+
+
+org.apache.camel
+camel-langchain-chat
+x.x.x
+
+
+
+
+== URI format
+
+[source]
+
+langchain-chat:chatIdId[?options]
+
+
+Where *chatId* can be any string to uniquely identify the endpoint
+
+
+// component-configure options: START
+
+// component-configure options: END
+
+// component options: START
+include::partial$component-configure-options.adoc[]
+include::partial$component-endpoint-options.adoc[]
+// component options: END
+
+// endpoint options: START
+
+// endpoint options: END
+
+include::spring-boot:partial$starter.adoc[]
+
+== Using a specific Chat Model
+The Camel Langchain chat component provides an abstraction for interacting
with various types of Large Language Models supported by
https://github.com/langchain4j/langchain4j[Langchain4j].
+
+To integrate with a specific Large Language Model, users should follow these
steps:
+
+=== Example of Integrating with OpenAI
+Add the dependency for Langchain4j OpenAI support:
+
+[source,xml]
+
+
+ dev.langchain4j
+ langchain4j-open-ai
+x.x.x
+
+
+
+Init the OpenAI Chat Language Model, add add it to the Camel Registry:
+[source, java]
+
Re: [PR] CAMEL-20095 : add langchain component [camel]
aldettinger commented on code in PR #13341:
URL: https://github.com/apache/camel/pull/13341#discussion_r1521665062
##
components/camel-ai/camel-langchain-chat/src/main/java/org/apache/camel/component/chat/LangchainChatProducer.java:
##
@@ -0,0 +1,144 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.chat;
+
+import java.util.List;
+import java.util.Map;
+
+import dev.langchain4j.data.message.AiMessage;
+import dev.langchain4j.data.message.ChatMessage;
+import dev.langchain4j.model.chat.ChatLanguageModel;
+import dev.langchain4j.model.input.Prompt;
+import dev.langchain4j.model.input.PromptTemplate;
+import dev.langchain4j.model.output.Response;
+import org.apache.camel.Exchange;
+import org.apache.camel.InvalidPayloadException;
+import org.apache.camel.NoSuchHeaderException;
+import org.apache.camel.support.DefaultProducer;
+import org.apache.camel.util.ObjectHelper;
+
+public class LangchainChatProducer extends DefaultProducer {
+
+private final LangchainChatEndpoint endpoint;
+
+private ChatLanguageModel chatLanguageModel;
+
+public LangchainChatProducer(LangchainChatEndpoint endpoint) {
+super(endpoint);
+this.endpoint = endpoint;
+}
+
+@Override
+public void process(Exchange exchange) throws Exception {
+
+var operation = this.endpoint.getConfiguration().getChatOperation();
+
+if (LangchainChatOperations.CHAT_SINGLE_MESSAGE.equals(operation)) {
+processSingleMessage(exchange);
+} else if
(LangchainChatOperations.CHAT_SINGLE_MESSAGE_WITH_PROMPT.equals(operation)) {
+processSingleMessageWithPrompt(exchange);
+} else if
(LangchainChatOperations.CHAT_MULTIPLE_MESSAGES.equals(operation)) {
+processMultipleMessages(exchange);
+}
+}
+
+@SuppressWarnings("unchecked")
+private void processSingleMessageWithPrompt(Exchange exchange) throws
NoSuchHeaderException, InvalidPayloadException {
+final String promptTemplate =
exchange.getIn().getHeader(LangchainChat.Headers.PROMPT_TEMPLATE, String.class);
+if (promptTemplate == null) {
+throw new NoSuchHeaderException("The action is a required header",
exchange, LangchainChat.Headers.PROMPT_TEMPLATE);
Review Comment:
Isn't the required header promptTempleate instead of action ?
##
components/camel-ai/camel-langchain-chat/src/main/java/org/apache/camel/component/chat/LangchainChatProducer.java:
##
@@ -0,0 +1,144 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.chat;
+
+import java.util.List;
+import java.util.Map;
+
+import dev.langchain4j.data.message.AiMessage;
+import dev.langchain4j.data.message.ChatMessage;
+import dev.langchain4j.model.chat.ChatLanguageModel;
+import dev.langchain4j.model.input.Prompt;
+import dev.langchain4j.model.input.PromptTemplate;
+import dev.langchain4j.model.output.Response;
+import org.apache.camel.Exchange;
+import org.apache.camel.InvalidPayloadException;
+import org.apache.camel.NoSuchHeaderException;
+import org.apache.camel.support.DefaultProducer;
+import org.apache.camel.util.ObjectHelper;
+
+public class LangchainChatProducer extends DefaultProducer {
+
+private final LangchainChatEndpoint endpoint;
+
+private ChatLanguageModel chatLanguageModel;
+
+public LangchainChatProducer(LangchainChatEndpoint endpoint) {
+
(camel) branch regen_bot updated (026b5bc7ea0 -> 1522559ecd2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 026b5bc7ea0 Jbang profile (#13458) add 1522559ecd2 CAMEL-20554: camel-micrometer-prometheus - Should be GET verb No new revisions were added by this update. Summary of changes: .../camel/component/micrometer/prometheus/MicrometerPrometheus.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch regen_bot updated (cc8a3f85356 -> 026b5bc7ea0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from cc8a3f85356 CAMEL-20517 camel-jbang-plugin-k doesn't recognize command (#13397) add 026b5bc7ea0 Jbang profile (#13458) No new revisions were added by this update. Summary of changes: .../main/camel-main-configuration-metadata.json| 1 + .../MainConfigurationPropertiesConfigurer.java | 6 ++ .../camel-main-configuration-metadata.json | 1 + core/camel-main/src/main/docs/main.adoc| 3 +- .../org/apache/camel/main/BaseMainSupport.java | 3 + .../camel/main/MainConfigurationProperties.java| 34 +++ .../org/apache/camel/main/ProfileConfigurer.java | 66 ++ .../ROOT/pages/camel-4x-upgrade-guide-4_5.adoc | 8 +++ .../modules/ROOT/pages/camel-jbang.adoc| 41 -- .../dsl/jbang/core/commands/DependencyList.java| 4 +- .../camel/dsl/jbang/core/commands/Export.java | 3 +- .../dsl/jbang/core/commands/ExportBaseCommand.java | 9 --- .../dsl/jbang/core/commands/ExportCamelMain.java | 2 +- .../dsl/jbang/core/commands/ExportQuarkus.java | 2 +- .../dsl/jbang/core/commands/ExportSpringBoot.java | 2 +- .../apache/camel/dsl/jbang/core/commands/Run.java | 26 - .../dsl/jbang/core/commands/SBOMGenerator.java | 7 +-- .../java/org/apache/camel/main/KameletMain.java| 34 +-- 18 files changed, 167 insertions(+), 85 deletions(-) create mode 100644 core/camel-main/src/main/java/org/apache/camel/main/ProfileConfigurer.java
(camel) branch regen_bot updated (7fd42b6a3a9 -> cc8a3f85356)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 7fd42b6a3a9 chore: minor camel-catalog cleanup add cc8a3f85356 CAMEL-20517 camel-jbang-plugin-k doesn't recognize command (#13397) No new revisions were added by this update. Summary of changes: .../camel/dsl/jbang/core/common/PluginHelper.java | 127 +++-- 1 file changed, 43 insertions(+), 84 deletions(-)
(camel) branch main updated: CAMEL-20554: camel-micrometer-prometheus - Should be GET verb
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 1522559ecd2 CAMEL-20554: camel-micrometer-prometheus - Should be GET
verb
1522559ecd2 is described below
commit 1522559ecd2242fa0dc9551f058c825f5b1cbdb4
Author: Claus Ibsen
AuthorDate: Tue Mar 12 15:32:34 2024 +0100
CAMEL-20554: camel-micrometer-prometheus - Should be GET verb
---
.../camel/component/micrometer/prometheus/MicrometerPrometheus.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
b/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
index 7174f6c0831..f90f90fccec 100644
---
a/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
+++
b/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
@@ -410,7 +410,7 @@ public class MicrometerPrometheus extends ServiceSupport
implements CamelMetrics
// use blocking handler as the task can take longer time to complete
metrics.handler(new BlockingHandlerDecorator(handler, true));
-platformHttpComponent.addHttpEndpoint("/q/metrics", null,
+platformHttpComponent.addHttpEndpoint("/q/metrics", "GET",
null, format, null);
}
}
(camel) branch jbang-profile deleted (was 799c907942e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch jbang-profile in repository https://gitbox.apache.org/repos/asf/camel.git was 799c907942e CAMEL-17386: camel-main - Add profile option to choose dev/prod. Make camel-jbang use this new profile setting. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: Jbang profile (#13458)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 026b5bc7ea0 Jbang profile (#13458)
026b5bc7ea0 is described below
commit 026b5bc7ea0103fe99144e4cf2a7aefbb61af96b
Author: Claus Ibsen
AuthorDate: Tue Mar 12 15:28:56 2024 +0100
Jbang profile (#13458)
* CAMEL-17386: camel-main - Add profile option to choose dev/prod. Make
camel-jbang use this new profile setting.
* CAMEL-17386: camel-main - Add profile option to choose dev/prod. Make
camel-jbang use this new profile setting.
---
.../main/camel-main-configuration-metadata.json| 1 +
.../MainConfigurationPropertiesConfigurer.java | 6 ++
.../camel-main-configuration-metadata.json | 1 +
core/camel-main/src/main/docs/main.adoc| 3 +-
.../org/apache/camel/main/BaseMainSupport.java | 3 +
.../camel/main/MainConfigurationProperties.java| 34 +++
.../org/apache/camel/main/ProfileConfigurer.java | 66 ++
.../ROOT/pages/camel-4x-upgrade-guide-4_5.adoc | 8 +++
.../modules/ROOT/pages/camel-jbang.adoc| 41 --
.../dsl/jbang/core/commands/DependencyList.java| 4 +-
.../camel/dsl/jbang/core/commands/Export.java | 3 +-
.../dsl/jbang/core/commands/ExportBaseCommand.java | 9 ---
.../dsl/jbang/core/commands/ExportCamelMain.java | 2 +-
.../dsl/jbang/core/commands/ExportQuarkus.java | 2 +-
.../dsl/jbang/core/commands/ExportSpringBoot.java | 2 +-
.../apache/camel/dsl/jbang/core/commands/Run.java | 26 -
.../dsl/jbang/core/commands/SBOMGenerator.java | 7 +--
.../java/org/apache/camel/main/KameletMain.java| 34 +--
18 files changed, 167 insertions(+), 85 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
index 2d3a5c16711..942ec07472f 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
@@ -84,6 +84,7 @@
{ "name": "camel.main.modeline", "description": "Whether camel-k style
modeline is also enabled when not using camel-k. Enabling this allows to use a
camel-k like experience by being able to configure various settings using
modeline directly in your route source code.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.main.name", "description": "Sets the name of the
CamelContext.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.main.producerTemplateCacheSize", "description": "Producer
template endpoints cache size.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "integer",
"javaType": "int", "defaultValue": 1000 },
+{ "name": "camel.main.profile", "description": "Camel profile to use when
running. The dev profile is for development, which enables a set of additional
developer focus functionality, tracing, debugging, and gathering additional
runtime statistics that are useful during development. However, those
additional features has a slight overhead cost, and are not enabled for
production profile. The default profile is prod.", "sourceType":
"org.apache.camel.main.MainConfigurationProperties", [...]
{ "name": "camel.main.routeFilterExcludePattern", "description": "Used for
filtering routes routes matching the given pattern, which follows the following
rules: - Match by route id - Match by route input endpoint uri The matching is
using exact match, by wildcard and regular expression as documented by
PatternHelper#matchPattern(String,String) . For example to only include routes
which starts with foo in their route id's, use: include=foo And to exclude
routes which starts from [...]
{ "name": "camel.main.routeFilterIncludePattern", "description": "Used for
filtering routes matching the given pattern, which follows the following rules:
- Match by route id - Match by route input endpoint uri The matching is using
exact match, by wildcard and regular expression as documented by
PatternHelper#matchPattern(String,String) . For example to only include routes
which starts with foo in their route id's, use: include=foo And to exclude
routes which starts from JMS en [...]
{ "name": "camel.main.routesBuilderClasses", "description": "Sets classes
names that implement RoutesBuilder .", "sourceType":
Re: [PR] Jbang profile [camel]
davsclaus merged PR #13458: URL: https://github.com/apache/camel/pull/13458 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20517 camel-jbang-plugin-k doesn't recognize command [camel]
claudio4j merged PR #13397: URL: https://github.com/apache/camel/pull/13397 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main updated: CAMEL-20517 camel-jbang-plugin-k doesn't recognize command (#13397)
This is an automated email from the ASF dual-hosted git repository.
claudio4j pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new cc8a3f85356 CAMEL-20517 camel-jbang-plugin-k doesn't recognize command
(#13397)
cc8a3f85356 is described below
commit cc8a3f85356a535e2a5dc2c6c5326607c30aea24
Author: Claudio Miranda
AuthorDate: Tue Mar 12 11:26:17 2024 -0300
CAMEL-20517 camel-jbang-plugin-k doesn't recognize command (#13397)
---
.../camel/dsl/jbang/core/common/PluginHelper.java | 127 +++--
1 file changed, 43 insertions(+), 84 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginHelper.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginHelper.java
index 303cbce1574..0470aad1cc2 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginHelper.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginHelper.java
@@ -20,19 +20,22 @@ package org.apache.camel.dsl.jbang.core.common;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.StandardOpenOption;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Optional;
+import java.util.Properties;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.catalog.CamelCatalog;
-import org.apache.camel.catalog.DefaultCamelCatalog;
+import org.apache.camel.catalog.VersionHelper;
import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.impl.engine.DefaultFactoryFinder;
+import org.apache.camel.main.download.DependencyDownloader;
+import org.apache.camel.main.download.DependencyDownloaderClassLoader;
+import org.apache.camel.main.download.MavenDependencyDownloader;
import org.apache.camel.spi.FactoryFinder;
+import org.apache.camel.support.ObjectHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.json.JsonObject;
import org.apache.camel.util.json.Jsoner;
@@ -73,95 +76,51 @@ public final class PluginHelper {
String command = properties.getOrDefault("command",
name).toString();
Optional plugin =
FACTORY_FINDER.newInstance("camel-jbang-plugin-" + command, Plugin.class);
+if (plugin.isEmpty()) {
+plugin = downloadPlugin(command, main);
+}
if (plugin.isPresent()) {
plugin.get().customize(commandLine, main);
} else {
-String description =
properties.getOrDefault("description", "").toString();
-String dependency = properties.getOrDefault("dependency",
-
"org.apache.camel:camel-jbang-plugin-%s:${camel-version}".formatted(command)).toString();
-createSubCommand(commandLine, name, command, dependency,
description, main);
+main.getOut().println("camel-jbang-plugin-" + command + "
not found. Exit");
+main.quit(1);
}
}
}
}
-/**
- * Create sub-command as a placeholder for calling a plugin. When the
command gets executed the plugin is added to
- * the classpath and a new JBang process is spawned with the same
arguments. The factory finder mechanism will be
- * able to resolve the actual plugin from the classpath so the real plugin
command is run.
- *
- * @param commandLine to receive the new command
- * @param namethe plugin name
- * @param command the plugin command
- * @param dependency the Maven dependency for the plugin
- * @param description optional description of the plugin command
- * @param maincurrent Camel JBang main
- */
-private static void createSubCommand(
-CommandLine commandLine, String name, String command,
-String dependency, String description, CamelJBangMain main) {
-commandLine.addSubcommand(command,
CommandLine.Model.CommandSpec.wrapWithoutInspection(
-(Runnable) () -> {
-List args =
commandLine.getParseResult().originalArgs();
-if (args.contains("--help") || args.contains("--h")) {
-main.getOut().printf("Loading plugin %s for command
%s%n", name, command);
-}
-
-String gav = dependency;
-if (gav.endsWith(":${camel-version}")) {
-gav = gav.substring(0, gav.length() -
"${camel-version}".length()) + getCamelVersion(args);
-}
-
-//
Re: [PR] Azure Key Vault Trait: Support Azure Identity as authentication method [camel-k]
github-actions[bot] commented on PR #5244: URL: https://github.com/apache/camel-k/pull/5244#issuecomment-1991746458 :heavy_check_mark: Unit test coverage report - coverage increased from 37.1% to 37.2% (**+0.1%**) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) branch 4983 created (now 8896d4f18)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch 4983 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 8896d4f18 Azure Key Vault Trait: Support Azure Identity as authentication method This branch includes the following new commits: new 8896d4f18 Azure Key Vault Trait: Support Azure Identity as authentication method The 1 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.
(camel-k) 01/01: Azure Key Vault Trait: Support Azure Identity as authentication method
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch 4983
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 8896d4f18915cf0be591799d0c99a155d8d435c9
Author: Andrea Cosentino
AuthorDate: Tue Mar 12 15:04:03 2024 +0100
Azure Key Vault Trait: Support Azure Identity as authentication method
Signed-off-by: Andrea Cosentino
---
addons/vault/azure/azure_key_vault.go | 9 -
addons/vault/azure/azure_key_vault_test.go | 49 ++
docs/modules/traits/pages/azure-key-vault.adoc | 6 +++-
3 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/addons/vault/azure/azure_key_vault.go
b/addons/vault/azure/azure_key_vault.go
index 6a639442b..a02fd2c17 100644
--- a/addons/vault/azure/azure_key_vault.go
+++ b/addons/vault/azure/azure_key_vault.go
@@ -42,7 +42,7 @@ import (
//
// To enable the automatic context reload on secrets updates you should define
// the following trait options:
-// -t azure-key-vault.enabled=true -t azure-key-vault.tenant-id="tenant-id" -t
azure-key-vault.client-id="client-id" -t
azure-key-vault.client-secret="client-secret" -t
azure-key-vault.vault-name="vault-name" -t
azure-key-vault.context-reload-enabled="true" -t
azure-key-vault.refresh-enabled="true" -t
azure-key-vault.refresh-period="3" -t azure-key-vault.secrets="test*" -t
azure-key-vault.eventhub-connection-string="connection-string" -t
azure-key-vault.blob-account-name="account-nam [...]
+// -t azure-key-vault.enabled=true -t azure-key-vault.tenant-id="tenant-id" -t
azure-key-vault.client-id="client-id" -t
azure-key-vault.client-secret="client-secret" -t
azure-key-vault.vault-name="vault-name" -t
azure-key-vault.context-reload-enabled="true" -t
azure-key-vault.refresh-enabled="true" -t
azure-key-vault.refresh-period="3" -t azure-key-vault.secrets="test*" -t
azure-key-vault.eventhub-connection-string="connection-string" -t
azure-key-vault.blob-account-name="account-nam [...]
//
// +camel-k:trait=azure-key-vault.
type Trait struct {
@@ -63,6 +63,8 @@ type Trait struct {
ContextReloadEnabled *bool `property:"context-reload-enabled"
json:"contextReloadEnabled,omitempty"`
// Define if we want to use the Refresh Feature for secrets
RefreshEnabled *bool `property:"refresh-enabled"
json:"refreshEnabled,omitempty"`
+ // Whether the Azure Identity Authentication should be used or not
+ AzureIdentityEnabled *bool `property:"azure-identity-enabled"
json:"azureIdentityEnabled,omitempty"`
// If Refresh is enabled, this defines the interval to check the
refresh event
RefreshPeriod string `property:"refresh-period"
json:"refreshPeriod,omitempty"`
// If Refresh is enabled, the regular expression representing the
secrets we want to track
@@ -107,6 +109,10 @@ func (t *azureKeyVaultTrait) Configure(environment
*trait.Environment) (bool, *t
t.RefreshEnabled = pointer.Bool(false)
}
+ if t.AzureIdentityEnabled == nil {
+ t.AzureIdentityEnabled = pointer.Bool(false)
+ }
+
return true, nil, nil
}
@@ -143,6 +149,7 @@ func (t *azureKeyVaultTrait) Apply(environment
*trait.Environment) error {
environment.ApplicationProperties["camel.vault.azure.clientId"]
= t.ClientID
environment.ApplicationProperties["camel.vault.azure.vaultName"] = t.VaultName
environment.ApplicationProperties["camel.vault.azure.refreshEnabled"] =
strconv.FormatBool(*t.RefreshEnabled)
+
environment.ApplicationProperties["camel.vault.azure.azureIdentityEnabled"] =
strconv.FormatBool(*t.AzureIdentityEnabled)
environment.ApplicationProperties["camel.main.context-reload-enabled"] =
strconv.FormatBool(*t.ContextReloadEnabled)
environment.ApplicationProperties["camel.vault.azure.refreshPeriod"] =
t.RefreshPeriod
if t.Secrets != "" {
diff --git a/addons/vault/azure/azure_key_vault_test.go
b/addons/vault/azure/azure_key_vault_test.go
index 202efe9be..cc9c61171 100644
--- a/addons/vault/azure/azure_key_vault_test.go
+++ b/addons/vault/azure/azure_key_vault_test.go
@@ -152,6 +152,55 @@ func TestAzureKeyVaultTraitApplyWithSecretAndRefresh(t
*testing.T) {
assert.True(t, true,
e.ApplicationProperties["camel.vault.azure.refreshEnabled"])
}
+func TestAzureKeyVaultTraitAzureIdentityEnabledApplyWithSecretAndRefresh(t
*testing.T) {
+ e := createEnvironment(t, camel.QuarkusCatalog, {
+ ObjectMeta: metav1.ObjectMeta{
+ Namespace: "test",
+ Name: "my-secret1",
+ },
+ Data: map[string][]byte{
+ "azure-client-secret": []byte("my-secret-key"),
+ },
+ }, {
+ ObjectMeta: metav1.ObjectMeta{
+ Namespace: "test",
+
Re: [PR] Jbang profile [camel]
github-actions[bot] commented on PR #13458: URL: https://github.com/apache/camel/pull/13458#issuecomment-1991729685 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Jbang profile [camel]
davsclaus opened a new pull request, #13458: URL: https://github.com/apache/camel/pull/13458 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) 01/02: CAMEL-17386: camel-main - Add profile option to choose dev/prod. Make camel-jbang use this new profile setting.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch jbang-profile
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1766d9ed399aebfa53476eb11faf858a40206ec0
Author: Claus Ibsen
AuthorDate: Tue Mar 12 12:37:02 2024 +0100
CAMEL-17386: camel-main - Add profile option to choose dev/prod. Make
camel-jbang use this new profile setting.
---
.../main/camel-main-configuration-metadata.json| 1 +
.../MainConfigurationPropertiesConfigurer.java | 6 ++
.../camel-main-configuration-metadata.json | 1 +
core/camel-main/src/main/docs/main.adoc| 3 +-
.../org/apache/camel/main/BaseMainSupport.java | 3 +
.../camel/main/MainConfigurationProperties.java| 34 +++
.../org/apache/camel/main/ProfileConfigurer.java | 66 ++
.../ROOT/pages/camel-4x-upgrade-guide-4_5.adoc | 8 +++
.../dsl/jbang/core/commands/DependencyList.java| 4 +-
.../camel/dsl/jbang/core/commands/Export.java | 3 +-
.../dsl/jbang/core/commands/ExportBaseCommand.java | 9 ---
.../dsl/jbang/core/commands/ExportCamelMain.java | 2 +-
.../dsl/jbang/core/commands/ExportQuarkus.java | 2 +-
.../dsl/jbang/core/commands/ExportSpringBoot.java | 2 +-
.../apache/camel/dsl/jbang/core/commands/Run.java | 26 -
.../dsl/jbang/core/commands/SBOMGenerator.java | 7 +--
.../java/org/apache/camel/main/KameletMain.java| 34 +--
17 files changed, 156 insertions(+), 55 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
index 2d3a5c16711..942ec07472f 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
@@ -84,6 +84,7 @@
{ "name": "camel.main.modeline", "description": "Whether camel-k style
modeline is also enabled when not using camel-k. Enabling this allows to use a
camel-k like experience by being able to configure various settings using
modeline directly in your route source code.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.main.name", "description": "Sets the name of the
CamelContext.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.main.producerTemplateCacheSize", "description": "Producer
template endpoints cache size.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "integer",
"javaType": "int", "defaultValue": 1000 },
+{ "name": "camel.main.profile", "description": "Camel profile to use when
running. The dev profile is for development, which enables a set of additional
developer focus functionality, tracing, debugging, and gathering additional
runtime statistics that are useful during development. However, those
additional features has a slight overhead cost, and are not enabled for
production profile. The default profile is prod.", "sourceType":
"org.apache.camel.main.MainConfigurationProperties", [...]
{ "name": "camel.main.routeFilterExcludePattern", "description": "Used for
filtering routes routes matching the given pattern, which follows the following
rules: - Match by route id - Match by route input endpoint uri The matching is
using exact match, by wildcard and regular expression as documented by
PatternHelper#matchPattern(String,String) . For example to only include routes
which starts with foo in their route id's, use: include=foo And to exclude
routes which starts from [...]
{ "name": "camel.main.routeFilterIncludePattern", "description": "Used for
filtering routes matching the given pattern, which follows the following rules:
- Match by route id - Match by route input endpoint uri The matching is using
exact match, by wildcard and regular expression as documented by
PatternHelper#matchPattern(String,String) . For example to only include routes
which starts with foo in their route id's, use: include=foo And to exclude
routes which starts from JMS en [...]
{ "name": "camel.main.routesBuilderClasses", "description": "Sets classes
names that implement RoutesBuilder .", "sourceType":
"org.apache.camel.main.MainConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
diff --git
a/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
b/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
index c47d98469da..feaa3273ca3 100644
---
(camel) 02/02: CAMEL-17386: camel-main - Add profile option to choose dev/prod. Make camel-jbang use this new profile setting.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch jbang-profile in repository https://gitbox.apache.org/repos/asf/camel.git commit 799c907942e34988e2ed99bfc7c1216f8ae9235a Author: Claus Ibsen AuthorDate: Tue Mar 12 13:55:21 2024 +0100 CAMEL-17386: camel-main - Add profile option to choose dev/prod. Make camel-jbang use this new profile setting. --- .../modules/ROOT/pages/camel-jbang.adoc| 41 ++ 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc index d50e92f81a4..fb287b02931 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -528,44 +528,25 @@ curl -s -H "Accept: application/json" http://0.0.0.0:8080/q/dev/top/ | jq === Using profiles -Camel JBang have the concept of profiles. A _profile_ is essentially a name (id) that refers -to which configuration to automatic load with Camel JBang. The default profile is named `application` -which is a (smart default) to let Camel JBang automatic load `application.properties` (if present). +*Available from Camel 4.5* -This means that creating profiles matching to a properties file with the same name. +Camel JBang comes with three set of profiles -For example having a profile named `local`, means that Camel JBang will load `local.properties` instead -of `application.properties`. +- `dev` - for development (default) +- `test` - for testing (currently same as production) +- `prod` - for production -To use a profile, you specify as command line option `--profile` such as: +The developer profile will pre-configure Camel JBang with a number of developer assisted features when +running Camel. For example tracing messages during routing, additional metrics collected, and more. +This is useful during development and also enhanced the Camel JBang CLI tool. -[source,bash] - -camel run hello.java --profile=local - - -You can only specify one profile name, i.e. `--profile=local,two` is not valid. +However, you may want to run Camel JBang in a more production like situation, which you can do with: -In the `properties` files you can configure all -the configurations from xref:components:others:main.adoc[Camel Main]. - -For example to turn off xref:stream-caching.adoc[Stream Caching] and enable log masking you can specify: - -[source,properties] - -camel.main.streamCaching=false -camel.main.logMask=true - - -And you can also configure Camel components such as camel-kafka to declare the URL to the brokers: - -[source,properties] +[source,bash] -camel.component.kafka.brokers=broker1:9092,broker2:9092,broker3:9092 +camel run hello.java --profile=prod -NOTE: Keys starting with `camel.jbang` are reserved keys that are used by Camel JBang internally, -and as well allow for pre-configuring arguments for Camel JBang commands. === Downloading JARs over the internet
(camel) branch jbang-profile created (now 799c907942e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch jbang-profile in repository https://gitbox.apache.org/repos/asf/camel.git at 799c907942e CAMEL-17386: camel-main - Add profile option to choose dev/prod. Make camel-jbang use this new profile setting. This branch includes the following new commits: new 1766d9ed399 CAMEL-17386: camel-main - Add profile option to choose dev/prod. Make camel-jbang use this new profile setting. new 799c907942e CAMEL-17386: camel-main - Add profile option to choose dev/prod. Make camel-jbang use this new profile setting. 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.
(camel-website-pub) branch asf-site updated (360794123 -> bf348c0a1)
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website-pub.git discard 360794123 Website updated to d022b3c9c00840ef925d6b60b9c3d526df44c777 discard c7ff57e7d Website updated to 325e929157412b27394080f4d4dba3d821476ddf new 9f580dbd4 Website updated to 325e929157412b27394080f4d4dba3d821476ddf new bf348c0a1 Website updated to ca4ca152544e8315ea8294df16d4dd73b3e7cfb0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (360794123) \ N -- N -- N refs/heads/asf-site (bf348c0a1) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. 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: .htaccess | 144 +- .well-known/security.txt |2 +- camel-k/next/apis/camel-k.html |2 +- camel-k/next/architecture/traits.html | 11 +- camel-k/next/traits/deployment.html|2 +- ...kafka-apicurio-registry-not-secured-source.html |2 +- .../4.4.x/kafka-azure-schema-registry-source.html |2 +- camel-kamelets/4.4.x/kafka-not-secured-source.html |2 +- camel-kamelets/4.4.x/kafka-scram-source.html |2 +- camel-kamelets/4.4.x/kafka-source.html |2 +- camel-kamelets/4.4.x/kafka-ssl-source.html |2 +- ...kafka-apicurio-registry-not-secured-source.html |2 +- .../next/kafka-azure-schema-registry-source.html |2 +- ...batch-apicurio-registry-not-secured-source.html |2 +- .../next/kafka-batch-apicurio-registry-source.html |2 +- .../kafka-batch-azure-schema-registry-source.html |2 +- .../next/kafka-batch-not-secured-source.html |2 +- camel-kamelets/next/kafka-batch-scram-source.html |2 +- camel-kamelets/next/kafka-batch-source.html|2 +- camel-kamelets/next/kafka-batch-ssl-source.html|2 +- ...kafka-not-secured-apicurio-registry-source.html |2 +- camel-kamelets/next/kafka-not-secured-source.html |2 +- camel-kamelets/next/kafka-scram-source.html|2 +- camel-kamelets/next/kafka-source.html |2 +- camel-kamelets/next/kafka-ssl-source.html |2 +- .../3.8.x/reference/extensions/servlet.html|2 +- .../next/reference/extensions/servlet.html |2 +- components/4.0.x/eips/message-broker.html |2 +- components/4.4.x/eips/message-broker.html |2 +- components/next/activemq-component.html|4 +- components/next/amqp-component.html|4 +- components/next/aws-bedrock-agent-component.html |4 +- .../next/aws-bedrock-agent-runtime-component.html |2 +- components/next/aws-bedrock-component.html |2 +- components/next/eips/message-broker.html |2 +- components/next/jms-component.html |4 +- components/next/spring-rabbitmq-component.html |4 +- download/index.html|2 +- manual/camel-3x-upgrade-guide-3_19.html|2 +- manual/camel-4x-upgrade-guide-4_5.html |2 +- releases/k-1.11.0/index.html |4 +- releases/release-4.4.0/index.html |2 +- site-manifest.json |2 +- sitemap-camel-core.xml | 14 +- sitemap-camel-k.xml| 598 +- sitemap-camel-kafka-connector.xml | 824 +-- sitemap-camel-kamelets.xml | 1400 ++--- sitemap-camel-karaf.xml| 38 +- sitemap-camel-quarkus.xml | 2008 +++ sitemap-camel-spring-boot.xml | 56 +- sitemap-components.xml | 5764 ++-- sitemap-manual.xml | 422 +- 52 files changed, 5691 insertions(+), 5682 deletions(-)
Error while running github feature from .asf.yaml in camel-website-pub!
An error occurred while running github feature in .asf.yaml!:
422 {"message": "Validation Failed", "errors": [{"message": "Sorry, you need to
allow at least one merge strategy. (no_merge_method)", "resource":
"Repository", "field": "merge_commit_allowed", "code": "invalid"}],
"documentation_url":
"https://docs.github.com/rest/repos/repos#update-a-repository"}
Re: [I] Integration builds fail with arm64 base image [camel-k]
gansheer commented on issue #5238: URL: https://github.com/apache/camel-k/issues/5238#issuecomment-1991655127 That only happens in ARM I think. For some reason it looks by default for amd64 image and can't find it, but when you give the digest it pull the image you configured. I wonder if we have the same issue with spectrum. Maybe this https://github.com/apache/camel-k/pull/5200 will fix this. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Move main-xml-io-with-beans tests into main-xml-io [camel-quarkus]
jamesnetherton opened a new pull request, #5863: URL: https://github.com/apache/camel-quarkus/pull/5863 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-kamelets) branch 1943 deleted (was c2ef7eb6)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch 1943 in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git was c2ef7eb6 Spring RabbitMQ Sink Kamelet: Support autoDeclareProducer as parameter The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-kamelets) branch regen_bot updated (84694011 -> 4442fac2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git from 84694011 Support topicIsPattern as Kafka Source Kamelets parameter - Kafka Apicurio not secured add 4442fac2 Spring RabbitMQ Sink Kamelet: Support autoDeclareProducer as parameter (#1944) No new revisions were added by this update. Summary of changes: kamelets/spring-rabbitmq-sink.kamelet.yaml | 6 ++ .../src/main/resources/kamelets/spring-rabbitmq-sink.kamelet.yaml | 6 ++ 2 files changed, 12 insertions(+)
(camel-kamelets) branch main updated: Spring RabbitMQ Sink Kamelet: Support autoDeclareProducer as parameter (#1944)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
The following commit(s) were added to refs/heads/main by this push:
new 4442fac2 Spring RabbitMQ Sink Kamelet: Support autoDeclareProducer as
parameter (#1944)
4442fac2 is described below
commit 4442fac230dedcb1695f04bf733a4b2a8fa0e492
Author: Andrea Cosentino
AuthorDate: Tue Mar 12 14:14:13 2024 +0100
Spring RabbitMQ Sink Kamelet: Support autoDeclareProducer as parameter
(#1944)
Signed-off-by: Andrea Cosentino
---
kamelets/spring-rabbitmq-sink.kamelet.yaml | 6 ++
.../src/main/resources/kamelets/spring-rabbitmq-sink.kamelet.yaml | 6 ++
2 files changed, 12 insertions(+)
diff --git a/kamelets/spring-rabbitmq-sink.kamelet.yaml
b/kamelets/spring-rabbitmq-sink.kamelet.yaml
index 0494c6cd..7f0da3b5 100644
--- a/kamelets/spring-rabbitmq-sink.kamelet.yaml
+++ b/kamelets/spring-rabbitmq-sink.kamelet.yaml
@@ -74,6 +74,11 @@ spec:
title: Queue name
description: The queue to receive messages from
type: string
+ autoDeclareProducer:
+title: Auto Declare Producer
+description: Specifies whether the producer should auto declare
binding between exchange, queue and routing key when starting
+type: boolean
+default: false
dependencies:
- "camel:spring-rabbitmq"
- "camel:kamelet"
@@ -95,3 +100,4 @@ spec:
connectionFactory: "#bean:{{connectionFactory}}"
routingKey: "{{?routingKey}}"
queues: "{{?queues}}"
+autoDeclareProducer: "{{autoDeclareProducer}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/spring-rabbitmq-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/spring-rabbitmq-sink.kamelet.yaml
index 0494c6cd..7f0da3b5 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/spring-rabbitmq-sink.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/spring-rabbitmq-sink.kamelet.yaml
@@ -74,6 +74,11 @@ spec:
title: Queue name
description: The queue to receive messages from
type: string
+ autoDeclareProducer:
+title: Auto Declare Producer
+description: Specifies whether the producer should auto declare
binding between exchange, queue and routing key when starting
+type: boolean
+default: false
dependencies:
- "camel:spring-rabbitmq"
- "camel:kamelet"
@@ -95,3 +100,4 @@ spec:
connectionFactory: "#bean:{{connectionFactory}}"
routingKey: "{{?routingKey}}"
queues: "{{?queues}}"
+autoDeclareProducer: "{{autoDeclareProducer}}"
Re: [I] Spring RabbitMQ Sink Kamelet: Support autoDeclareProducer as parameter [camel-kamelets]
oscerd closed issue #1943: Spring RabbitMQ Sink Kamelet: Support autoDeclareProducer as parameter URL: https://github.com/apache/camel-kamelets/issues/1943 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Spring RabbitMQ Sink Kamelet: Support autoDeclareProducer as parameter [camel-kamelets]
oscerd merged PR #1944: URL: https://github.com/apache/camel-kamelets/pull/1944 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch regen_bot updated (8289f9156f0 -> 7fd42b6a3a9)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 8289f9156f0 fix(docs): Adds camel-http entry for changed redirect behaviour to 3.19 upgrade docs (#13457) add 7fd42b6a3a9 chore: minor camel-catalog cleanup No new revisions were added by this update. Summary of changes: .../apache/camel/catalog/DefaultCamelCatalog.java | 61 ++--- .../camel/catalog/DefaultRuntimeProvider.java | 76 +++--- 2 files changed, 49 insertions(+), 88 deletions(-)
[PR] Spring RabbitMQ Sink Kamelet: Support autoDeclareProducer as parameter [camel-kamelets]
oscerd opened a new pull request, #1944: URL: https://github.com/apache/camel-kamelets/pull/1944 Fixes #1943 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-kamelets) branch 1943 created (now c2ef7eb6)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch 1943 in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git at c2ef7eb6 Spring RabbitMQ Sink Kamelet: Support autoDeclareProducer as parameter This branch includes the following new commits: new c2ef7eb6 Spring RabbitMQ Sink Kamelet: Support autoDeclareProducer as parameter The 1 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.
(camel-kamelets) 01/01: Spring RabbitMQ Sink Kamelet: Support autoDeclareProducer as parameter
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch 1943
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit c2ef7eb6b4ceada6d5e09c3b0fc47d52823e4155
Author: Andrea Cosentino
AuthorDate: Tue Mar 12 14:04:33 2024 +0100
Spring RabbitMQ Sink Kamelet: Support autoDeclareProducer as parameter
Signed-off-by: Andrea Cosentino
---
kamelets/spring-rabbitmq-sink.kamelet.yaml | 6 ++
.../src/main/resources/kamelets/spring-rabbitmq-sink.kamelet.yaml | 6 ++
2 files changed, 12 insertions(+)
diff --git a/kamelets/spring-rabbitmq-sink.kamelet.yaml
b/kamelets/spring-rabbitmq-sink.kamelet.yaml
index 0494c6cd..7f0da3b5 100644
--- a/kamelets/spring-rabbitmq-sink.kamelet.yaml
+++ b/kamelets/spring-rabbitmq-sink.kamelet.yaml
@@ -74,6 +74,11 @@ spec:
title: Queue name
description: The queue to receive messages from
type: string
+ autoDeclareProducer:
+title: Auto Declare Producer
+description: Specifies whether the producer should auto declare
binding between exchange, queue and routing key when starting
+type: boolean
+default: false
dependencies:
- "camel:spring-rabbitmq"
- "camel:kamelet"
@@ -95,3 +100,4 @@ spec:
connectionFactory: "#bean:{{connectionFactory}}"
routingKey: "{{?routingKey}}"
queues: "{{?queues}}"
+autoDeclareProducer: "{{autoDeclareProducer}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/spring-rabbitmq-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/spring-rabbitmq-sink.kamelet.yaml
index 0494c6cd..7f0da3b5 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/spring-rabbitmq-sink.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/spring-rabbitmq-sink.kamelet.yaml
@@ -74,6 +74,11 @@ spec:
title: Queue name
description: The queue to receive messages from
type: string
+ autoDeclareProducer:
+title: Auto Declare Producer
+description: Specifies whether the producer should auto declare
binding between exchange, queue and routing key when starting
+type: boolean
+default: false
dependencies:
- "camel:spring-rabbitmq"
- "camel:kamelet"
@@ -95,3 +100,4 @@ spec:
connectionFactory: "#bean:{{connectionFactory}}"
routingKey: "{{?routingKey}}"
queues: "{{?queues}}"
+autoDeclareProducer: "{{autoDeclareProducer}}"
(camel) branch regen_bot updated (16a770c53fe -> 8289f9156f0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 16a770c53fe CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side (#13455) add 8289f9156f0 fix(docs): Adds camel-http entry for changed redirect behaviour to 3.19 upgrade docs (#13457) No new revisions were added by this update. Summary of changes: docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc | 5 + 1 file changed, 5 insertions(+)
(camel) branch main updated: chore: minor camel-catalog cleanup
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 7fd42b6a3a9 chore: minor camel-catalog cleanup
7fd42b6a3a9 is described below
commit 7fd42b6a3a9aef3eea8e6a14606662b86b220be2
Author: Luca Burgazzoli
AuthorDate: Tue Mar 12 10:05:22 2024 +0100
chore: minor camel-catalog cleanup
---
.../apache/camel/catalog/DefaultCamelCatalog.java | 61 ++---
.../camel/catalog/DefaultRuntimeProvider.java | 76 +++---
2 files changed, 49 insertions(+), 88 deletions(-)
diff --git
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index adc5e84aa8e..aca19fb66e7 100644
---
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -59,17 +59,35 @@ public class DefaultCamelCatalog extends
AbstractCamelCatalog implements CamelCa
private static final String SCHEMAS_XML =
"org/apache/camel/catalog/schemas";
private static final String MAIN_DIR = "org/apache/camel/catalog/main";
private static final String BASE_RESOURCE_DIR = "org/apache/camel/catalog";
+
public static final String FIND_COMPONENT_NAMES = "findComponentNames";
+public static final String FIND_COMPONENT_LABELS = "findComponentLabels";
public static final String LIST_COMPONENTS_AS_JSON =
"listComponentsAsJson";
+
public static final String FIND_DATA_FORMAT_NAMES = "findDataFormatNames";
+public static final String FIND_DATA_FORMAT_LABELS =
"findDataFormatLabels";
public static final String LIST_DATA_FORMATS_AS_JSON =
"listDataFormatsAsJson";
+
public static final String FIND_LANGUAGE_NAMES = "findLanguageNames";
-public static final String FIND_TRANSFORMER_NAMES = "findTransformerNames";
-public static final String FIND_CONSOLE_NAMES = "findConsoleNames";
+public static final String FIND_LANGUAGE_LABELS = "findLanguageLabels";
public static final String LIST_LANGUAGES_AS_JSON = "listLanguagesAsJson";
+
+public static final String FIND_TRANSFORMER_NAMES = "findTransformerNames";
public static final String LIST_TRANSFORMERS_AS_JSON =
"listTransformersAsJson";
+
+public static final String FIND_CONSOLE_NAMES = "findConsoleNames";
public static final String LIST_CONSOLES_AS_JSON = "listConsolesAsJson";
+public static final String FIND_MODEL_NAMES = "findModelNames";
+public static final String FIND_MODEL_LABELS = "findModelLabels";
+public static final String LIST_MODELS_AS_JSON = "listModelsAsJson";
+
+public static final String FIND_OTHER_NAMES = "findOtherNames";
+public static final String FIND_OTHER_LABELS = "findOtherLabels";
+public static final String LIST_OTHERS_AS_JSON = "listOthersAsJson";
+
+public static final String SUMMARY_AS_JSON = "summaryAsJson";
+
private final VersionHelper version = new VersionHelper();
// 3rd party components/data-formats
@@ -113,13 +131,9 @@ public class DefaultCamelCatalog extends
AbstractCamelCatalog implements CamelCa
this.runtimeProvider = runtimeProvider;
// inject CamelCatalog to the provider
this.runtimeProvider.setCamelCatalog(this);
+
// invalidate the cache
-cache.remove(FIND_COMPONENT_NAMES);
-cache.remove(LIST_COMPONENTS_AS_JSON);
-cache.remove(FIND_DATA_FORMAT_NAMES);
-cache.remove(LIST_DATA_FORMATS_AS_JSON);
-cache.remove(FIND_LANGUAGE_NAMES);
-cache.remove(LIST_LANGUAGES_AS_JSON);
+cache.clear();
}
@Override
@@ -147,8 +161,10 @@ public class DefaultCamelCatalog extends
AbstractCamelCatalog implements CamelCa
extraComponents.put(name, className);
// invalidate the cache
cache.remove(FIND_COMPONENT_NAMES);
-cache.remove("findComponentLabels");
+cache.remove(FIND_COMPONENT_LABELS);
cache.remove(LIST_COMPONENTS_AS_JSON);
+
+cache.remove(SUMMARY_AS_JSON);
}
@Override
@@ -164,8 +180,10 @@ public class DefaultCamelCatalog extends
AbstractCamelCatalog implements CamelCa
extraDataFormats.put(name, className);
// invalidate the cache
cache.remove(FIND_DATA_FORMAT_NAMES);
-cache.remove("findDataFormatLabels");
+cache.remove(FIND_DATA_FORMAT_LABELS);
cache.remove(LIST_DATA_FORMATS_AS_JSON);
+
+cache.remove(SUMMARY_AS_JSON);
}
@Override
@@ -241,7 +259,7 @@ public class DefaultCamelCatalog extends
AbstractCamelCatalog implements CamelCa
@Override
public List findModelNames() {
-return cache("findModelNames", () -> {
+return
Re: [PR] [Experiment] Use Jbang camel k plugin in e2e test [camel-k]
claudio4j commented on PR #5175: URL: https://github.com/apache/camel-k/pull/5175#issuecomment-1991602878 The change to use camel k plugin looks good. One suggestion, to show some camel-jbang version when dumping e2e error, it would be good to know the jbang and camel version in the dump output. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] chore: minor camel-catalog cleanup [camel]
lburgazzoli merged PR #13456: URL: https://github.com/apache/camel/pull/13456 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] fix(docs): Adds camel-http entry for changed redirect behaviour to 3.19 upgrade guide [camel]
davsclaus merged PR #13457: URL: https://github.com/apache/camel/pull/13457 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main updated: fix(docs): Adds camel-http entry for changed redirect behaviour to 3.19 upgrade docs (#13457)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 8289f9156f0 fix(docs): Adds camel-http entry for changed redirect behaviour to 3.19 upgrade docs (#13457) 8289f9156f0 is described below commit 8289f9156f0a333f6274c0f5dce8a7001d3196c4 Author: Ruben Lassau-Strauven AuthorDate: Tue Mar 12 13:56:38 2024 +0100 fix(docs): Adds camel-http entry for changed redirect behaviour to 3.19 upgrade docs (#13457) Co-authored-by: ruben.lassaustrauven --- docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc | 5 + 1 file changed, 5 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc index abac849fa4c..baa9730cbb5 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc @@ -111,6 +111,11 @@ a stax parser was needed anyway to use the language. Upgraded from Karaf 4.3.x to Karaf 4.4.x, which requires JDK11+. +=== camel-http + +Added `followRedirects` option with default value `false` on component and endpoint level. +The introduction of this option changes the default redirect behaviour for producers from following all `GET` and `HEAD` redirects, to not following any redirects. + === Deprecated Components The following components that had been marked as deprecated, were removed in this release:
(camel-quarkus) branch camel-main updated: Formating fix
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-main by this push:
new 991bd350ce Formating fix
991bd350ce is described below
commit 991bd350ce6de3a24f722dfbee917796d1089d45
Author: JiriOndrusek
AuthorDate: Tue Mar 12 13:47:01 2024 +0100
Formating fix
---
.../org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
b/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
index 66320eb929..55cda48300 100644
---
a/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
+++
b/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
@@ -41,6 +41,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@QuarkusTest
class MicrometerTest extends AbstractMicrometerTest {
private static final Logger LOG = Logger.getLogger(MicrometerTest.class);
+
@Test
public void testMicrometerMetricsCounter() throws Exception {
RestAssured.get("/micrometer/counter/0")
Re: [PR] chore: minor camel-catalog cleanup [camel]
lburgazzoli commented on code in PR #13456:
URL: https://github.com/apache/camel/pull/13456#discussion_r1521385235
##
catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java:
##
@@ -113,13 +131,32 @@ public void setRuntimeProvider(RuntimeProvider
runtimeProvider) {
this.runtimeProvider = runtimeProvider;
// inject CamelCatalog to the provider
this.runtimeProvider.setCamelCatalog(this);
+
// invalidate the cache
cache.remove(FIND_COMPONENT_NAMES);
+cache.remove(FIND_COMPONENT_LABELS);
cache.remove(LIST_COMPONENTS_AS_JSON);
+
cache.remove(FIND_DATA_FORMAT_NAMES);
+cache.remove(FIND_DATA_FORMAT_LABELS);
cache.remove(LIST_DATA_FORMATS_AS_JSON);
+
cache.remove(FIND_LANGUAGE_NAMES);
+cache.remove(FIND_LANGUAGE_LABELS);
cache.remove(LIST_LANGUAGES_AS_JSON);
+
+cache.remove(FIND_OTHER_NAMES);
+cache.remove(FIND_OTHER_LABELS);
+cache.remove(LIST_OTHERS_AS_JSON);
+
+cache.remove(FIND_MODEL_NAMES);
+cache.remove(FIND_MODEL_LABELS);
+cache.remove(LIST_MODELS_AS_JSON);
+
+cache.remove(FIND_TRANSFORMER_NAMES);
+cache.remove(LIST_TRANSFORMERS_AS_JSON);
+
+cache.remove(SUMMARY_AS_JSON);
Review Comment:
done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] CAMEL-20095 : add langchain component [camel]
zbendhiba commented on code in PR #13341:
URL: https://github.com/apache/camel/pull/13341#discussion_r1521383459
##
test-infra/camel-test-infra-ollama/src/test/java/org/apache/camel/test/infra/ollama/services/OllamaContainer.java:
##
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.test.infra.ollama.services;
+
+import java.io.IOException;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+public class OllamaContainer extends GenericContainer {
+
+private static final Logger LOGGER =
LoggerFactory.getLogger(OllamaContainer.class);
+
+private final DockerImageName dockerImageName;
+
+private final Integer port;
+private final String model;
+private final String imageName;
+
+public OllamaContainer(DockerImageName image, Integer port, String model,
String imageName) {
+super(image);
+
+this.dockerImageName = image;
+this.port = port;
+this.model = model;
+this.imageName = imageName;
+withExposedPorts(port);
+withImagePullPolicy(dockerImageName ->
!dockerImageName.getVersionPart().endsWith(model));
+setWaitStrategy(Wait.forListeningPort());
+withLogConsumer(new Slf4jLogConsumer(LOGGER));
+}
+
+@Override
+protected void containerIsStarted(InspectContainerResponse containerInfo) {
+if (!this.dockerImageName.equals(DockerImageName.parse(imageName))) {
+try {
+LOGGER.info("Start pulling the '{}' model ... would take
several minutes ...", model);
Review Comment:
thanks I pushed a disabled test version
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] chore: minor camel-catalog cleanup [camel]
davsclaus commented on code in PR #13456:
URL: https://github.com/apache/camel/pull/13456#discussion_r1521382354
##
catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java:
##
@@ -113,13 +131,32 @@ public void setRuntimeProvider(RuntimeProvider
runtimeProvider) {
this.runtimeProvider = runtimeProvider;
// inject CamelCatalog to the provider
this.runtimeProvider.setCamelCatalog(this);
+
// invalidate the cache
cache.remove(FIND_COMPONENT_NAMES);
+cache.remove(FIND_COMPONENT_LABELS);
cache.remove(LIST_COMPONENTS_AS_JSON);
+
cache.remove(FIND_DATA_FORMAT_NAMES);
+cache.remove(FIND_DATA_FORMAT_LABELS);
cache.remove(LIST_DATA_FORMATS_AS_JSON);
+
cache.remove(FIND_LANGUAGE_NAMES);
+cache.remove(FIND_LANGUAGE_LABELS);
cache.remove(LIST_LANGUAGES_AS_JSON);
+
+cache.remove(FIND_OTHER_NAMES);
+cache.remove(FIND_OTHER_LABELS);
+cache.remove(LIST_OTHERS_AS_JSON);
+
+cache.remove(FIND_MODEL_NAMES);
+cache.remove(FIND_MODEL_LABELS);
+cache.remove(LIST_MODELS_AS_JSON);
+
+cache.remove(FIND_TRANSFORMER_NAMES);
+cache.remove(LIST_TRANSFORMERS_AS_JSON);
+
+cache.remove(SUMMARY_AS_JSON);
Review Comment:
You are welcome to clear all cache, or create a JIRA so we wont forget
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
(camel-quarkus) branch camel-main updated (b7ad82a106 -> 151b460730)
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from b7ad82a106 Fixed main-yaml - inlining requires unique routes, partialy fixed openapi-java new c8ec9b540e Fixed openapi-kava, get rid of v2, because of CAMEL-20488 new 151b460730 Micrometer logging for CI debugging purposes 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: .../component/micrometer/it/MicrometerTest.java| 5 +- integration-tests/openapi-java/pom.xml | 12 -- .../component/openapijava/it/v2/OpenApiV2IT.java | 25 .../component/openapijava/it/v2/OpenApiV2Test.java | 154 - .../openapijava/it/v2/OpenApiV2TestProfile.java| 30 5 files changed, 4 insertions(+), 222 deletions(-) delete mode 100644 integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v2/OpenApiV2IT.java delete mode 100644 integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v2/OpenApiV2Test.java delete mode 100644 integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v2/OpenApiV2TestProfile.java
(camel-quarkus) 01/02: Fixed openapi-kava, get rid of v2, because of CAMEL-20488
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit c8ec9b540e58bd9a553185d965654f691aa34aec
Author: JiriOndrusek
AuthorDate: Tue Mar 12 12:52:23 2024 +0100
Fixed openapi-kava, get rid of v2, because of CAMEL-20488
---
integration-tests/openapi-java/pom.xml | 12 --
.../component/openapijava/it/v2/OpenApiV2IT.java | 25
.../component/openapijava/it/v2/OpenApiV2Test.java | 154 -
.../openapijava/it/v2/OpenApiV2TestProfile.java| 30
4 files changed, 221 deletions(-)
diff --git a/integration-tests/openapi-java/pom.xml
b/integration-tests/openapi-java/pom.xml
index 494797bcea..a812fdf743 100644
--- a/integration-tests/openapi-java/pom.xml
+++ b/integration-tests/openapi-java/pom.xml
@@ -95,18 +95,6 @@
org.apache.maven.plugins
maven-failsafe-plugin
-
-profile-openapi-v2
-
-integration-test
-verify
-
-
-
-openapi.v2
-
-
-
profile-openapi-v3
diff --git
a/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v2/OpenApiV2IT.java
b/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v2/OpenApiV2IT.java
deleted file mode 100644
index 5ea4a935b5..00
---
a/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v2/OpenApiV2IT.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.quarkus.component.openapijava.it.v2;
-
-import io.quarkus.test.junit.QuarkusIntegrationTest;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-
-@QuarkusIntegrationTest
-@EnabledIfSystemProperty(named = "test.profile", matches = "openapi.v2")
-class OpenApiV2IT extends OpenApiV2Test {
-}
diff --git
a/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v2/OpenApiV2Test.java
b/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v2/OpenApiV2Test.java
deleted file mode 100644
index 31d73ce417..00
---
a/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v2/OpenApiV2Test.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.quarkus.component.openapijava.it.v2;
-
-import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit.TestProfile;
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-import org.apache.camel.quarkus.component.openapijava.it.OpenApiContentType;
-import org.apache.camel.quarkus.component.openapijava.it.common.OpenApiTest;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.EnumSource;
(camel-quarkus) 02/02: Micrometer logging for CI debugging purposes
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 151b460730dc2b0a78f743110a46ffb567bf069b
Author: JiriOndrusek
AuthorDate: Tue Mar 12 12:58:12 2024 +0100
Micrometer logging for CI debugging purposes
---
.../apache/camel/quarkus/component/micrometer/it/MicrometerTest.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
b/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
index af1b4f42a9..66320eb929 100644
---
a/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
+++
b/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
@@ -29,6 +29,7 @@ import io.quarkus.test.junit.DisabledOnIntegrationTest;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.path.json.JsonPath;
+import org.jboss.logging.Logger;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
@@ -39,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@QuarkusTest
class MicrometerTest extends AbstractMicrometerTest {
-
+private static final Logger LOG = Logger.getLogger(MicrometerTest.class);
@Test
public void testMicrometerMetricsCounter() throws Exception {
RestAssured.get("/micrometer/counter/0")
@@ -183,6 +184,8 @@ class MicrometerTest extends AbstractMicrometerTest {
//extract required values
Map result = jsonPath.getMap(
"gauges.findAll { it.id.name =~ /routes/ && it.id.tags.find {
it.customTag } }.collectEntries { [it.id.name, it.value] }");
+//todo remove for debugging purposes
+LOG.info("Dumped json is " + result);
assertEquals(result.size(), 3);
assertTrue(result.containsKey("camel.routes.running"));
Re: [PR] CAMEL-20517 camel-jbang-plugin-k doesn't recognize command [camel]
claudio4j commented on PR #13397: URL: https://github.com/apache/camel/pull/13397#issuecomment-1991470806 @davsclaus @christophd ready for review. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] fix(docs): Adds camel-http entry for changed redirect behaviour to 3.19 upgrade guide [camel]
rubenlassau-strauven opened a new pull request, #13457: URL: https://github.com/apache/camel/pull/13457 Adds camel-http entry for changed redirect behaviour to 3.19 upgrade guide # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [x] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [x] I checked that each commit in the pull request has a meaningful subject line and body. - [x] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20095 : add langchain component [camel]
orpiske commented on code in PR #13341:
URL: https://github.com/apache/camel/pull/13341#discussion_r1521241028
##
test-infra/camel-test-infra-ollama/src/test/java/org/apache/camel/test/infra/ollama/services/OllamaContainer.java:
##
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.test.infra.ollama.services;
+
+import java.io.IOException;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+public class OllamaContainer extends GenericContainer {
+
+private static final Logger LOGGER =
LoggerFactory.getLogger(OllamaContainer.class);
+
+private final DockerImageName dockerImageName;
+
+private final Integer port;
+private final String model;
+private final String imageName;
+
+public OllamaContainer(DockerImageName image, Integer port, String model,
String imageName) {
+super(image);
+
+this.dockerImageName = image;
+this.port = port;
+this.model = model;
+this.imageName = imageName;
+withExposedPorts(port);
+withImagePullPolicy(dockerImageName ->
!dockerImageName.getVersionPart().endsWith(model));
+setWaitStrategy(Wait.forListeningPort());
+withLogConsumer(new Slf4jLogConsumer(LOGGER));
+}
+
+@Override
+protected void containerIsStarted(InspectContainerResponse containerInfo) {
+if (!this.dockerImageName.equals(DockerImageName.parse(imageName))) {
+try {
+LOGGER.info("Start pulling the '{}' model ... would take
several minutes ...", model);
Review Comment:
You can annotate the tests with the following annotation to prevent them
from running on CI environments (ASF or Github):
`@DisabledIfSystemProperty(named = "ci.env.name", matches = "*",
disabledReason = "Requires too much network resources")`
The idea is to prevent ASF or Github from abusing the host that serves this
model. It would still run locally, though.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] [chore] improve metrics for integration [camel-k]
github-actions[bot] commented on PR #5154: URL: https://github.com/apache/camel-k/pull/5154#issuecomment-1991325854 :warning: Unit test coverage report - coverage decreased from 37.1% to 36.9% (**-0.2%**) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Install operator/base image according to the target architecture [camel-k]
squakez commented on PR #5200: URL: https://github.com/apache/camel-k/pull/5200#issuecomment-1991312403 If it's ready I think we can merge and we can verify the nightly release correctly pushes the manifest. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
