(camel-kamelets) branch regen_bot updated (524758ff -> bbdd20b7)
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 524758ff Bump org.apache.maven.plugins:maven-plugin-plugin from 3.11.0 to 3.12.0 (#1982) add c9e0b53c Updated CHANGELOG.md add bbdd20b7 Bump org.apache.maven.plugins:maven-source-plugin from 3.3.0 to 3.3.1 (#1985) No new revisions were added by this update. Summary of changes: CHANGELOG.md | 9 + pom.xml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-)
(camel) 01/02: CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 8x7B Instruct
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.git
commit ed12b8a0d1c36a8f24376e85eccab8ecfeb14e0d
Author: Andrea Cosentino
AuthorDate: Fri Apr 5 06:41:52 2024 +0200
CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 8x7B
Instruct
Signed-off-by: Andrea Cosentino
---
.../component/aws2/bedrock/BedrockModels.java | 3 +-
.../aws2/bedrock/runtime/BedrockProducer.java | 2 +-
.../runtime/integration/BedrockProducerIT.java | 57 --
3 files changed, 46 insertions(+), 16 deletions(-)
diff --git
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java
index c7688b50286..af463f63bb7 100644
---
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java
+++
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java
@@ -29,7 +29,8 @@ public enum BedrockModels {
ANTROPHIC_CLAUDE_V2_1("anthropic.claude-v2:1"),
ANTROPHIC_CLAUDE_V3("anthropic.claude-3-sonnet-20240229-v1:0"),
ANTROPHIC_CLAUDE_HAIKU_V3("anthropic.claude-3-haiku-20240307-v1:0"),
-MISTRAL_7B_INSTRUCT("mistral.mistral-7b-instruct-v0:2");
+MISTRAL_7B_INSTRUCT("mistral.mistral-7b-instruct-v0:2"),
+MISTRAL_8x7B_INSTRUCT("mistral.mixtral-8x7b-instruct-v0:1");
public final String model;
diff --git
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockProducer.java
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockProducer.java
index 8a2a3fffdd0..f7d18e5e46f 100644
---
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockProducer.java
+++
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockProducer.java
@@ -256,7 +256,7 @@ public class BedrockProducer extends DefaultProducer {
throw new RuntimeException(e);
}
}
-case "mistral.mistral-7b-instruct-v0:2" -> {
+case "mistral.mistral-7b-instruct-v0:2",
"mistral.mixtral-8x7b-instruct-v0:1" -> {
try {
setMistralText(result, message);
} catch (JsonProcessingException e) {
diff --git
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
index 52111a22f97..7645771da1c 100644
---
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
+++
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
@@ -32,10 +32,10 @@ import
org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
// Must be manually tested. Provide your own accessKey and secretKey using
-Daws.manual.access.key and -Daws.manual.secret.key
-@EnabledIfSystemProperties({
+/*@EnabledIfSystemProperties({
@EnabledIfSystemProperty(named = "aws.manual.access.key", matches =
".*", disabledReason = "Access key not provided"),
@EnabledIfSystemProperty(named = "aws.manual.secret.key", matches =
".*", disabledReason = "Secret key not provided")
-})
+})*/
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class BedrockProducerIT extends CamelTestSupport {
@@ -397,23 +397,46 @@ class BedrockProducerIT extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
}
+@Test
+public void testInvokeMistral8x7BInstructModel() throws
InterruptedException {
+
+result.expectedMessageCount(1);
+final Exchange result =
template.send("direct:send_mistral_8x7b_instruct_model", exchange -> {
+ObjectMapper mapper = new ObjectMapper();
+ObjectNode rootNode = mapper.createObjectNode();
+rootNode.putIfAbsent("prompt",
+new TextNode("\"[INST] Can you tell the history of
Mayflower? [/INST]\\\""));
+
+rootNode.putIfAbsent("max_tokens", new IntNode(300));
+rootNode.putIfAbsent("temperature", new DoubleNode(0.5));
+rootNode.putIfAbsent("top_p", new DoubleNode(0.9));
+rootNode.putIfAbsent("top_k", new IntNode(50));
+
+
exchange.getMessage().setBody(mapper.writer().writeValueAsString(rootNode));
+
(camel) 02/02: CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 8x7B Instruct
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.git
commit 650e1aa91665b758d80270af275b384dd08c223d
Author: Andrea Cosentino
AuthorDate: Fri Apr 5 06:54:16 2024 +0200
CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 8x7B
Instruct
Signed-off-by: Andrea Cosentino
---
.../runtime/integration/BedrockProducerIT.java | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
index 7645771da1c..56908f2ed4c 100644
---
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
+++
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
@@ -32,10 +32,10 @@ import
org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
// Must be manually tested. Provide your own accessKey and secretKey using
-Daws.manual.access.key and -Daws.manual.secret.key
-/*@EnabledIfSystemProperties({
+@EnabledIfSystemProperties({
@EnabledIfSystemProperty(named = "aws.manual.access.key", matches =
".*", disabledReason = "Access key not provided"),
@EnabledIfSystemProperty(named = "aws.manual.secret.key", matches =
".*", disabledReason = "Secret key not provided")
-})*/
+})
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class BedrockProducerIT extends CamelTestSupport {
@@ -426,17 +426,17 @@ class BedrockProducerIT extends CamelTestSupport {
@Override
public void configure() {
from("direct:send_titan_express")
-
.to("aws-bedrock:label?useDefaultCredentialsProvider=true=eu-central-1=invokeTextModel="
+
.to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})=RAW({{aws.manual.secret.key}}=eu-central-1=invokeTextModel="
+ BedrockModels.TITAN_TEXT_EXPRESS_V1.model)
.to(result);
from("direct:send_titan_lite")
-
.to("aws-bedrock:label?useDefaultCredentialsProvider=true=us-east-1=invokeTextModel="
+
.to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})=RAW({{aws.manual.secret.key}}=us-east-1=invokeTextModel="
+ BedrockModels.TITAN_TEXT_LITE_V1.model)
.to(result);
from("direct:send_titan_image")
-
.to("aws-bedrock:label?useDefaultCredentialsProvider=true=us-east-1=invokeImageModel="
+
.to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})=RAW({{aws.manual.secret.key}}=us-east-1=invokeImageModel="
+ BedrockModels.TITAN_IMAGE_GENERATOR_V1.model)
.split(body())
.unmarshal().base64()
@@ -444,12 +444,12 @@ class BedrockProducerIT extends CamelTestSupport {
.to(result);
from("direct:send_titan_embeddings")
-
.to("aws-bedrock:label?useDefaultCredentialsProvider=true=us-east-1=invokeEmbeddingsModel="
+
.to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})=RAW({{aws.manual.secret.key}}=us-east-1=invokeEmbeddingsModel="
+ BedrockModels.TITAN_EMBEDDINGS_G1.model)
.to(result);
from("direct:send_jurassic2_model")
-
.to("aws-bedrock:label?useDefaultCredentialsProvider=true=us-east-1=invokeTextModel="
+
.to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})=RAW({{aws.manual.secret.key}}=us-east-1=invokeTextModel="
+ BedrockModels.JURASSIC2_ULTRA.model)
.split(body())
.transform().jq(".data.text")
@@ -457,7 +457,7 @@ class BedrockProducerIT extends CamelTestSupport {
.to(result);
from("direct:send_jurassic2_mid_model")
-
.to("aws-bedrock:label?useDefaultCredentialsProvider=true=us-east-1=invokeTextModel="
+
.to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})=RAW({{aws.manual.secret.key}}=us-east-1=invokeTextModel="
+ BedrockModels.JURASSIC2_MID.model)
.split(body())
.transform().jq(".data.text")
@@ -465,43 +465,43 @@ class
Re: [PR] CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 8x7B Instruct [camel]
oscerd merged PR #13704: URL: https://github.com/apache/camel/pull/13704 -- 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 CAMEL-20562-8x7b-mistral deleted (was 6b7d0edfd6b)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch CAMEL-20562-8x7b-mistral in repository https://gitbox.apache.org/repos/asf/camel.git was 6b7d0edfd6b CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 8x7B Instruct 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 (31699bd91c8 -> 650e1aa9166)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 31699bd91c8 camel-smb: polish new ed12b8a0d1c CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 8x7B Instruct new 650e1aa9166 CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 8x7B Instruct 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/aws2/bedrock/BedrockModels.java | 3 ++- .../aws2/bedrock/runtime/BedrockProducer.java | 2 +- .../runtime/integration/BedrockProducerIT.java | 29 ++ 3 files changed, 32 insertions(+), 2 deletions(-)
(camel-kamelets) branch dependabot/maven/org.apache.maven.plugins-maven-source-plugin-3.3.1 created (now 7dea49c0)
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-source-plugin-3.3.1 in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git at 7dea49c0 Bump org.apache.maven.plugins:maven-source-plugin from 3.3.0 to 3.3.1 No new revisions were added by this update.
(camel-kamelets) branch dependabot/maven/org.apache.maven.plugins-maven-source-plugin-3.3.1 deleted (was 7dea49c0)
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-source-plugin-3.3.1 in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git was 7dea49c0 Bump org.apache.maven.plugins:maven-source-plugin from 3.3.0 to 3.3.1 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 main updated: Bump org.apache.maven.plugins:maven-source-plugin from 3.3.0 to 3.3.1 (#1985)
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 bbdd20b7 Bump org.apache.maven.plugins:maven-source-plugin from 3.3.0 to 3.3.1 (#1985) bbdd20b7 is described below commit bbdd20b719b6326af304418e85c80a9284ce0e6a Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Apr 5 07:03:23 2024 +0200 Bump org.apache.maven.plugins:maven-source-plugin from 3.3.0 to 3.3.1 (#1985) Bumps [org.apache.maven.plugins:maven-source-plugin](https://github.com/apache/maven-source-plugin) from 3.3.0 to 3.3.1. - [Commits](https://github.com/apache/maven-source-plugin/compare/maven-source-plugin-3.3.0...maven-source-plugin-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-source-plugin dependency-type: direct:production update-type: version-update:semver-patch ... 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 6f8dc76a..ae804c75 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 3.2.5 3.6.3 3.6.0 -3.3.0 +3.3.1 1.11 3.1.0 2.1.1
Re: [PR] Bump org.apache.maven.plugins:maven-source-plugin from 3.3.0 to 3.3.1 [camel-kamelets]
oscerd merged PR #1985: URL: https://github.com/apache/camel-kamelets/pull/1985 -- 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] Bump org.apache.maven.plugins:maven-source-plugin from 3.3.0 to 3.3.1 [camel-kamelets]
dependabot[bot] opened a new pull request, #1985: URL: https://github.com/apache/camel-kamelets/pull/1985 Bumps [org.apache.maven.plugins:maven-source-plugin](https://github.com/apache/maven-source-plugin) from 3.3.0 to 3.3.1. Commits https://github.com/apache/maven-source-plugin/commit/f80596e4eb587cf99452b67b43ee9729fdadbf3a;>f80596e [maven-release-plugin] prepare release maven-source-plugin-3.3.1 https://github.com/apache/maven-source-plugin/commit/7626998d262931570c969abe3fc60cf911fd6820;>7626998 Bump apache/maven-gh-actions-shared from 3 to 4 https://github.com/apache/maven-source-plugin/commit/83c963c0fffadd3257e9a1ca9266cfac98c057c3;>83c963c Bump org.apache.maven.plugins:maven-plugins from 39 to 41 (https://redirect.github.com/apache/maven-source-plugin/issues/18;>#18) https://github.com/apache/maven-source-plugin/commit/40ae49538beebc793f16a91578629383de114edb;>40ae495 Bump org.codehaus.plexus:plexus-archiver from 4.8.0 to 4.9.1 (https://redirect.github.com/apache/maven-source-plugin/issues/20;>#20) https://github.com/apache/maven-source-plugin/commit/073462bf11ad9cf61cab6a2ed213bb8af5349f35;>073462b Bump org.apache.maven:maven-archiver from 3.6.0 to 3.6.1 (https://redirect.github.com/apache/maven-source-plugin/issues/21;>#21) https://github.com/apache/maven-source-plugin/commit/0b1c82366e306c9d138a3a83950326071c2fc7c6;>0b1c823 Fix typos in AbstractSourceJarMojo exception https://github.com/apache/maven-source-plugin/commit/099c65a64ac20e9f1133b41e2d1906944f6c13c3;>099c65a [MSOURCES-142] Bump org.codehaus.plexus:plexus-archiver from 4.7.1 to 4.8.0 (... https://github.com/apache/maven-source-plugin/commit/1edeea47f80bc5c5903e88c1adbff56501248a8b;>1edeea4 [MSOURCES-139] Fix typo in AbstractSourceJarMojo exception https://github.com/apache/maven-source-plugin/commit/436966ed7f93611d5faa6534478347b99c40f488;>436966e [maven-release-plugin] prepare for next development iteration See full diff in https://github.com/apache/maven-source-plugin/compare/maven-source-plugin-3.3.0...maven-source-plugin-3.3.1;>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 the PR or upgrade to it yourself) -- 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-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 8x7B Instruct [camel]
github-actions[bot] commented on PR #13704: URL: https://github.com/apache/camel/pull/13704#issuecomment-2038935529 :robot: The Apache Camel test robot will run the tests for you :+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] CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 8x7B Instruct [camel]
oscerd commented on PR #13704: URL: https://github.com/apache/camel/pull/13704#issuecomment-2038934746 /component-test aws -- 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-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 8x7B Instruct [camel]
github-actions[bot] commented on PR #13704: URL: https://github.com/apache/camel/pull/13704#issuecomment-2038931628 :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] CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 8x7B Instruct [camel]
oscerd opened a new pull request, #13704: URL: https://github.com/apache/camel/pull/13704 # Description # Target - [x] 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
(camel) 02/02: CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 8x7B Instruct
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch CAMEL-20562-8x7b-mistral
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6b7d0edfd6b3b38e06ebbd9123f82a406168c82a
Author: Andrea Cosentino
AuthorDate: Fri Apr 5 06:54:16 2024 +0200
CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 8x7B
Instruct
Signed-off-by: Andrea Cosentino
---
.../runtime/integration/BedrockProducerIT.java | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
index 7645771da1c..56908f2ed4c 100644
---
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
+++
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
@@ -32,10 +32,10 @@ import
org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
// Must be manually tested. Provide your own accessKey and secretKey using
-Daws.manual.access.key and -Daws.manual.secret.key
-/*@EnabledIfSystemProperties({
+@EnabledIfSystemProperties({
@EnabledIfSystemProperty(named = "aws.manual.access.key", matches =
".*", disabledReason = "Access key not provided"),
@EnabledIfSystemProperty(named = "aws.manual.secret.key", matches =
".*", disabledReason = "Secret key not provided")
-})*/
+})
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class BedrockProducerIT extends CamelTestSupport {
@@ -426,17 +426,17 @@ class BedrockProducerIT extends CamelTestSupport {
@Override
public void configure() {
from("direct:send_titan_express")
-
.to("aws-bedrock:label?useDefaultCredentialsProvider=true=eu-central-1=invokeTextModel="
+
.to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})=RAW({{aws.manual.secret.key}}=eu-central-1=invokeTextModel="
+ BedrockModels.TITAN_TEXT_EXPRESS_V1.model)
.to(result);
from("direct:send_titan_lite")
-
.to("aws-bedrock:label?useDefaultCredentialsProvider=true=us-east-1=invokeTextModel="
+
.to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})=RAW({{aws.manual.secret.key}}=us-east-1=invokeTextModel="
+ BedrockModels.TITAN_TEXT_LITE_V1.model)
.to(result);
from("direct:send_titan_image")
-
.to("aws-bedrock:label?useDefaultCredentialsProvider=true=us-east-1=invokeImageModel="
+
.to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})=RAW({{aws.manual.secret.key}}=us-east-1=invokeImageModel="
+ BedrockModels.TITAN_IMAGE_GENERATOR_V1.model)
.split(body())
.unmarshal().base64()
@@ -444,12 +444,12 @@ class BedrockProducerIT extends CamelTestSupport {
.to(result);
from("direct:send_titan_embeddings")
-
.to("aws-bedrock:label?useDefaultCredentialsProvider=true=us-east-1=invokeEmbeddingsModel="
+
.to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})=RAW({{aws.manual.secret.key}}=us-east-1=invokeEmbeddingsModel="
+ BedrockModels.TITAN_EMBEDDINGS_G1.model)
.to(result);
from("direct:send_jurassic2_model")
-
.to("aws-bedrock:label?useDefaultCredentialsProvider=true=us-east-1=invokeTextModel="
+
.to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})=RAW({{aws.manual.secret.key}}=us-east-1=invokeTextModel="
+ BedrockModels.JURASSIC2_ULTRA.model)
.split(body())
.transform().jq(".data.text")
@@ -457,7 +457,7 @@ class BedrockProducerIT extends CamelTestSupport {
.to(result);
from("direct:send_jurassic2_mid_model")
-
.to("aws-bedrock:label?useDefaultCredentialsProvider=true=us-east-1=invokeTextModel="
+
.to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})=RAW({{aws.manual.secret.key}}=us-east-1=invokeTextModel="
+ BedrockModels.JURASSIC2_MID.model)
.split(body())
.transform().jq(".data.text")
@@ -465,43 +465,43
(camel) branch CAMEL-20562-8x7b-mistral created (now 6b7d0edfd6b)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch CAMEL-20562-8x7b-mistral in repository https://gitbox.apache.org/repos/asf/camel.git at 6b7d0edfd6b CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 8x7B Instruct This branch includes the following new commits: new 479faf9b093 CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 8x7B Instruct new 6b7d0edfd6b CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 8x7B Instruct 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) 01/02: CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 8x7B Instruct
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch CAMEL-20562-8x7b-mistral
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 479faf9b093ff09f066673ad014597d746e501e5
Author: Andrea Cosentino
AuthorDate: Fri Apr 5 06:41:52 2024 +0200
CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 8x7B
Instruct
Signed-off-by: Andrea Cosentino
---
.../component/aws2/bedrock/BedrockModels.java | 3 +-
.../aws2/bedrock/runtime/BedrockProducer.java | 2 +-
.../runtime/integration/BedrockProducerIT.java | 57 --
3 files changed, 46 insertions(+), 16 deletions(-)
diff --git
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java
index c7688b50286..af463f63bb7 100644
---
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java
+++
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java
@@ -29,7 +29,8 @@ public enum BedrockModels {
ANTROPHIC_CLAUDE_V2_1("anthropic.claude-v2:1"),
ANTROPHIC_CLAUDE_V3("anthropic.claude-3-sonnet-20240229-v1:0"),
ANTROPHIC_CLAUDE_HAIKU_V3("anthropic.claude-3-haiku-20240307-v1:0"),
-MISTRAL_7B_INSTRUCT("mistral.mistral-7b-instruct-v0:2");
+MISTRAL_7B_INSTRUCT("mistral.mistral-7b-instruct-v0:2"),
+MISTRAL_8x7B_INSTRUCT("mistral.mixtral-8x7b-instruct-v0:1");
public final String model;
diff --git
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockProducer.java
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockProducer.java
index 8a2a3fffdd0..f7d18e5e46f 100644
---
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockProducer.java
+++
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockProducer.java
@@ -256,7 +256,7 @@ public class BedrockProducer extends DefaultProducer {
throw new RuntimeException(e);
}
}
-case "mistral.mistral-7b-instruct-v0:2" -> {
+case "mistral.mistral-7b-instruct-v0:2",
"mistral.mixtral-8x7b-instruct-v0:1" -> {
try {
setMistralText(result, message);
} catch (JsonProcessingException e) {
diff --git
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
index 52111a22f97..7645771da1c 100644
---
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
+++
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
@@ -32,10 +32,10 @@ import
org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
// Must be manually tested. Provide your own accessKey and secretKey using
-Daws.manual.access.key and -Daws.manual.secret.key
-@EnabledIfSystemProperties({
+/*@EnabledIfSystemProperties({
@EnabledIfSystemProperty(named = "aws.manual.access.key", matches =
".*", disabledReason = "Access key not provided"),
@EnabledIfSystemProperty(named = "aws.manual.secret.key", matches =
".*", disabledReason = "Secret key not provided")
-})
+})*/
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class BedrockProducerIT extends CamelTestSupport {
@@ -397,23 +397,46 @@ class BedrockProducerIT extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
}
+@Test
+public void testInvokeMistral8x7BInstructModel() throws
InterruptedException {
+
+result.expectedMessageCount(1);
+final Exchange result =
template.send("direct:send_mistral_8x7b_instruct_model", exchange -> {
+ObjectMapper mapper = new ObjectMapper();
+ObjectNode rootNode = mapper.createObjectNode();
+rootNode.putIfAbsent("prompt",
+new TextNode("\"[INST] Can you tell the history of
Mayflower? [/INST]\\\""));
+
+rootNode.putIfAbsent("max_tokens", new IntNode(300));
+rootNode.putIfAbsent("temperature", new DoubleNode(0.5));
+rootNode.putIfAbsent("top_p", new DoubleNode(0.9));
+rootNode.putIfAbsent("top_k", new IntNode(50));
+
+
Re: [PR] CAMEL-19533 - camel-mail: replace Thread.sleep in tests. [camel]
VaishnaviR18 commented on code in PR #13678:
URL: https://github.com/apache/camel/pull/13678#discussion_r1552861969
##
components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java:
##
@@ -71,28 +73,28 @@ public void testSendAndReceiveMailWithAttachments() throws
Exception {
producer.process(exchange);
// need some time for the mail to arrive on the inbox (consumed and
sent to the mock)
-Thread.sleep(2000);
-
-MockEndpoint mock = getMockEndpoint("mock:result");
-mock.expectedMessageCount(1);
-Exchange out = mock.assertExchangeReceived(0);
-mock.assertIsSatisfied();
-
-// plain text
-assertEquals("Hello World", out.getIn().getBody(String.class));
-
-// attachment
-Map attachments =
out.getIn(AttachmentMessage.class).getAttachments();
-assertNotNull(attachments, "Should have attachments");
-assertEquals(1, attachments.size());
-
-DataHandler handler =
out.getIn(AttachmentMessage.class).getAttachment(name);
-assertNotNull(handler, "The " + name + " should be there");
-
-String nameURLEncoded = URLEncoder.encode(name,
Charset.defaultCharset().name());
-assertTrue(handler.getContentType().endsWith(nameURLEncoded), "Handler
content type should end with URL-encoded name");
-
-assertEquals(name, handler.getName(), "Handler name should be the file
name");
+Awaitility.await().pollDelay(2, TimeUnit.SECONDS).untilAsserted(() -> {
+MockEndpoint mock = getMockEndpoint("mock:result");
Review Comment:
I have updated the code, can you please review it?
Thanks!
--
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] (chores) minor test infra cleanup [camel]
davsclaus commented on PR #13703: URL: https://github.com/apache/camel/pull/13703#issuecomment-2038886151 license header is missing in top of 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: [PR] CAMEL-19543 - camel-sjms2: replace Thread.sleep in tests. [camel]
VaishnaviR18 commented on code in PR #13685:
URL: https://github.com/apache/camel/pull/13685#discussion_r1552838060
##
components/camel-sjms2/pom.xml:
##
@@ -66,6 +66,12 @@
test
test-jar
+
+org.awaitility
+awaitility
+${awaitility-version}
+test
+
Review Comment:
I have removed the dependency, can you please review it?
Thanks!
--
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-19543 - camel-sjms2: replace Thread.sleep in tests. [camel]
VaishnaviR18 commented on code in PR #13685:
URL: https://github.com/apache/camel/pull/13685#discussion_r1552824216
##
components/camel-sjms2/pom.xml:
##
@@ -66,6 +66,12 @@
test
test-jar
+
+org.awaitility
+awaitility
+${awaitility-version}
+test
+
Review Comment:
Yes, sorry i missed it. Thanks!
--
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-19533 - camel-mail: replace Thread.sleep in tests. [camel]
VaishnaviR18 commented on code in PR #13678:
URL: https://github.com/apache/camel/pull/13678#discussion_r1552822516
##
components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java:
##
@@ -71,28 +73,28 @@ public void testSendAndReceiveMailWithAttachments() throws
Exception {
producer.process(exchange);
// need some time for the mail to arrive on the inbox (consumed and
sent to the mock)
-Thread.sleep(2000);
-
-MockEndpoint mock = getMockEndpoint("mock:result");
-mock.expectedMessageCount(1);
-Exchange out = mock.assertExchangeReceived(0);
-mock.assertIsSatisfied();
-
-// plain text
-assertEquals("Hello World", out.getIn().getBody(String.class));
-
-// attachment
-Map attachments =
out.getIn(AttachmentMessage.class).getAttachments();
-assertNotNull(attachments, "Should have attachments");
-assertEquals(1, attachments.size());
-
-DataHandler handler =
out.getIn(AttachmentMessage.class).getAttachment(name);
-assertNotNull(handler, "The " + name + " should be there");
-
-String nameURLEncoded = URLEncoder.encode(name,
Charset.defaultCharset().name());
-assertTrue(handler.getContentType().endsWith(nameURLEncoded), "Handler
content type should end with URL-encoded name");
-
-assertEquals(name, handler.getName(), "Handler name should be the file
name");
+Awaitility.await().pollDelay(2, TimeUnit.SECONDS).untilAsserted(() -> {
+MockEndpoint mock = getMockEndpoint("mock:result");
Review Comment:
Oh okay. Sorry i was on PTO yesterday. I will adjust it. Thanks!
--
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] - Quarkus Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-2038764905 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 8564003170-1443-db4b77c9-d0ba-4274-b23c-f08b1421d167 * Camel Quarkus Commit: e50c876887d82f4c5ad6e81ac8de4db6116b14e5 * Quarkus Main Commit: a02012d329518f5c226cea5dbe856acb1cc7494b * Link to build: https://github.com/apache/camel-quarkus/actions/runs/8564003170 -- 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 c9e0b53c Updated CHANGELOG.md c9e0b53c is described below commit c9e0b53c2fa3d82e507a91f656d9458956990db0 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Apr 5 03:08:40 2024 + Updated CHANGELOG.md --- CHANGELOG.md | 9 + 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78fc8308..3c0cd9d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [Unreleased](https://github.com/apache/camel-kamelets/tree/HEAD) + +[Full Changelog](https://github.com/apache/camel-kamelets/compare/v4.5.0...HEAD) + +**Closed issues:** + +- Support Camel AWS Bedrock Agent Runtime as Sink [\#1935](https://github.com/apache/camel-kamelets/issues/1935) +- DataTypes: Initial list of Kamelets to enrich [\#1343](https://github.com/apache/camel-kamelets/issues/1343) + ## [v4.5.0](https://github.com/apache/camel-kamelets/tree/v4.5.0) (2024-04-02) [Full Changelog](https://github.com/apache/camel-kamelets/compare/v4.4.1...v4.5.0)
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-2038524910 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 8562965982-1339-4d0e0a51-97c4-44f0-b0b0-60db82f9324d * Camel Quarkus Commit: a2552539bf6dac3c4836f18fa1ece1481b289ae3 * Camel Main Commit: a02012d329518f5c226cea5dbe856acb1cc7494b * Link to build: https://github.com/apache/camel-quarkus/actions/runs/8562965982 -- 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] chore(deps): bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring from 0.67.1 to 0.73.0 [camel-k]
dependabot[bot] opened a new pull request, #5324: URL: https://github.com/apache/camel-k/pull/5324 [](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 the PR or upgrade to it yourself) -- 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 dependabot/go_modules/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring-0.73.0 created (now 5d194b295)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring-0.73.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 5d194b295 chore(deps): bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring No new revisions were added by this update.
(camel-k) branch dependabot/go_modules/golang.org/x/oauth2-0.19.0 created (now 47b55f752)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/golang.org/x/oauth2-0.19.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 47b55f752 chore(deps): bump golang.org/x/oauth2 from 0.18.0 to 0.19.0 No new revisions were added by this update.
[PR] chore(deps): bump golang.org/x/oauth2 from 0.18.0 to 0.19.0 [camel-k]
dependabot[bot] opened a new pull request, #5323: URL: https://github.com/apache/camel-k/pull/5323 Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.18.0 to 0.19.0. Commits https://github.com/golang/oauth2/commit/d0e617c58cf747cf27df9762003502f814dd524c;>d0e617c google: add Credentials.UniverseDomainProvider https://github.com/golang/oauth2/commit/3c9c1f6d00e8761389cd2c50bc4179459d6320b5;>3c9c1f6 oauth2/google: fix the logic of sts 0 value of expires_in https://github.com/golang/oauth2/commit/5a05c654f92c675eb6bfe782f61b601b0efb77ea;>5a05c65 oauth2/google: fix remove content-type header from idms get requests https://github.com/golang/oauth2/commit/3a6776ada799d857cee190d6f517c4afee7c3170;>3a6776a appengine: drop obsolete code for AppEngine envs =Go 1.11 See full diff in https://github.com/golang/oauth2/compare/v0.18.0...v0.19.0;>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 the PR or upgrade to it yourself) -- 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: 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 bd6433763 chore: nightly automatic updates bd6433763 is described below commit bd643376345905188f8e6a1fc0d2ae0af958ae33 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Apr 4 23:47:38 2024 + chore: nightly automatic updates --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dd2e4fb0..8cc0f189a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ **Merged pull requests:** +- chore\(deps\): bump github.com/prometheus/client\_model from 0.6.0 to 0.6.1 [\#5319](https://github.com/apache/camel-k/pull/5319) ([dependabot[bot]](https://github.com/apps/dependabot)) +- fix\(cli\): openshift cli install rbac path [\#5316](https://github.com/apache/camel-k/pull/5316) ([gansheer](https://github.com/gansheer)) - fix\(ci\): plugin failure [\#5312](https://github.com/apache/camel-k/pull/5312) ([squakez](https://github.com/squakez)) - fix\(e2e\): temporarily disable test [\#5308](https://github.com/apache/camel-k/pull/5308) ([squakez](https://github.com/squakez)) - fix\(olm\): bundle script [\#5303](https://github.com/apache/camel-k/pull/5303) ([squakez](https://github.com/squakez))
(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 aa34fc2d930 Regen
aa34fc2d930 is described below
commit aa34fc2d9303a6a215693c5f2ac9fea687d0cb25
Author: Claus Ibsen
AuthorDate: Thu Apr 4 22:26:47 2024 +0200
Regen
---
.../camel/springboot/catalog/components/smb.json | 55 +++---
1 file changed, 28 insertions(+), 27 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/smb.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/smb.json
index 35709193876..d83a8c58196 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/smb.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/smb.json
@@ -29,32 +29,33 @@
"properties": {
"hostname": { "index": 0, "kind": "path", "displayName": "Hostname",
"group": "consumer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "The share hostname or IP
address" },
"port": { "index": 1, "kind": "path", "displayName": "Port", "group":
"consumer", "label": "", "required": false, "type": "integer", "javaType":
"int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 445, "description": "The share port number" },
-"shareName": { "index": 2, "kind": "path", "displayName": "Share Name",
"group": "consumer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "description": "The name of the share to connect to." },
-"idempotentRepository": { "index": 3, "kind": "parameter", "displayName":
"Idempotent Repository", "group": "consumer", "label": "advanced,consumer",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.IdempotentRepository", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.smb.SmbConfiguration", "configurationField":
"configuration", "description": "A pluggable repository
org.apache.camel.spi.IdempotentRepo [...]
-"path": { "index": 4, "kind": "parameter", "displayName": "Path", "group":
"consumer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.smb.SmbConfiguration", "configurationField":
"configuration", "description": "The path, within the share, to consume the
files from" },
-"searchPattern": { "index": 5, "kind": "parameter", "displayName": "Search
Pattern", "group": "consumer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "*.txt", "configurationClass":
"org.apache.camel.component.smb.SmbConfiguration", "configurationField":
"configuration", "description": "The search pattern used to list the files" },
-"sendEmptyMessageWhenIdle": { "index": 6, "kind": "parameter",
"displayName": "Send Empty Message When Idle", "group": "consumer", "label":
"consumer", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "If the polling consumer did not poll any files, you can
enable this option to send an empty message (no body) instead." },
-"bridgeErrorHandler": { "index": 7, "kind": "parameter", "displayName":
"Bridge Error Handler", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions (if possible) occurred
while the Camel consumer is trying to pickup incoming [...]
-"exceptionHandler": { "index": 8, "kind": "parameter", "displayName":
"Exception Handler", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "autowired": false, "secret": false, "description": "To
let the consumer use a custom ExceptionHandler. Notice if the option
bridgeErrorHandler is enabled then this option is not in use. By def [...]
-"exchangePattern": { "index": 9, "kind": "parameter", "displayName":
"Exchange Pattern",
(camel) branch main updated: camel-smb: polish
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 31699bd91c8 camel-smb: polish
31699bd91c8 is described below
commit 31699bd91c84da65e1d5f4961396c61fe28be927
Author: Claus Ibsen
AuthorDate: Thu Apr 4 22:25:16 2024 +0200
camel-smb: polish
---
.../org/apache/camel/catalog/components/smb.json | 18 ++---
.../camel/component/smb/SmbEndpointUriFactory.java | 5 +-
.../org/apache/camel/component/smb/smb.json| 18 ++---
.../camel/component/smb/SmbConfiguration.java | 21 ++
.../apache/camel/component/smb/SmbEndpoint.java| 3 +-
.../builder/endpoint/StaticEndpointBuilders.java | 4 +-
.../endpoint/dsl/SmbEndpointBuilderFactory.java| 76 +++---
.../apache/camel/kotlin/components/SmbUriDsl.kt| 16 ++---
8 files changed, 77 insertions(+), 84 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smb.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smb.json
index 28089712668..288cf4a4f10 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smb.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smb.json
@@ -29,15 +29,15 @@
"properties": {
"hostname": { "index": 0, "kind": "path", "displayName": "Hostname",
"group": "consumer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "The share hostname or IP
address" },
"port": { "index": 1, "kind": "path", "displayName": "Port", "group":
"consumer", "label": "", "required": false, "type": "integer", "javaType":
"int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 445, "description": "The share port number" },
-"shareName": { "index": 2, "kind": "path", "displayName": "Share Name",
"group": "consumer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "description": "The name of the share to connect to." },
-"idempotentRepository": { "index": 3, "kind": "parameter", "displayName":
"Idempotent Repository", "group": "consumer", "label": "advanced,consumer",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.IdempotentRepository", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.smb.SmbConfiguration", "configurationField":
"configuration", "description": "A pluggable repository
org.apache.camel.spi.IdempotentRepo [...]
-"path": { "index": 4, "kind": "parameter", "displayName": "Path", "group":
"consumer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.smb.SmbConfiguration", "configurationField":
"configuration", "description": "The path, within the share, to consume the
files from" },
-"searchPattern": { "index": 5, "kind": "parameter", "displayName": "Search
Pattern", "group": "consumer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "*.txt", "configurationClass":
"org.apache.camel.component.smb.SmbConfiguration", "configurationField":
"configuration", "description": "The search pattern used to list the files" },
-"sendEmptyMessageWhenIdle": { "index": 6, "kind": "parameter",
"displayName": "Send Empty Message When Idle", "group": "consumer", "label":
"consumer", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "If the polling consumer did not poll any files, you can
enable this option to send an empty message (no body) instead." },
-"bridgeErrorHandler": { "index": 7, "kind": "parameter", "displayName":
"Bridge Error Handler", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions (if possible) occurred
while the Camel consumer is trying to pickup incoming [...]
-"exceptionHandler": { "index": 8, "kind": "parameter", "displayName":
"Exception Handler", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler",
Re: [PR] feat(core): Upgrade API kubernetes 1.28 and controller-runtime to 0.16 [camel-k]
gansheer commented on PR #5321: URL: https://github.com/apache/camel-k/pull/5321#issuecomment-2038099928 > Is this expected to be merged for Camel K 2.3 ? It would be important to consider [openshift 4.14 uses kubernetes api 1.27](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.14/html-single/release_notes/index#ocp-4-14-about-this-release). For now this is for main, so post 2.3. Before backporting I need to run the test on Openshift 4.14. > According to the [kubernetes-version-compatibility](https://github.com/kubernetes-sigs/kubebuilder-release-tools/blob/master/VERSIONING.md#kubernetes-version-compatibility), it should still be compatible with Kubernetes API version N-3 or N-4 The test needs to run on Openshift 4.14 because other dependency upgrade that come with it, like the one on client-go, could have an impact somewhere, and the compatibility is not 100% (see https://github.com/kubernetes/client-go#compatibility-client-go---kubernetes-clusters). After this one is fully done there should be the upgrade for API 1.29 and controller-runtime 0.17. -- 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-20557: Rest DSL to use openapi spec directly
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 bf616cd524c CAMEL-20557: Rest DSL to use openapi spec directly
bf616cd524c is described below
commit bf616cd524cbf483ac3349c12134f7a4cbd6e4c3
Author: Claus Ibsen
AuthorDate: Thu Apr 4 20:27:33 2024 +0200
CAMEL-20557: Rest DSL to use openapi spec directly
---
.../http/vertx/VertxPlatformHttpConsumer.java | 4 +++-
.../http/vertx/VertxPlatformHttpEngine.java| 4 ++--
...sumer.java => DefaultPlatformHttpConsumer.java} | 15 --
.../platform/http/PlatformHttpComponent.java | 2 +-
.../platform/http/PlatformHttpEndpoint.java| 10 +-
...rmHttpEngine.java => PlatformHttpConsumer.java} | 21 +---
...pEngine.java => PlatformHttpConsumerAware.java} | 23 --
.../platform/http/spi/PlatformHttpEngine.java | 7 +++
.../http/JettyCustomPlatformHttpConsumer.java | 5 ++---
.../http/JettyCustomPlatformHttpEngine.java| 4 ++--
.../DefaultRestOpenapiProcessorStrategy.java | 6 +++---
.../rest/openapi/RestOpenApiEndpoint.java | 9 +
.../rest/openapi/RestOpenApiProcessor.java | 8
.../rest/openapi/RestOpenapiProcessorStrategy.java | 4 ++--
.../ROOT/pages/camel-4x-upgrade-guide-4_6.adoc | 5 +
15 files changed, 55 insertions(+), 72 deletions(-)
diff --git
a/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpConsumer.java
b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpConsumer.java
index d7033a60af5..9a311acad86 100644
---
a/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpConsumer.java
+++
b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpConsumer.java
@@ -51,6 +51,7 @@ import
org.apache.camel.component.platform.http.PlatformHttpEndpoint;
import org.apache.camel.component.platform.http.cookie.CookieConfiguration;
import org.apache.camel.component.platform.http.cookie.CookieHandler;
import org.apache.camel.component.platform.http.spi.Method;
+import org.apache.camel.component.platform.http.spi.PlatformHttpConsumer;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.support.DefaultConsumer;
import org.apache.camel.util.FileUtil;
@@ -67,7 +68,8 @@ import static
org.apache.camel.util.CollectionHelper.appendEntry;
* A {@link org.apache.camel.Consumer} for the {@link
org.apache.camel.component.platform.http.spi.PlatformHttpEngine}
* based on Vert.x Web.
*/
-public class VertxPlatformHttpConsumer extends DefaultConsumer implements
Suspendable, SuspendableService {
+public class VertxPlatformHttpConsumer extends DefaultConsumer
+implements PlatformHttpConsumer, Suspendable, SuspendableService {
private static final Logger LOGGER =
LoggerFactory.getLogger(VertxPlatformHttpConsumer.class);
private static final Pattern PATH_PARAMETER_PATTERN =
Pattern.compile("\\{([^/}]+)\\}");
diff --git
a/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpEngine.java
b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpEngine.java
index 325cd4d6507..aeb30eb0763 100644
---
a/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpEngine.java
+++
b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpEngine.java
@@ -24,10 +24,10 @@ import io.vertx.core.Handler;
import io.vertx.ext.web.RoutingContext;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
-import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.component.platform.http.PlatformHttpConstants;
import org.apache.camel.component.platform.http.PlatformHttpEndpoint;
+import org.apache.camel.component.platform.http.spi.PlatformHttpConsumer;
import org.apache.camel.component.platform.http.spi.PlatformHttpEngine;
import org.apache.camel.spi.annotations.JdkService;
import org.apache.camel.support.CamelContextHelper;
@@ -78,7 +78,7 @@ public class VertxPlatformHttpEngine extends ServiceSupport
implements PlatformH
}
@Override
-public Consumer createConsumer(PlatformHttpEndpoint endpoint, Processor
processor) {
+public PlatformHttpConsumer createConsumer(PlatformHttpEndpoint endpoint,
Processor processor) {
return new VertxPlatformHttpConsumer(
endpoint,
processor,
diff --git
(camel-spring-boot) branch main updated: CAMEL-20557: Rest DSL to use openapi spec directly
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 04f6a35237e CAMEL-20557: Rest DSL to use openapi spec directly
04f6a35237e is described below
commit 04f6a35237e65f98f3b947ce649b9c8eda719944
Author: Claus Ibsen
AuthorDate: Thu Apr 4 20:23:12 2024 +0200
CAMEL-20557: Rest DSL to use openapi spec directly
---
.../platform/http/springboot/SpringBootPlatformHttpConsumer.java | 3 ++-
.../platform/http/springboot/SpringBootPlatformHttpEngine.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git
a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpConsumer.java
b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpConsumer.java
index 4b0a9fd64df..a037de41749 100644
---
a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpConsumer.java
+++
b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpConsumer.java
@@ -25,6 +25,7 @@ import org.apache.camel.Processor;
import org.apache.camel.Suspendable;
import org.apache.camel.SuspendableService;
import org.apache.camel.component.platform.http.PlatformHttpEndpoint;
+import org.apache.camel.component.platform.http.spi.PlatformHttpConsumer;
import org.apache.camel.http.common.DefaultHttpBinding;
import org.apache.camel.http.common.HttpHelper;
import org.apache.camel.support.DefaultConsumer;
@@ -33,7 +34,7 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
-public class SpringBootPlatformHttpConsumer extends DefaultConsumer implements
Suspendable, SuspendableService {
+public class SpringBootPlatformHttpConsumer extends DefaultConsumer implements
PlatformHttpConsumer, Suspendable, SuspendableService {
private static final Logger LOG =
LoggerFactory.getLogger(SpringBootPlatformHttpConsumer.class);
diff --git
a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngine.java
b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngine.java
index 0e99fd19a60..39ccca4ca96 100644
---
a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngine.java
+++
b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngine.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.platform.http.springboot;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.component.platform.http.PlatformHttpEndpoint;
+import org.apache.camel.component.platform.http.spi.PlatformHttpConsumer;
import org.apache.camel.component.platform.http.spi.PlatformHttpEngine;
public class SpringBootPlatformHttpEngine implements PlatformHttpEngine {
@@ -30,7 +31,7 @@ public class SpringBootPlatformHttpEngine implements
PlatformHttpEngine {
}
@Override
-public Consumer createConsumer(PlatformHttpEndpoint endpoint, Processor
processor) {
+public PlatformHttpConsumer createConsumer(PlatformHttpEndpoint endpoint,
Processor processor) {
return new SpringBootPlatformHttpConsumer(endpoint, processor);
}
(camel) branch main updated: Polished
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 86842afe186 Polished 86842afe186 is described below commit 86842afe186677551b71d090a43a1054b894a12f Author: Claus Ibsen AuthorDate: Thu Apr 4 19:58:23 2024 +0200 Polished --- docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc index 54c545b4d6a..b3caaad7ae7 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc @@ -96,7 +96,7 @@ Routes startup (total:2) Started demo (rest://post:%7B%7Bapp.mypath%7D%7D) -The placeholder is now resolved eagerly and you will see _nicer_ startup logs such as: +The placeholder is now resolved eagerly, and you will see _nicer_ startup logs such as: [source,text] @@ -139,7 +139,7 @@ Camel release versions to ensure the BOM is always correct. === camel-main -The options `camel.main.backlogTracing`, `"camel.main.backlogTracingStandby`, and `camel.main.backlogTracingTemplates` has been +The options `camel.main.backlogTracing`, `camel.main.backlogTracingStandby`, and `camel.main.backlogTracingTemplates` has been moved into a new group `camel.debug` with more options to configure the backlog tracer. To enable backlog tracing you should now set `camel.trace.enabled=true` instead of `camel.main.backlogTracing=true`.
(camel-quarkus) 02/02: [NettyHttp] Increase proxy connection timeout and make it configurable
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit d58c1c602c98e73c8c9176ceb6d4e1157b32102d
Author: Andrej Vano
AuthorDate: Thu Apr 4 14:19:19 2024 +0200
[NettyHttp] Increase proxy connection timeout and make it configurable
---
.../apache/camel/quarkus/component/http/common/HttpTestResource.java| 1 +
.../component/http/netty/ProxyCapableClientInitializerFactory.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git
a/integration-test-groups/http/common/src/test/java/org/apache/camel/quarkus/component/http/common/HttpTestResource.java
b/integration-test-groups/http/common/src/test/java/org/apache/camel/quarkus/component/http/common/HttpTestResource.java
index 72ddc21652..270e4dfdff 100644
---
a/integration-test-groups/http/common/src/test/java/org/apache/camel/quarkus/component/http/common/HttpTestResource.java
+++
b/integration-test-groups/http/common/src/test/java/org/apache/camel/quarkus/component/http/common/HttpTestResource.java
@@ -52,6 +52,7 @@ public class HttpTestResource implements
QuarkusTestResourceLifecycleManager {
"camel.netty-http.https-test-port",
"camel.netty-http.compression-test-port");
options.put("proxy.host", "localhost");
+options.put("proxy.connection.timeout", "1");
server = new ProxyServer(Integer.parseInt(options.get("proxy.port")),
USER_ADMIN, USER_ADMIN_PASSWORD);
server.start();
diff --git
a/integration-test-groups/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/ProxyCapableClientInitializerFactory.java
b/integration-test-groups/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/ProxyCapableClientInitializerFactory.java
index 9f3e544684..f1a8b36471 100644
---
a/integration-test-groups/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/ProxyCapableClientInitializerFactory.java
+++
b/integration-test-groups/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/ProxyCapableClientInitializerFactory.java
@@ -46,7 +46,7 @@ public class ProxyCapableClientInitializerFactory extends
HttpClientInitializerF
Integer proxyPort = config.getValue("proxy.port", Integer.class);
InetSocketAddress proxyServerAddress = new
InetSocketAddress(proxyHost, proxyPort);
HttpProxyHandler httpProxyHandler = new
HttpProxyHandler(proxyServerAddress, USER_ADMIN, USER_ADMIN_PASSWORD);
-httpProxyHandler.setConnectTimeoutMillis(5000);
+
httpProxyHandler.setConnectTimeoutMillis(config.getValue("proxy.connection.timeout",
Long.class));
super.initChannel(channel);
channel.pipeline().addFirst(httpProxyHandler);
}
(camel) branch main updated (2cfd8957b06 -> 80f1e21f440)
This is an automated email from the ASF dual-hosted git repository. fmariani pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 2cfd8957b06 Fixed wrong link new 3f19fbe0105 Add Spring Boot Docs new 80f1e21f440 Add Smb client configuration 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: .../org/apache/camel/catalog/components/smb.json | 37 +++--- .../camel/component/smb/SmbEndpointConfigurer.java | 11 +++ .../camel/component/smb/SmbEndpointUriFactory.java | 3 +- .../org/apache/camel/component/smb/smb.json| 37 +++--- .../camel-smb/src/main/docs/smb-component.adoc | 5 +++ .../camel/component/smb/SmbConfiguration.java | 15 + .../apache/camel/component/smb/SmbConsumer.java| 8 - .../apache/camel/component/smb/SmbComponentIT.java | 10 +- .../endpoint/dsl/SmbEndpointBuilderFactory.java| 33 +++ .../apache/camel/kotlin/components/SmbUriDsl.kt| 8 + 10 files changed, 128 insertions(+), 39 deletions(-)
(camel) 02/02: Add Smb client configuration
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 80f1e21f44048b45d284429df1ae95475291f1a9
Author: Croway
AuthorDate: Thu Apr 4 16:20:31 2024 +0200
Add Smb client configuration
---
.../org/apache/camel/catalog/components/smb.json | 37 +++---
.../camel/component/smb/SmbEndpointConfigurer.java | 11 +++
.../camel/component/smb/SmbEndpointUriFactory.java | 3 +-
.../org/apache/camel/component/smb/smb.json| 37 +++---
.../camel/component/smb/SmbConfiguration.java | 15 +
.../apache/camel/component/smb/SmbConsumer.java| 8 -
.../apache/camel/component/smb/SmbComponentIT.java | 10 +-
.../endpoint/dsl/SmbEndpointBuilderFactory.java| 33 +++
.../apache/camel/kotlin/components/SmbUriDsl.kt| 8 +
9 files changed, 123 insertions(+), 39 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smb.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smb.json
index 4991d5fe38f..28089712668 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smb.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smb.json
@@ -38,23 +38,24 @@
"exceptionHandler": { "index": 8, "kind": "parameter", "displayName":
"Exception Handler", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "autowired": false, "secret": false, "description": "To
let the consumer use a custom ExceptionHandler. Notice if the option
bridgeErrorHandler is enabled then this option is not in use. By def [...]
"exchangePattern": { "index": 9, "kind": "parameter", "displayName":
"Exchange Pattern", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ],
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the exchange pattern when the consumer creates an exchange." },
"pollStrategy": { "index": 10, "kind": "parameter", "displayName": "Poll
Strategy", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false,
"autowired": false, "secret": false, "description": "A pluggable
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your
custom implementation to control error handling usually occurred during the po
[...]
-"smbIoBean": { "index": 11, "kind": "parameter", "displayName": "Smb Io
Bean", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "org.apache.camel.component.smb.SmbIOBean", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.smb.SmbConfiguration", "configurationField":
"configuration", "description": "An optional SMB I\/O bean to use to setup the
file access attributes when reading\/writi [...]
-"backoffErrorThreshold": { "index": 12, "kind": "parameter",
"displayName": "Backoff Error Threshold", "group": "scheduler", "label":
"consumer,scheduler", "required": false, "type": "integer", "javaType": "int",
"deprecated": false, "autowired": false, "secret": false, "description": "The
number of subsequent error polls (failed due some error) that should happen
before the backoffMultipler should kick-in." },
-"backoffIdleThreshold": { "index": 13, "kind": "parameter", "displayName":
"Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler",
"required": false, "type": "integer", "javaType": "int", "deprecated": false,
"autowired": false, "secret": false, "description": "The number of subsequent
idle polls that should happen before the backoffMultipler should kick-in." },
-"backoffMultiplier": { "index": 14, "kind": "parameter", "displayName":
"Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler",
"required": false, "type": "integer", "javaType": "int", "deprecated": false,
"autowired": false, "secret": false, "description": "To let the scheduled
polling consumer backoff if there has been a number of subsequent idles\/errors
in a row. The multiplier is then the number of polls that will be skipped
before the next actual attempt is h [...]
-"delay": { "index": 15, "kind": "parameter", "displayName": "Delay",
"group": "scheduler", "label": "consumer,scheduler", "required": false, "type":
"integer", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 500, "description":
(camel) 01/02: Add Spring Boot Docs
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3f19fbe0105ef42eafd2c8d592f7f46447c9e294
Author: Croway
AuthorDate: Thu Apr 4 15:50:02 2024 +0200
Add Spring Boot Docs
---
components/camel-smb/src/main/docs/smb-component.adoc | 5 +
1 file changed, 5 insertions(+)
diff --git a/components/camel-smb/src/main/docs/smb-component.adoc
b/components/camel-smb/src/main/docs/smb-component.adoc
index a0a17d4f870..b52387b8ee0 100644
--- a/components/camel-smb/src/main/docs/smb-component.adoc
+++ b/components/camel-smb/src/main/docs/smb-component.adoc
@@ -7,6 +7,8 @@
:supportlevel: Stable
:tabs-sync-option:
:component-header: Only consumer is supported
+//Manually maintained attributes
+:camel-spring-boot-name: smb
*Since Camel {since}*
@@ -73,3 +75,6 @@ public void configure() {
Beware that the File object provided is not a `java.io.File` instance, but,
instead a `com.hierynomus.smbj.share.File` instance.
+
+
+include::spring-boot:partial$starter.adoc[]
(camel-quarkus) branch 3.8.x updated (7cf29c6fa1 -> d58c1c602c)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch 3.8.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 7cf29c6fa1 JT400 Inquiry test new 81f1308f94 Remove jsch container DOCKER_MODS configuration new d58c1c602c [NettyHttp] Increase proxy connection timeout and make it configurable 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: .../apache/camel/quarkus/component/http/common/HttpTestResource.java| 1 + .../component/http/netty/ProxyCapableClientInitializerFactory.java | 2 +- .../org/apache/camel/quarkus/component/jsch/it/JschTestResource.java| 1 - 3 files changed, 2 insertions(+), 2 deletions(-)
(camel-quarkus) 01/02: Remove jsch container DOCKER_MODS configuration
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 81f1308f94fab29a11a7f45ada94e552f8c6bef3
Author: James Netherton
AuthorDate: Thu Apr 4 12:34:01 2024 +0100
Remove jsch container DOCKER_MODS configuration
---
.../org/apache/camel/quarkus/component/jsch/it/JschTestResource.java | 1 -
1 file changed, 1 deletion(-)
diff --git
a/integration-tests/jsch/src/test/java/org/apache/camel/quarkus/component/jsch/it/JschTestResource.java
b/integration-tests/jsch/src/test/java/org/apache/camel/quarkus/component/jsch/it/JschTestResource.java
index 896d6fe60e..195cee2ed6 100644
---
a/integration-tests/jsch/src/test/java/org/apache/camel/quarkus/component/jsch/it/JschTestResource.java
+++
b/integration-tests/jsch/src/test/java/org/apache/camel/quarkus/component/jsch/it/JschTestResource.java
@@ -38,7 +38,6 @@ public class JschTestResource implements
QuarkusTestResourceLifecycleManager {
try {
container = new GenericContainer(JSCH_IMAGE)
.withExposedPorts(JSCH_PORT)
-.withEnv("DOCKER_MODS",
"linuxserver/mods:openssh-server-openssh-client")
.withEnv("PASSWORD_ACCESS", "true")
.withEnv("USER_NAME", USERNAME)
.withEnv("USER_PASSWORD", PASSWORD)
Re: [PR] [3.8.x] Removed jsch container and netty increased proxy connections [camel-quarkus]
jamesnetherton merged PR #5963: URL: https://github.com/apache/camel-quarkus/pull/5963 -- 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] Smb spring boot doc and client configuration [camel]
Croway merged PR #13702: URL: https://github.com/apache/camel/pull/13702 -- 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-examples) 01/01: Added an AWS Bedrock Example for Knowledge base (#78)
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-examples.git
commit bc1a7c40f273c5eb1f375e3e27a67db87ad293a0
Author: Andrea Cosentino
AuthorDate: Wed Apr 3 10:48:04 2024 +0200
Added an AWS Bedrock Example for Knowledge base (#78)
Signed-off-by: Andrea Cosentino
---
jbang/aws-bedrock-ingestion/BedrockPrompt.java | 66 ++
jbang/aws-bedrock-ingestion/Counter.java | 30 +++
jbang/aws-bedrock-ingestion/README.adoc| 243 +
jbang/aws-bedrock-ingestion/application.properties | 5 +
.../aws-bedrock-knowledgebase-session.camel.yaml | 43
jbang/aws-bedrock-ingestion/terraform/main.tf | 127 +++
6 files changed, 514 insertions(+)
diff --git a/jbang/aws-bedrock-ingestion/BedrockPrompt.java
b/jbang/aws-bedrock-ingestion/BedrockPrompt.java
new file mode 100644
index 000..59deb1b
--- /dev/null
+++ b/jbang/aws-bedrock-ingestion/BedrockPrompt.java
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ */
+
+//DEPS org.apache.camel:camel-bom:4.6.0-SNAPSHOT@pom
+//DEPS org.apache.camel:camel-aws-bedrock
+//DEPS org.apache.camel:camel-endpointdsl
+//DEPS org.apache.camel:camel-rest
+
+import org.apache.camel.BindToRegistry;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.rest.RestParamType;
+import org.apache.camel.component.aws2.bedrock.BedrockModels;
+import org.apache.camel.component.aws2.bedrock.runtime.BedrockConstants;
+import org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConstants;
+
+public class BedrockPrompt extends RouteBuilder {
+
+@Override
+public void configure() throws Exception {
+
+Counter counter = new Counter();
+
+rest("/bedrock")
+.get("/prompt").to("direct:invoke-bedrock")
+
.get("/ingestion_status/{id}").param().name("id").type(RestParamType.path).description("The
ingestion job
id").dataType("string").endParam().to("direct:invoke-ingestion-status");
+
+from("direct:invoke-bedrock")
+.setBody(constant("{{prompt}}"))
+
.to("aws-bedrock-agent-runtime:label?useDefaultCredentialsProvider=true=us-east-1=retrieveAndGenerate={{knowledgeBaseId}}="
++
BedrockModels.ANTROPHIC_CLAUDE_INSTANT_V1.model);
+
+from("direct:invoke-ingestion-status")
+
.toD("aws-bedrock-agent:label?useDefaultCredentialsProvider=true=us-east-1=getIngestionJob={{knowledgeBaseId}}={{dataSourceId}}=${header.id}").setBody(simple("${body.status.name}"));
+
+
from("aws2-sqs:{{sqsArn}}?deleteAfterRead=true=true")
+ .unmarshal().json()
+ .setProperty("s3-event-name", jsonpath("$.detail.reason"))
+ .choice()
+ .when(simple("${exchangeProperty.s3-event-name} == 'PutObject'"))
+ .bean(counter, "getCount()")
+ .end()
+ .choice()
+ .when(simple("${bean:counter?method=getCount} == 11"))
+ .log("Detected file upload in AWS S3. Starting ingestion process
to AWS Bedrock Knowledge Base.")
+ .setHeader(BedrockAgentConstants.KNOWLEDGE_BASE_ID,
constant("{{knowledgeBaseId}}"))
+ .setHeader(BedrockAgentConstants.DATASOURCE_ID,
constant("{{dataSourceId}}"))
+
.to("aws-bedrock-agent:label?useDefaultCredentialsProvider=true=us-east-1=startIngestionJob")
+ .log("The Ingestion Job Id is ${body}")
+ .end();
+
+}
+}
diff --git a/jbang/aws-bedrock-ingestion/Counter.java
b/jbang/aws-bedrock-ingestion/Counter.java
new file mode 100644
index 000..d10b9d8
--- /dev/null
+++ b/jbang/aws-bedrock-ingestion/Counter.java
@@ -0,0 +1,30 @@
+/*
+ * 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
+ *
+ *
(camel-kamelets-examples) branch main updated (b86268b -> bc1a7c4)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets-examples.git discard b86268b Aurelien Pupier's suggestion on description discard 40e55b0 Added AWS Bedrock Session with Bedrock agent runtime Sink (#80) omit 9fc85c8 Added License (#79) omit 8a28a2d Added an AWS Bedrock Example for Knowledge base (#78) new bc1a7c4 Added an AWS Bedrock Example for Knowledge base (#78) 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 (b86268b) \ N -- N -- N refs/heads/main (bc1a7c4) 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 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. Summary of changes: jbang/aws-bedrock-ingestion/README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[PR] (chores) minor test infra cleanup [camel]
orpiske opened a new pull request, #13703: URL: https://github.com/apache/camel/pull/13703 (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
[PR] chore: Upgrade golang.org/x/net [camel-k]
gansheer opened a new pull request, #5322: URL: https://github.com/apache/camel-k/pull/5322 Fix the security check: https://github.com/apache/camel-k/actions/runs/8553670220/job/23437323789 **Release Note** ```release-note chore: Upgrade golang.org/x/net ``` -- 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: [NettyHttp] Increase proxy connection timeout and make it configurable
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 a02012d329 [NettyHttp] Increase proxy connection timeout and make it
configurable
a02012d329 is described below
commit a02012d329518f5c226cea5dbe856acb1cc7494b
Author: Andrej Vano
AuthorDate: Thu Apr 4 14:19:19 2024 +0200
[NettyHttp] Increase proxy connection timeout and make it configurable
---
.../apache/camel/quarkus/component/http/common/HttpTestResource.java| 1 +
.../component/http/netty/ProxyCapableClientInitializerFactory.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git
a/integration-test-groups/http/common/src/test/java/org/apache/camel/quarkus/component/http/common/HttpTestResource.java
b/integration-test-groups/http/common/src/test/java/org/apache/camel/quarkus/component/http/common/HttpTestResource.java
index 72ddc21652..270e4dfdff 100644
---
a/integration-test-groups/http/common/src/test/java/org/apache/camel/quarkus/component/http/common/HttpTestResource.java
+++
b/integration-test-groups/http/common/src/test/java/org/apache/camel/quarkus/component/http/common/HttpTestResource.java
@@ -52,6 +52,7 @@ public class HttpTestResource implements
QuarkusTestResourceLifecycleManager {
"camel.netty-http.https-test-port",
"camel.netty-http.compression-test-port");
options.put("proxy.host", "localhost");
+options.put("proxy.connection.timeout", "1");
server = new ProxyServer(Integer.parseInt(options.get("proxy.port")),
USER_ADMIN, USER_ADMIN_PASSWORD);
server.start();
diff --git
a/integration-test-groups/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/ProxyCapableClientInitializerFactory.java
b/integration-test-groups/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/ProxyCapableClientInitializerFactory.java
index 9f3e544684..f1a8b36471 100644
---
a/integration-test-groups/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/ProxyCapableClientInitializerFactory.java
+++
b/integration-test-groups/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/ProxyCapableClientInitializerFactory.java
@@ -46,7 +46,7 @@ public class ProxyCapableClientInitializerFactory extends
HttpClientInitializerF
Integer proxyPort = config.getValue("proxy.port", Integer.class);
InetSocketAddress proxyServerAddress = new
InetSocketAddress(proxyHost, proxyPort);
HttpProxyHandler httpProxyHandler = new
HttpProxyHandler(proxyServerAddress, USER_ADMIN, USER_ADMIN_PASSWORD);
-httpProxyHandler.setConnectTimeoutMillis(5000);
+
httpProxyHandler.setConnectTimeoutMillis(config.getValue("proxy.connection.timeout",
Long.class));
super.initChannel(channel);
channel.pipeline().addFirst(httpProxyHandler);
}
Re: [PR] [NettyHttp] Increase proxy connection timeout and make it configurable [camel-quarkus]
jamesnetherton merged PR #5959: URL: https://github.com/apache/camel-quarkus/pull/5959 -- 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] Remove jsch container DOCKER_MODS configuration [camel-quarkus]
JiriOndrusek opened a new pull request, #5963: URL: https://github.com/apache/camel-quarkus/pull/5963 Cherry-pickd 71c8f4433c18513fdab48b48050891614d085f82 Upstream PR: https://github.com/apache/camel-quarkus/pull/5958 -- 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 3.8.x updated: JT400 Inquiry test
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/3.8.x by this push:
new 7cf29c6fa1 JT400 Inquiry test
7cf29c6fa1 is described below
commit 7cf29c6fa188ba510ac761251c9c14d58e3b83a1
Author: JiriOndrusek
AuthorDate: Thu Apr 4 10:18:37 2024 +0200
JT400 Inquiry test
---
integration-tests/jt400/README.adoc| 11 +-
.../quarkus/component/jt400/it/Jt400Resource.java | 50 ++-
.../quarkus/component/jt400/it/Jt400Routes.java| 59
.../src/main/resources/application.properties | 1 +
.../quarkus/component/jt400/it/Jt400Test.java | 154 ++---
5 files changed, 247 insertions(+), 28 deletions(-)
diff --git a/integration-tests/jt400/README.adoc
b/integration-tests/jt400/README.adoc
index 636c965e05..0fa4e22359 100644
--- a/integration-tests/jt400/README.adoc
+++ b/integration-tests/jt400/README.adoc
@@ -69,6 +69,13 @@ Message queue can be created by following the command
CRTMSGQ LIBRARY/TESTMSGQ
```
+
+Second queue is required for testing of inquiry messages:
+
+```
+CRTMSGQ LIBRARY/REPLYMSGQ
+```
+
Data queue testing
Two data-queues are required for the testing. One created as `keyed=true` and
one as `LIFO`.
@@ -90,6 +97,7 @@ export JT400_LIBRARY=#library_if_not_LIBRARY
export JT400_LIFO_QUEUE=#lifoqueue_if_not_TESTLIFO.DTAQ
export JT400_KEYED_QUEUE=#lkeyedqueue_if_not_TESTKEYED.DTAQ
export JT400_MESSAGE_QUEUE=#messagequeue_if_not_TESTMSGQ.MSGQ
+export JT400_MESSAGE_REPLYTO_QUEUE=#messagequeueinquiry_if_not_REPLYMSGQ.MSGQ
export JT400_USER_SPACE=#userspace_if_not_PROGCALL
```
@@ -99,6 +107,7 @@ or for Windows:
$Env:JT400_LIBRARY = "#library_if_not_LIBRARY"
$Env:JT400_LIFO_QUEUE="#lifoqueue_if_not_TESTLIFO.DTAQe"
$Env:JT400_KEYED_QUEUE="#lkeyedqueue_if_not_TESTKEYED.DTAQ"
-$Env:JT400_MESSAGE_QUEUE="#messagequeue_if_not_TESTMSGQ.MSGQe"
+$Env:JT400_MESSAGE_QUEUE="#messagequeue_if_not_TESTMSGQ.MSGQ"
+$Env:JT400_MESSAGE_REPLYTO_QUEUE="#messagequeueinquiry_if_not_REPLYMSGQ.MSGQ"
$Env:JT400_USER_SPACE="#userspace_if_not_PROGCALL"
```
\ No newline at end of file
diff --git
a/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/Jt400Resource.java
b/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/Jt400Resource.java
index b861f8a78f..c65f268978 100644
---
a/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/Jt400Resource.java
+++
b/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/Jt400Resource.java
@@ -21,6 +21,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
+import com.ibm.as400.access.AS400;
+import com.ibm.as400.access.MessageQueue;
import com.ibm.as400.access.QueuedMessage;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
@@ -31,6 +33,7 @@ import jakarta.ws.rs.Produces;
import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
+import org.apache.camel.CamelContext;
import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
@@ -45,7 +48,7 @@ public class Jt400Resource {
String jt400Url;
@ConfigProperty(name = "cq.jt400.username")
-String jt400USername;
+String jt400Username;
@ConfigProperty(name = "cq.jt400.password")
String jt400Password;
@@ -62,6 +65,9 @@ public class Jt400Resource {
@ConfigProperty(name = "cq.jt400.message-queue")
String jt400MessageQueue;
+@ConfigProperty(name = "cq.jt400.message-replyto-queue")
+String jt400MessageReplyToQueue;
+
@ConfigProperty(name = "cq.jt400.user-space")
String jt400UserSpace;
@@ -71,6 +77,9 @@ public class Jt400Resource {
@Inject
ConsumerTemplate consumerTemplate;
+@Inject
+CamelContext context;
+
@Path("/dataQueue/read/")
@POST
@Produces(MediaType.APPLICATION_JSON)
@@ -123,6 +132,36 @@ public class Jt400Resource {
return Response.ok().entity(ex).build();
}
+@Path("/client/inquiryMessage/write/")
+@POST
+@Produces(MediaType.TEXT_PLAIN)
+public Response clientInquiryMessageWrite(String data) throws Exception {
+Jt400Endpoint jt400Endpoint =
context.getEndpoint(getUrlForLibrary(jt400MessageReplyToQueue),
Jt400Endpoint.class);
+AS400 as400 = jt400Endpoint.getConfiguration().getConnection();
+//send inquiry message (with the same client as is used in the
component, to avoid `CPF2451 Message queue TESTMSGQ is allocated to another
job`.
+MessageQueue queue = new MessageQueue(as400,
jt400Endpoint.getConfiguration().getObjectPath());
+try {
+queue.sendInquiry(data, "/QSYS.LIB/" + jt400Library + ".LIB/" +
Re: [PR] [3.8.x] JT400 Inquiry test [camel-quarkus]
jamesnetherton merged PR #5955: URL: https://github.com/apache/camel-quarkus/pull/5955 -- 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: JT400 Inquiry test
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 599d861022 JT400 Inquiry test
599d861022 is described below
commit 599d861022b25286aa1001664c659262ab6feac3
Author: JiriOndrusek
AuthorDate: Thu Apr 4 10:18:37 2024 +0200
JT400 Inquiry test
---
integration-tests/jt400/README.adoc| 11 +-
.../quarkus/component/jt400/it/Jt400Resource.java | 50 ++-
.../quarkus/component/jt400/it/Jt400Routes.java| 59
.../src/main/resources/application.properties | 1 +
.../quarkus/component/jt400/it/Jt400Test.java | 154 ++---
5 files changed, 247 insertions(+), 28 deletions(-)
diff --git a/integration-tests/jt400/README.adoc
b/integration-tests/jt400/README.adoc
index 636c965e05..0fa4e22359 100644
--- a/integration-tests/jt400/README.adoc
+++ b/integration-tests/jt400/README.adoc
@@ -69,6 +69,13 @@ Message queue can be created by following the command
CRTMSGQ LIBRARY/TESTMSGQ
```
+
+Second queue is required for testing of inquiry messages:
+
+```
+CRTMSGQ LIBRARY/REPLYMSGQ
+```
+
Data queue testing
Two data-queues are required for the testing. One created as `keyed=true` and
one as `LIFO`.
@@ -90,6 +97,7 @@ export JT400_LIBRARY=#library_if_not_LIBRARY
export JT400_LIFO_QUEUE=#lifoqueue_if_not_TESTLIFO.DTAQ
export JT400_KEYED_QUEUE=#lkeyedqueue_if_not_TESTKEYED.DTAQ
export JT400_MESSAGE_QUEUE=#messagequeue_if_not_TESTMSGQ.MSGQ
+export JT400_MESSAGE_REPLYTO_QUEUE=#messagequeueinquiry_if_not_REPLYMSGQ.MSGQ
export JT400_USER_SPACE=#userspace_if_not_PROGCALL
```
@@ -99,6 +107,7 @@ or for Windows:
$Env:JT400_LIBRARY = "#library_if_not_LIBRARY"
$Env:JT400_LIFO_QUEUE="#lifoqueue_if_not_TESTLIFO.DTAQe"
$Env:JT400_KEYED_QUEUE="#lkeyedqueue_if_not_TESTKEYED.DTAQ"
-$Env:JT400_MESSAGE_QUEUE="#messagequeue_if_not_TESTMSGQ.MSGQe"
+$Env:JT400_MESSAGE_QUEUE="#messagequeue_if_not_TESTMSGQ.MSGQ"
+$Env:JT400_MESSAGE_REPLYTO_QUEUE="#messagequeueinquiry_if_not_REPLYMSGQ.MSGQ"
$Env:JT400_USER_SPACE="#userspace_if_not_PROGCALL"
```
\ No newline at end of file
diff --git
a/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/Jt400Resource.java
b/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/Jt400Resource.java
index b861f8a78f..c65f268978 100644
---
a/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/Jt400Resource.java
+++
b/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/Jt400Resource.java
@@ -21,6 +21,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
+import com.ibm.as400.access.AS400;
+import com.ibm.as400.access.MessageQueue;
import com.ibm.as400.access.QueuedMessage;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
@@ -31,6 +33,7 @@ import jakarta.ws.rs.Produces;
import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
+import org.apache.camel.CamelContext;
import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
@@ -45,7 +48,7 @@ public class Jt400Resource {
String jt400Url;
@ConfigProperty(name = "cq.jt400.username")
-String jt400USername;
+String jt400Username;
@ConfigProperty(name = "cq.jt400.password")
String jt400Password;
@@ -62,6 +65,9 @@ public class Jt400Resource {
@ConfigProperty(name = "cq.jt400.message-queue")
String jt400MessageQueue;
+@ConfigProperty(name = "cq.jt400.message-replyto-queue")
+String jt400MessageReplyToQueue;
+
@ConfigProperty(name = "cq.jt400.user-space")
String jt400UserSpace;
@@ -71,6 +77,9 @@ public class Jt400Resource {
@Inject
ConsumerTemplate consumerTemplate;
+@Inject
+CamelContext context;
+
@Path("/dataQueue/read/")
@POST
@Produces(MediaType.APPLICATION_JSON)
@@ -123,6 +132,36 @@ public class Jt400Resource {
return Response.ok().entity(ex).build();
}
+@Path("/client/inquiryMessage/write/")
+@POST
+@Produces(MediaType.TEXT_PLAIN)
+public Response clientInquiryMessageWrite(String data) throws Exception {
+Jt400Endpoint jt400Endpoint =
context.getEndpoint(getUrlForLibrary(jt400MessageReplyToQueue),
Jt400Endpoint.class);
+AS400 as400 = jt400Endpoint.getConfiguration().getConnection();
+//send inquiry message (with the same client as is used in the
component, to avoid `CPF2451 Message queue TESTMSGQ is allocated to another
job`.
+MessageQueue queue = new MessageQueue(as400,
jt400Endpoint.getConfiguration().getObjectPath());
+try {
+queue.sendInquiry(data, "/QSYS.LIB/" + jt400Library + ".LIB/" +
Re: [PR] JT400 Inquiry test [camel-quarkus]
jamesnetherton merged PR #5954: URL: https://github.com/apache/camel-quarkus/pull/5954 -- 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] Jt400: test for replying to an inquiry message on a message queue is missing [camel-quarkus]
jamesnetherton closed issue #5953: Jt400: test for replying to an inquiry message on a message queue is missing URL: https://github.com/apache/camel-quarkus/issues/5953 -- 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] Smb spring boot doc and client configuration [camel]
github-actions[bot] commented on PR #13702: URL: https://github.com/apache/camel/pull/13702#issuecomment-2037352269 :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] Smb spring boot doc and client configuration [camel]
Croway opened a new pull request, #13702: URL: https://github.com/apache/camel/pull/13702 # 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
Re: [PR] fatal error: concurrent map read and map write [camel-k]
christophd commented on PR #5317: URL: https://github.com/apache/camel-k/pull/5317#issuecomment-2037323925 I tried to solve this in the E2E test setup (with mutex lock) where the clients get instantiated (see https://github.com/apache/camel-k/blob/main/e2e/support/test_support.go#L165). But looking closer at the code I see that the kamel install command will always use a new client instance and this can lead to the concurrent map write. So the proposed solution here makes sense to me. I do not know if this synchronization has some other side effects though. How about synchronizing the `NewOutOfClusterClient` func which is used by kamel CLI so we do not harm any operator client usage? Also I would remove the mutex lock that I have introduced in the test support then to avoid duplicate locking. -- 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-examples) branch main updated: Add openapi contract first example
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-examples.git The following commit(s) were added to refs/heads/main by this push: new 17bc93e Add openapi contract first example 17bc93e is described below commit 17bc93ef953d5ccffd0a88a82c32d1945292acb7 Author: Claus Ibsen AuthorDate: Thu Apr 4 16:05:22 2024 +0200 Add openapi contract first example --- openapi-contract-first/readme.adoc | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openapi-contract-first/readme.adoc b/openapi-contract-first/readme.adoc index 7ae3316..7192adb 100644 --- a/openapi-contract-first/readme.adoc +++ b/openapi-contract-first/readme.adoc @@ -35,7 +35,6 @@ curl -XPUT -H "Content-Type: application/json" --data "@daisy.json" http://0.0.0 - === Camel CLI This application is integrated with the Camel CLI (camel-jbang) via the `camel-cli-connector-starter` dependency (see `pom.xml`). @@ -49,6 +48,11 @@ And then use the CLI to see status: PID NAME CAMEL PLATFORMPROFILE READY STATUS RELOAD AGE ROUTE MSG/S TOTAL FAIL INFLIGHT LAST DELTA SINCE-LAST 87918 CamelPetStore 4.6.0 Spring Boot v3.2.41/1 Running 0 7s3/3 0.00 0 0 0-/-/- +To see which Rest APIs that are available in the running Camel application, you can use camel-jbang as follows: + +$camel get service + + === Help and contributions If you hit any problem using Camel or have some feedback, then please
(camel-spring-boot) branch main updated: CAMEL-20650: camel-spring-boot - Platform http should report server port
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 7b7899114b3 CAMEL-20650: camel-spring-boot - Platform http should
report server port
7b7899114b3 is described below
commit 7b7899114b3c2d42767fabc09e621dd1769bcf73
Author: Claus Ibsen
AuthorDate: Thu Apr 4 16:03:38 2024 +0200
CAMEL-20650: camel-spring-boot - Platform http should report server port
---
.../springboot/SpringBootPlatformHttpAutoConfiguration.java| 6 --
.../platform/http/springboot/SpringBootPlatformHttpEngine.java | 10 ++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git
a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpAutoConfiguration.java
b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpAutoConfiguration.java
index 49dc21d1282..e604dff895e 100644
---
a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpAutoConfiguration.java
+++
b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpAutoConfiguration.java
@@ -25,6 +25,7 @@ import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.DependsOn;
+import org.springframework.core.env.Environment;
@Configuration(proxyBeanMethods = false)
@AutoConfigureAfter(name = {
"org.apache.camel.component.servlet.springboot.PlatformHttpComponentAutoConfiguration",
@@ -36,8 +37,9 @@ public class SpringBootPlatformHttpAutoConfiguration {
@Bean(name = "platform-http-engine")
@ConditionalOnMissingBean(PlatformHttpEngine.class)
-public PlatformHttpEngine springBootPlatformHttpEngine() {
-return new SpringBootPlatformHttpEngine();
+public PlatformHttpEngine springBootPlatformHttpEngine(Environment env) {
+int port = Integer.parseInt(env.getProperty("server.port", "8080"));
+return new SpringBootPlatformHttpEngine(port);
}
@Bean
diff --git
a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngine.java
b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngine.java
index 5e589367509..0e99fd19a60 100644
---
a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngine.java
+++
b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngine.java
@@ -23,9 +23,19 @@ import
org.apache.camel.component.platform.http.spi.PlatformHttpEngine;
public class SpringBootPlatformHttpEngine implements PlatformHttpEngine {
+private final int port;
+
+public SpringBootPlatformHttpEngine(int port) {
+this.port = port;
+}
+
@Override
public Consumer createConsumer(PlatformHttpEndpoint endpoint, Processor
processor) {
return new SpringBootPlatformHttpConsumer(endpoint, processor);
}
+@Override
+public int getServerPort() {
+return port;
+}
}
[PR] CAMEL-20649: stop using a custom Apache Artemis container [camel]
orpiske opened a new pull request, #13701: URL: https://github.com/apache/camel/pull/13701 (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
Re: [PR] feat: camel k 2.3.0 [camel-website]
christophd commented on code in PR #1169: URL: https://github.com/apache/camel-website/pull/1169#discussion_r1551729139 ## content/blog/2024/04/camel-k-2-3/index.md: ## @@ -0,0 +1,66 @@ +--- +title: "Camel K 2.3.0" +date: 2024-04-08 +draft: false +authors: [squakez] +categories: ["Releases", "Camel K", "Roadmap"] +preview: "What's new in Camel K 2.3.0!" +--- +© Sir John Soane’s Museum London + +Apache Camel community is happy to announce the general availability of **Camel K 2.3.0**. This release version contains several fix which are increasing the operator stability and a few hidden changes which are making the software more modular, therefore future feature development quicker and independent from the Camel runtime chosen. + +First of all, we have changed the default runtime to Camel K Runtime version 3.8.1 which is based on same Camel Quarkus version (and Camel 4.4.1 version). It follows a list of the most important features you'll be able to use from now on. + +## Multi architecture manifest (ARM64) +The possibility to run an ARM64 based platform was already available since version 2.0. However, the procedure to run the new architecture platform was a bit clumsy as you had to declare most of the things manually. In this version we have published a manifest that will contain the various architecture we support (AMD64 and ARM64). Your cloud provider will be able to pick the right platform from the manifest, freeing you up from specifying the platform. + +In order to maintain backward compatibility we still had to let the user declare which is the platform to use introducing the `builder.platforms` trait configuration. Configure this parameter either in each Integration or in general into the IntegrationPlatform in order to specify which platform you want to run for all your Integrations. +``` +kamel run test.yaml -t builder.platforms=linux/arm64 -t builder.platforms=linux/amd64 + +``` + +## Add support for Strimzi Kafka +In this release we've dedicated a bit of time to enhance the user experience when it comes to use Kafka into your Integrations. From now on you'll be able to use Strimzi Kafka Custom Resource out of the box in a Pipe declaration. Here a brief example: +``` +apiVersion: camel.apache.org/v1 +kind: Pipe +... +spec: + source: +... + sink: +ref: + apiVersion: kafka.strimzi.io/v1beta2 + kind: Kafka + name: my-cluster +properties: + topic: "my-topic" +``` + +## Polish Integration conditions +Running a software in Kubernetes always come with the requirement to be able to observe and understand what's going on. We've worked on a series of enhancement to include more custom resources conditions and let you be able to inspect what's going on on an Integration or the Build which have started. Just to name a few of them we've included the list of Integration and IntegrationKit traits execution, those warning or deprecation notices that a trait used to log on operator log only and a Build waiting condition (to let you know that the Build is queued for a given reason). + +Hopefully these information are helping your SRE duties. + +## Publishing strategy +In the previous Camel K versions we had deprecated certain supported publishing strategy. We have decided to remove them in this version in order to have an easier maintenance. We have also decided to default [Jib](https://github.com/GoogleContainerTools/jib) as publishing strategy for plain Kubernetes providers (S2I is still the default of Openshift). As we know this may potentially affect some user out there, we've provided a guideline to [adopt your own publishing strategy](/camel-k/next/pipeline/pipeline.html#build-pipeline-examples-buildah). + +Mind that the [Spectrum](https://github.com/container-tools/spectrum) strategy will be very likely deprecated in future version of Camel K, leaving Jib as the only publishing strategy available out of the box. If you're still using it, you may think to start migrating to Jib as soon as possible. + Review Comment: ```suggestion ## Introduce IntegrationProfile custom resource The new IntegrationProfile custom resource allows users overwrite settings (e.g. trait configurations) for multiple integrations that all reference the same profile. The IntegrationProfile resource is keen to replace the namespace local IntegrationPlatform as well as the secondary platform. In contrast to the IntegrationPlatform resource the IntegrationProfile only exposes a subset of settings that are eligible to be controlled on a user namespace level. In upcoming releases the IntegrationPlatform is meant to be an operator resource with restricted access (e.g. only adjustable by cluster admins). You can now start using the IntegrationProfile as a declarative approach to adjusting settings for multiple integrations. ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on
Re: [PR] Remove jsch container DOCKER_MODS configuration [camel-quarkus]
jamesnetherton commented on PR #5958: URL: https://github.com/apache/camel-quarkus/pull/5958#issuecomment-2037266650 Seems that helped to fix things. -- 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: Remove jsch container DOCKER_MODS configuration
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 71c8f4433c Remove jsch container DOCKER_MODS configuration
71c8f4433c is described below
commit 71c8f4433c18513fdab48b48050891614d085f82
Author: James Netherton
AuthorDate: Thu Apr 4 12:34:01 2024 +0100
Remove jsch container DOCKER_MODS configuration
---
.../org/apache/camel/quarkus/component/jsch/it/JschTestResource.java | 1 -
1 file changed, 1 deletion(-)
diff --git
a/integration-tests/jsch/src/test/java/org/apache/camel/quarkus/component/jsch/it/JschTestResource.java
b/integration-tests/jsch/src/test/java/org/apache/camel/quarkus/component/jsch/it/JschTestResource.java
index 896d6fe60e..195cee2ed6 100644
---
a/integration-tests/jsch/src/test/java/org/apache/camel/quarkus/component/jsch/it/JschTestResource.java
+++
b/integration-tests/jsch/src/test/java/org/apache/camel/quarkus/component/jsch/it/JschTestResource.java
@@ -38,7 +38,6 @@ public class JschTestResource implements
QuarkusTestResourceLifecycleManager {
try {
container = new GenericContainer(JSCH_IMAGE)
.withExposedPorts(JSCH_PORT)
-.withEnv("DOCKER_MODS",
"linuxserver/mods:openssh-server-openssh-client")
.withEnv("PASSWORD_ACCESS", "true")
.withEnv("USER_NAME", USERNAME)
.withEnv("USER_PASSWORD", PASSWORD)
Re: [PR] Remove jsch container DOCKER_MODS configuration [camel-quarkus]
jamesnetherton merged PR #5958: URL: https://github.com/apache/camel-quarkus/pull/5958 -- 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] camel-quarkus-spring-redis doesn't autowire RedisTemplate so it cannot be used for e.g. RedisIdempotentRepository [camel-quarkus]
jamesnetherton commented on issue #5962: URL: https://github.com/apache/camel-quarkus/issues/5962#issuecomment-2037264953 In order to `@Inject` `RedisTemplate` you need to [produce](https://quarkus.io/guides/cdi-reference#simplified-producer-method-declaration) a bean of that type somewhere in your application. If you don't need any special customisation of the `RedisTemplate`, then you can use the simplified constructor: https://github.com/apache/camel/blob/camel-4.4.1/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepository.java#L41-L47 -- 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: Fixed wrong link
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 2cfd8957b06 Fixed wrong link 2cfd8957b06 is described below commit 2cfd8957b061e15342fc70b300c762309de19f4f Author: Claus Ibsen AuthorDate: Thu Apr 4 15:40:43 2024 +0200 Fixed wrong link --- docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide.adoc index 903ec6b126e..e7db916f0a0 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide.adoc @@ -14,5 +14,5 @@ You can find upgrade guide for each release in the following pages: - xref:camel-4x-upgrade-guide-4_3.adoc[Upgrade guide 4.2 -> 4.3] - xref:camel-4x-upgrade-guide-4_4.adoc[Upgrade guide 4.3 -> 4.4] - xref:camel-4x-upgrade-guide-4_5.adoc[Upgrade guide 4.4 -> 4.5] -- xref:camel-4x-upgrade-guide-4_5.adoc[Upgrade guide 4.5 -> 4.6] +- xref:camel-4x-upgrade-guide-4_6.adoc[Upgrade guide 4.5 -> 4.6]
(camel) branch CAMEL-20562 deleted (was fdb23dbc4d5)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch CAMEL-20562 in repository https://gitbox.apache.org/repos/asf/camel.git was fdb23dbc4d5 CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 7B Instruct 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] CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral … [camel]
oscerd merged PR #13700: URL: https://github.com/apache/camel/pull/13700 -- 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-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 7B Instruct (#13700)
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.git
The following commit(s) were added to refs/heads/main by this push:
new 663029a99f9 CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models
- Mistral 7B Instruct (#13700)
663029a99f9 is described below
commit 663029a99f914b59da2f0c5b3096166c592bc55b
Author: Andrea Cosentino
AuthorDate: Thu Apr 4 15:37:59 2024 +0200
CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 7B
Instruct (#13700)
Signed-off-by: Andrea Cosentino
---
.../component/aws2/bedrock/BedrockModels.java | 3 ++-
.../aws2/bedrock/runtime/BedrockProducer.java | 13 ++
.../runtime/integration/BedrockProducerIT.java | 29 ++
3 files changed, 44 insertions(+), 1 deletion(-)
diff --git
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java
index ecbf2966a9d..c7688b50286 100644
---
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java
+++
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java
@@ -28,7 +28,8 @@ public enum BedrockModels {
ANTROPHIC_CLAUDE_V2("anthropic.claude-v2"),
ANTROPHIC_CLAUDE_V2_1("anthropic.claude-v2:1"),
ANTROPHIC_CLAUDE_V3("anthropic.claude-3-sonnet-20240229-v1:0"),
-ANTROPHIC_CLAUDE_HAIKU_V3("anthropic.claude-3-haiku-20240307-v1:0");
+ANTROPHIC_CLAUDE_HAIKU_V3("anthropic.claude-3-haiku-20240307-v1:0"),
+MISTRAL_7B_INSTRUCT("mistral.mistral-7b-instruct-v0:2");
public final String model;
diff --git
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockProducer.java
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockProducer.java
index 98f48abbcd1..8a2a3fffdd0 100644
---
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockProducer.java
+++
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockProducer.java
@@ -256,6 +256,13 @@ public class BedrockProducer extends DefaultProducer {
throw new RuntimeException(e);
}
}
+case "mistral.mistral-7b-instruct-v0:2" -> {
+try {
+setMistralText(result, message);
+} catch (JsonProcessingException e) {
+throw new RuntimeException(e);
+}
+}
default -> throw new IllegalStateException("Unexpected value: " +
getConfiguration().getModelId());
}
}
@@ -282,6 +289,12 @@ public class BedrockProducer extends DefaultProducer {
message.setBody(jsonString);
}
+private void setMistralText(InvokeModelResponse result, Message message)
throws JsonProcessingException {
+ObjectMapper mapper = new ObjectMapper();
+JsonNode jsonString = mapper.readTree(result.body().asUtf8String());
+message.setBody(jsonString);
+}
+
public static Message getMessageForResponse(final Exchange exchange) {
return exchange.getMessage();
}
diff --git
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
index 05f720a0a60..52111a22f97 100644
---
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
+++
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
@@ -374,6 +374,29 @@ class BedrockProducerIT extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
}
+@Test
+public void testInvokeMistral7BInstructModel() throws InterruptedException
{
+
+result.expectedMessageCount(1);
+final Exchange result =
template.send("direct:send_mistral_7b_instruct_model", exchange -> {
+ObjectMapper mapper = new ObjectMapper();
+ObjectNode rootNode = mapper.createObjectNode();
+rootNode.putIfAbsent("prompt",
+new TextNode("\"[INST] Can you tell the history of
Mayflower? [/INST]\\\""));
+
+rootNode.putIfAbsent("max_tokens", new IntNode(300));
+rootNode.putIfAbsent("temperature", new DoubleNode(0.5));
+rootNode.putIfAbsent("top_p", new DoubleNode(0.9));
+
[I] camel-quarkus-spring-redis doesn't autowire RedisTemplate so it cannot be used for e.g. RedisIdempotentRepository [camel-quarkus]
JesperBerggren opened a new issue, #5962:
URL: https://github.com/apache/camel-quarkus/issues/5962
### Bug description
The extension _camel-quarkus-spring-redis_ doesn't seem to autowire
_RedisTemplate_ which is needed for _RedisIdempotentRepository_.
I've got this dependency:
```
org.apache.camel.quarkus
camel-quarkus-spring-redis
```
And in my code I have something like this:
```
@ApplicationScoped
public class CommonRoutes extends RouteBuilder {
public static final int SUCCESS = 100;
public static final int ERROR = 200;
public static final int EXHAUSTED = 300;
@ConfigProperty(name = "url")
private String url;
@ConfigProperty(name = "max.retry.count")
private String maxRetryCnt;
@ConfigProperty(name = "ordning")
private String ordning;
@Inject
private CamelContext context;
@Inject
private RedisTemplate redisTemplate;
@Override
public void configure() throws Exception {
// Redis idempotent repository
RedisIdempotentRepository redisIdempotentRepository = new
RedisIdempotentRepository(redisTemplate, "NGDP.KvitteringOpsamler");
context.getRegistry().bind("redisIdempotentRepo",
redisIdempotentRepository);
...
```
But when I run my code I get these exceptions:
```
java.lang.RuntimeException:
java.lang.RuntimeException: io.quarkus.builder.BuildException: Build
failure: Build failed due to errors
[error]: Build step io.quarkus.arc.deployment.ArcProcessor#validate
threw an exception: jakarta.enterprise.inject.spi.DeploymentException: Found 4
deployment problems:
[1] Unsatisfied dependency for type
org.springframework.data.redis.core.RedisTemplate and qualifiers [@Default]
- injection target:
dk.atp.integration.dp.kvitteringopsamler.FileRouter#redisTemplate
- declared on CLASS bean
[types=[org.apache.camel.builder.BuilderSupport, org.apache.camel.Ordered,
org.apache.camel.CamelContextAware, org.apache.camel.spi.ResourceAware,
org.apache.camel.spi.HasCamelContext,
dk.atp.integration.dp.kvitteringopsamler.FileRouter,
org.apache.camel.RoutesBuilder, java.lang.Object,
org.apache.camel.builder.ModelRoutesBuilder,
org.apache.camel.builder.RouteBuilder], qualifiers=[@Default, @Any],
target=dk.atp.integration.dp.kvitteringopsamler.FileRouter]
[2] Unsatisfied dependency for type
org.springframework.data.redis.core.RedisTemplate and qualifiers [@Default]
- injection target:
dk.atp.integration.dp.kvitteringopsamler.MailRouter#redisTemplate
- declared on CLASS bean
[types=[org.apache.camel.builder.BuilderSupport, org.apache.camel.Ordered,
org.apache.camel.CamelContextAware, org.apache.camel.spi.ResourceAware,
dk.atp.integration.dp.kvitteringopsamler.MailRouter,
org.apache.camel.spi.HasCamelContext, org.apache.camel.RoutesBuilder,
java.lang.Object, org.apache.camel.builder.ModelRoutesBuilder,
org.apache.camel.builder.RouteBuilder], qualifiers=[@Default, @Any],
target=dk.atp.integration.dp.kvitteringopsamler.MailRouter]
[3] Unsatisfied dependency for type
org.springframework.data.redis.core.RedisTemplate and qualifiers [@Default]
- injection target:
dk.atp.integration.dp.kvitteringopsamler.CommonRoutes#redisTemplate
- declared on CLASS bean
[types=[org.apache.camel.builder.BuilderSupport, org.apache.camel.Ordered,
org.apache.camel.CamelContextAware, org.apache.camel.spi.ResourceAware,
org.apache.camel.spi.HasCamelContext, org.apache.camel.RoutesBuilder,
java.lang.Object, dk.atp.integration.dp.kvitteringopsamler.CommonRoutes,
org.apache.camel.builder.ModelRoutesBuilder,
org.apache.camel.builder.RouteBuilder], qualifiers=[@Default, @Any],
target=dk.atp.integration.dp.kvitteringopsamler.CommonRoutes]
[4] Unsatisfied dependency for type
org.springframework.data.redis.core.RedisTemplate and qualifiers [@Default]
- injection target:
dk.atp.integration.dp.kvitteringopsamler.DatabaseRouter#redisTemplate
- declared on CLASS bean
[types=[org.apache.camel.builder.BuilderSupport, org.apache.camel.Ordered,
org.apache.camel.CamelContextAware,
dk.atp.integration.dp.kvitteringopsamler.DatabaseRouter,
org.apache.camel.spi.ResourceAware, org.apache.camel.spi.HasCamelContext,
org.apache.camel.RoutesBuilder, java.lang.Object,
org.apache.camel.builder.ModelRoutesBuilder,
org.apache.camel.builder.RouteBuilder], qualifiers=[@Default, @Any],
target=dk.atp.integration.dp.kvitteringopsamler.DatabaseRouter]
at
io.quarkus.arc.processor.BeanDeployment.processErrors(BeanDeployment.java:1516)
at io.quarkus.arc.processor.BeanDeployment.init(BeanDeployment.java:320)
at
io.quarkus.arc.processor.BeanProcessor.initialize(BeanProcessor.java:160)
at
io.quarkus.arc.deployment.ArcProcessor.validate(ArcProcessor.java:488)
at
Re: [PR] CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral … [camel]
github-actions[bot] commented on PR #13700: URL: https://github.com/apache/camel/pull/13700#issuecomment-2037217232 :robot: The Apache Camel test robot will run the tests for you :+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] CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral … [camel]
oscerd commented on PR #13700: URL: https://github.com/apache/camel/pull/13700#issuecomment-2037216449 /component-test aws -- 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/01: CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 7B Instruct
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch CAMEL-20562
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fdb23dbc4d5ce8ed6a8b43ff186cf5b29c497aa9
Author: Andrea Cosentino
AuthorDate: Thu Apr 4 15:05:42 2024 +0200
CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 7B
Instruct
Signed-off-by: Andrea Cosentino
---
.../component/aws2/bedrock/BedrockModels.java | 3 ++-
.../aws2/bedrock/runtime/BedrockProducer.java | 13 ++
.../runtime/integration/BedrockProducerIT.java | 29 ++
3 files changed, 44 insertions(+), 1 deletion(-)
diff --git
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java
index ecbf2966a9d..c7688b50286 100644
---
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java
+++
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java
@@ -28,7 +28,8 @@ public enum BedrockModels {
ANTROPHIC_CLAUDE_V2("anthropic.claude-v2"),
ANTROPHIC_CLAUDE_V2_1("anthropic.claude-v2:1"),
ANTROPHIC_CLAUDE_V3("anthropic.claude-3-sonnet-20240229-v1:0"),
-ANTROPHIC_CLAUDE_HAIKU_V3("anthropic.claude-3-haiku-20240307-v1:0");
+ANTROPHIC_CLAUDE_HAIKU_V3("anthropic.claude-3-haiku-20240307-v1:0"),
+MISTRAL_7B_INSTRUCT("mistral.mistral-7b-instruct-v0:2");
public final String model;
diff --git
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockProducer.java
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockProducer.java
index 98f48abbcd1..8a2a3fffdd0 100644
---
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockProducer.java
+++
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockProducer.java
@@ -256,6 +256,13 @@ public class BedrockProducer extends DefaultProducer {
throw new RuntimeException(e);
}
}
+case "mistral.mistral-7b-instruct-v0:2" -> {
+try {
+setMistralText(result, message);
+} catch (JsonProcessingException e) {
+throw new RuntimeException(e);
+}
+}
default -> throw new IllegalStateException("Unexpected value: " +
getConfiguration().getModelId());
}
}
@@ -282,6 +289,12 @@ public class BedrockProducer extends DefaultProducer {
message.setBody(jsonString);
}
+private void setMistralText(InvokeModelResponse result, Message message)
throws JsonProcessingException {
+ObjectMapper mapper = new ObjectMapper();
+JsonNode jsonString = mapper.readTree(result.body().asUtf8String());
+message.setBody(jsonString);
+}
+
public static Message getMessageForResponse(final Exchange exchange) {
return exchange.getMessage();
}
diff --git
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
index 05f720a0a60..52111a22f97 100644
---
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
+++
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
@@ -374,6 +374,29 @@ class BedrockProducerIT extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
}
+@Test
+public void testInvokeMistral7BInstructModel() throws InterruptedException
{
+
+result.expectedMessageCount(1);
+final Exchange result =
template.send("direct:send_mistral_7b_instruct_model", exchange -> {
+ObjectMapper mapper = new ObjectMapper();
+ObjectNode rootNode = mapper.createObjectNode();
+rootNode.putIfAbsent("prompt",
+new TextNode("\"[INST] Can you tell the history of
Mayflower? [/INST]\\\""));
+
+rootNode.putIfAbsent("max_tokens", new IntNode(300));
+rootNode.putIfAbsent("temperature", new DoubleNode(0.5));
+rootNode.putIfAbsent("top_p", new DoubleNode(0.9));
+rootNode.putIfAbsent("top_k", new IntNode(50));
+
+
exchange.getMessage().setBody(mapper.writer().writeValueAsString(rootNode));
+
Re: [PR] CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral … [camel]
github-actions[bot] commented on PR #13700: URL: https://github.com/apache/camel/pull/13700#issuecomment-2037216554 :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] CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral … [camel]
oscerd opened a new pull request, #13700: URL: https://github.com/apache/camel/pull/13700 …7B Instruct # Description # Target - [x] 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
(camel) branch CAMEL-20562 created (now fdb23dbc4d5)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch CAMEL-20562 in repository https://gitbox.apache.org/repos/asf/camel.git at fdb23dbc4d5 CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 7B Instruct This branch includes the following new commits: new fdb23dbc4d5 CAMEL-20562 - Camel-AWS-Bedrock: Support Mistral AI models - Mistral 7B Instruct 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.
Re: [PR] Upgrade ArangoDB clien + use the latest container [camel]
orpiske commented on PR #13699: URL: https://github.com/apache/camel/pull/13699#issuecomment-2037202343 Depends on #13698 ... I'll merge later on after I run it on my CI. -- 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] How to set the "camel.sink.endpoint.sslContextParameters" in the CamelHttpsSinkConnector.properties [camel-kafka-connector]
oscerd commented on issue #1610: URL: https://github.com/apache/camel-kafka-connector/issues/1610#issuecomment-2037201652 What version of the connector are you using? -- 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] Upgrade ArangoDB clien + use the latest container [camel]
github-actions[bot] commented on PR #13699: URL: https://github.com/apache/camel/pull/13699#issuecomment-2037200236 :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] Upgrade ArangoDB clien + use the latest container [camel]
orpiske opened a new pull request, #13699: URL: https://github.com/apache/camel/pull/13699 (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) 02/02: CAMEL-20557: Rest DSL to use openapi spec directly
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
commit 3e03b8e2c508159b6af8a975ce7f877e16f393ea
Author: Claus Ibsen
AuthorDate: Thu Apr 4 15:08:12 2024 +0200
CAMEL-20557: Rest DSL to use openapi spec directly
---
.../component/rest/openapi/RestOpenApiProcessor.java | 15 ---
1 file changed, 15 deletions(-)
diff --git
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
index 06a362fa789..888cea1fa25 100644
---
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
+++
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
@@ -27,14 +27,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Function;
import java.util.stream.Collectors;
-<<< HEAD
-===
-import jakarta.xml.bind.annotation.XmlRootElement;
-
-import javax.annotation.processing.Generated;
-
-import com.fasterxml.jackson.annotation.JsonTypeName;
->>> 7d080d57250 (CAMEL-20557: Rest DSL to use openapi spec directly)
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.Content;
@@ -517,15 +509,8 @@ public class RestOpenApiProcessor extends
DelegateAsyncProcessor implements Came
"OpenAPI binding classes package scan");
String[] pcks = base.split(",");
PackageScanClassResolver resolver =
PluginHelper.getPackageScanClassResolver(camelContext);
-<<< HEAD
// just add all classes as the POJOs can be generated with all
kind of tools and with and without annotations
scannedClasses.addAll(resolver.findImplementations(Object.class, pcks));
-===
-// discover POJO generated classes for JSon/XML
-scannedClasses.addAll(resolver.findAnnotated(Generated.class,
pcks));
-
scannedClasses.addAll(resolver.findAnnotated(JsonTypeName.class, pcks));
-
scannedClasses.addAll(resolver.findAnnotated(XmlRootElement.class, pcks));
->>> 7d080d57250 (CAMEL-20557: Rest DSL to use openapi spec directly)
if (!scannedClasses.isEmpty()) {
LOG.info("Binding package scan found {} classes in
packages: {}", scannedClasses.size(), base);
}
(camel) 01/02: CAMEL-20557: Rest DSL to use openapi spec directly
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
commit e070aae9898ebc4bfd5c3fd25673248f1a63b9dd
Author: Claus Ibsen
AuthorDate: Thu Apr 4 11:03:55 2024 +0200
CAMEL-20557: Rest DSL to use openapi spec directly
---
.../component/rest/openapi/RestOpenApiProcessor.java | 15 +++
1 file changed, 15 insertions(+)
diff --git
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
index 888cea1fa25..06a362fa789 100644
---
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
+++
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
@@ -27,6 +27,14 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Function;
import java.util.stream.Collectors;
+<<< HEAD
+===
+import jakarta.xml.bind.annotation.XmlRootElement;
+
+import javax.annotation.processing.Generated;
+
+import com.fasterxml.jackson.annotation.JsonTypeName;
+>>> 7d080d57250 (CAMEL-20557: Rest DSL to use openapi spec directly)
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.Content;
@@ -509,8 +517,15 @@ public class RestOpenApiProcessor extends
DelegateAsyncProcessor implements Came
"OpenAPI binding classes package scan");
String[] pcks = base.split(",");
PackageScanClassResolver resolver =
PluginHelper.getPackageScanClassResolver(camelContext);
+<<< HEAD
// just add all classes as the POJOs can be generated with all
kind of tools and with and without annotations
scannedClasses.addAll(resolver.findImplementations(Object.class, pcks));
+===
+// discover POJO generated classes for JSon/XML
+scannedClasses.addAll(resolver.findAnnotated(Generated.class,
pcks));
+
scannedClasses.addAll(resolver.findAnnotated(JsonTypeName.class, pcks));
+
scannedClasses.addAll(resolver.findAnnotated(XmlRootElement.class, pcks));
+>>> 7d080d57250 (CAMEL-20557: Rest DSL to use openapi spec directly)
if (!scannedClasses.isEmpty()) {
LOG.info("Binding package scan found {} classes in
packages: {}", scannedClasses.size(), base);
}
(camel) branch main updated (06c22e4f50c -> 3e03b8e2c50)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 06c22e4f50c rest-dsl - binding part 4 (#13697) new e070aae9898 CAMEL-20557: Rest DSL to use openapi spec directly new 3e03b8e2c50 CAMEL-20557: Rest DSL to use openapi spec directly 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) branch main updated: rest-dsl - binding part 4 (#13697)
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 06c22e4f50c rest-dsl - binding part 4 (#13697)
06c22e4f50c is described below
commit 06c22e4f50c208cc20b7e2eb2e8344b5271901b6
Author: Claus Ibsen
AuthorDate: Thu Apr 4 15:05:52 2024 +0200
rest-dsl - binding part 4 (#13697)
CAMEL-20557: Rest DSL to use openapi spec directly
---
.../platform/http/PlatformHttpConsumer.java| 24 +
.../platform/http/PlatformHttpEndpoint.java| 2 +-
.../DefaultRestOpenapiProcessorStrategy.java | 18 ++
.../rest/openapi/RestOpenApiEndpoint.java | 10 --
.../rest/openapi/RestOpenApiProcessor.java | 41 ++
.../rest/openapi/RestOpenapiProcessorStrategy.java | 8 +++--
.../camel/support/processor/RestBindingAdvice.java | 5 ++-
7 files changed, 69 insertions(+), 39 deletions(-)
diff --git
a/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpConsumer.java
b/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpConsumer.java
index c2020081876..bfc357db814 100644
---
a/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpConsumer.java
+++
b/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpConsumer.java
@@ -26,7 +26,7 @@ import org.apache.camel.support.service.ServiceHelper;
public class PlatformHttpConsumer extends DefaultConsumer implements
Suspendable, SuspendableService {
-private Consumer delegatedConsumer;
+private Consumer platformHttpConsumer;
private boolean register = true;
public PlatformHttpConsumer(Endpoint endpoint, Processor processor) {
@@ -50,19 +50,29 @@ public class PlatformHttpConsumer extends DefaultConsumer
implements Suspendable
this.register = register;
}
+public Consumer getDelegtePlatformHttpConsumer() {
+return platformHttpConsumer;
+}
+
@Override
protected void doInit() throws Exception {
+platformHttpConsumer =
getEndpoint().createPlatformHttpConsumer(getProcessor());
+configurePlatformHttpConsumer(platformHttpConsumer);
super.doInit();
-delegatedConsumer =
getEndpoint().createDelegateConsumer(getProcessor());
+ServiceHelper.initService(platformHttpConsumer);
+}
+
+protected void configurePlatformHttpConsumer(Consumer
platformHttpConsumer) {
+// noop
}
@Override
protected void doStart() throws Exception {
super.doStart();
-ServiceHelper.startService(delegatedConsumer);
+ServiceHelper.startService(platformHttpConsumer);
if (register) {
getComponent().addHttpEndpoint(getEndpoint().getPath(),
getEndpoint().getHttpMethodRestrict(),
-getEndpoint().getConsumes(), getEndpoint().getProduces(),
delegatedConsumer);
+getEndpoint().getConsumes(), getEndpoint().getProduces(),
platformHttpConsumer);
}
}
@@ -72,18 +82,18 @@ public class PlatformHttpConsumer extends DefaultConsumer
implements Suspendable
if (register) {
getComponent().removeHttpEndpoint(getEndpoint().getPath());
}
-ServiceHelper.stopAndShutdownServices(delegatedConsumer);
+ServiceHelper.stopAndShutdownServices(platformHttpConsumer);
}
@Override
protected void doResume() throws Exception {
-ServiceHelper.resumeService(delegatedConsumer);
+ServiceHelper.resumeService(platformHttpConsumer);
super.doResume();
}
@Override
protected void doSuspend() throws Exception {
-ServiceHelper.suspendService(delegatedConsumer);
+ServiceHelper.suspendService(platformHttpConsumer);
super.doSuspend();
}
diff --git
a/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpEndpoint.java
b/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpEndpoint.java
index f2b43c9474a..dc940c1f73e 100644
---
a/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpEndpoint.java
+++
b/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpEndpoint.java
@@ -107,7 +107,7 @@ public class PlatformHttpEndpoint extends DefaultEndpoint
implements AsyncEndpoi
return consumer;
}
-protected Consumer createDelegateConsumer(Processor processor) throws
Exception {
+protected Consumer createPlatformHttpConsumer(Processor processor) throws
Exception {
Consumer consumer = getOrCreateEngine().createConsumer(this,
processor);
Re: [PR] rest-dsl - binding part 4 [camel]
davsclaus merged PR #13697: URL: https://github.com/apache/camel/pull/13697 -- 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] feat(core): Upgrade API kubernetes 1.28 and controller-runtime to 0.16 [camel-k]
lburgazzoli commented on PR #5321: URL: https://github.com/apache/camel-k/pull/5321#issuecomment-2037164928 > Is this expected to be merged for Camel K 2.3 ? It would be important to consider [openshift 4.14 uses kubernetes api 1.27](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.14/html-single/release_notes/index#ocp-4-14-about-this-release). According to the [kubernetes-version-compatibility](https://github.com/kubernetes-sigs/kubebuilder-release-tools/blob/master/VERSIONING.md#kubernetes-version-compatibility), it should still be compatible with Kubernetes API version N-3 or N-4 -- 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 binding4 deleted (was 9882096ad67)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch binding4 in repository https://gitbox.apache.org/repos/asf/camel.git was 9882096ad67 CAMEL-20557: Rest DSL to use openapi spec directly 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] (chores) camel-test-infra-arangodb: update to ArangoDB 3.11.8 container [camel]
orpiske commented on PR #13698: URL: https://github.com/apache/camel/pull/13698#issuecomment-2037159422 There's 3.12 out already, but it doesn't work w/ the component. -- 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] (chores) camel-test-infra-arangodb: use the correct property for startup attempts [camel]
orpiske opened a new pull request, #13698: URL: https://github.com/apache/camel/pull/13698 (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
Re: [PR] feat: camel k 2.3.0 [camel-website]
christophd commented on PR #1169: URL: https://github.com/apache/camel-website/pull/1169#issuecomment-2037124263 @squakez I just realized that IntegrationProfile CRD has been added in 2.3. I will add a paragraph to the blog post -- 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) 03/03: CAMEL-20557: Rest DSL to use openapi spec directly
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch binding4
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9882096ad67f359c7ff3f7b2240ae1a4eae9775c
Author: Claus Ibsen
AuthorDate: Thu Apr 4 14:41:01 2024 +0200
CAMEL-20557: Rest DSL to use openapi spec directly
---
.../platform/http/PlatformHttpConsumer.java| 24
.../platform/http/PlatformHttpEndpoint.java| 2 +-
.../DefaultRestOpenapiProcessorStrategy.java | 14 ---
.../rest/openapi/RestOpenApiEndpoint.java | 10 +++--
.../rest/openapi/RestOpenApiProcessor.java | 44 +-
.../rest/openapi/RestOpenapiProcessorStrategy.java | 8 ++--
.../camel/support/processor/RestBindingAdvice.java | 5 +--
7 files changed, 67 insertions(+), 40 deletions(-)
diff --git
a/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpConsumer.java
b/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpConsumer.java
index c2020081876..bfc357db814 100644
---
a/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpConsumer.java
+++
b/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpConsumer.java
@@ -26,7 +26,7 @@ import org.apache.camel.support.service.ServiceHelper;
public class PlatformHttpConsumer extends DefaultConsumer implements
Suspendable, SuspendableService {
-private Consumer delegatedConsumer;
+private Consumer platformHttpConsumer;
private boolean register = true;
public PlatformHttpConsumer(Endpoint endpoint, Processor processor) {
@@ -50,19 +50,29 @@ public class PlatformHttpConsumer extends DefaultConsumer
implements Suspendable
this.register = register;
}
+public Consumer getDelegtePlatformHttpConsumer() {
+return platformHttpConsumer;
+}
+
@Override
protected void doInit() throws Exception {
+platformHttpConsumer =
getEndpoint().createPlatformHttpConsumer(getProcessor());
+configurePlatformHttpConsumer(platformHttpConsumer);
super.doInit();
-delegatedConsumer =
getEndpoint().createDelegateConsumer(getProcessor());
+ServiceHelper.initService(platformHttpConsumer);
+}
+
+protected void configurePlatformHttpConsumer(Consumer
platformHttpConsumer) {
+// noop
}
@Override
protected void doStart() throws Exception {
super.doStart();
-ServiceHelper.startService(delegatedConsumer);
+ServiceHelper.startService(platformHttpConsumer);
if (register) {
getComponent().addHttpEndpoint(getEndpoint().getPath(),
getEndpoint().getHttpMethodRestrict(),
-getEndpoint().getConsumes(), getEndpoint().getProduces(),
delegatedConsumer);
+getEndpoint().getConsumes(), getEndpoint().getProduces(),
platformHttpConsumer);
}
}
@@ -72,18 +82,18 @@ public class PlatformHttpConsumer extends DefaultConsumer
implements Suspendable
if (register) {
getComponent().removeHttpEndpoint(getEndpoint().getPath());
}
-ServiceHelper.stopAndShutdownServices(delegatedConsumer);
+ServiceHelper.stopAndShutdownServices(platformHttpConsumer);
}
@Override
protected void doResume() throws Exception {
-ServiceHelper.resumeService(delegatedConsumer);
+ServiceHelper.resumeService(platformHttpConsumer);
super.doResume();
}
@Override
protected void doSuspend() throws Exception {
-ServiceHelper.suspendService(delegatedConsumer);
+ServiceHelper.suspendService(platformHttpConsumer);
super.doSuspend();
}
diff --git
a/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpEndpoint.java
b/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpEndpoint.java
index f2b43c9474a..dc940c1f73e 100644
---
a/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpEndpoint.java
+++
b/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpEndpoint.java
@@ -107,7 +107,7 @@ public class PlatformHttpEndpoint extends DefaultEndpoint
implements AsyncEndpoi
return consumer;
}
-protected Consumer createDelegateConsumer(Processor processor) throws
Exception {
+protected Consumer createPlatformHttpConsumer(Processor processor) throws
Exception {
Consumer consumer = getOrCreateEngine().createConsumer(this,
processor);
configureConsumer(consumer);
return consumer;
diff --git
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/DefaultRestOpenapiProcessorStrategy.java
(camel) branch binding4 created (now 9882096ad67)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch binding4 in repository https://gitbox.apache.org/repos/asf/camel.git at 9882096ad67 CAMEL-20557: Rest DSL to use openapi spec directly This branch includes the following new commits: new 7d080d57250 CAMEL-20557: Rest DSL to use openapi spec directly new 034989638f8 CAMEL-20557: Rest DSL to use openapi spec directly new 9882096ad67 CAMEL-20557: Rest DSL to use openapi spec directly The 3 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.
Re: [PR] rest-dsl - binding part 4 [camel]
github-actions[bot] commented on PR #13697: URL: https://github.com/apache/camel/pull/13697#issuecomment-2037117442 :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] rest-dsl - binding part 4 [camel]
davsclaus opened a new pull request, #13697: URL: https://github.com/apache/camel/pull/13697 # 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/03: CAMEL-20557: Rest DSL to use openapi spec directly
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch binding4
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7d080d572505207a348dfc61a0bfbd1822f772ec
Author: Claus Ibsen
AuthorDate: Thu Apr 4 11:03:55 2024 +0200
CAMEL-20557: Rest DSL to use openapi spec directly
---
.../org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
index a3801378d06..1e18999ca41 100644
---
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
+++
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
@@ -29,6 +29,8 @@ import java.util.stream.Collectors;
import jakarta.xml.bind.annotation.XmlRootElement;
+import javax.annotation.processing.Generated;
+
import com.fasterxml.jackson.annotation.JsonTypeName;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
@@ -498,6 +500,7 @@ public class RestOpenApiProcessor extends
DelegateAsyncProcessor implements Came
String[] pcks = base.split(",");
PackageScanClassResolver resolver =
PluginHelper.getPackageScanClassResolver(camelContext);
// discover POJO generated classes for JSon/XML
+scannedClasses.addAll(resolver.findAnnotated(Generated.class,
pcks));
scannedClasses.addAll(resolver.findAnnotated(JsonTypeName.class, pcks));
scannedClasses.addAll(resolver.findAnnotated(XmlRootElement.class, pcks));
if (!scannedClasses.isEmpty()) {
(camel) 02/03: CAMEL-20557: Rest DSL to use openapi spec directly
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch binding4
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 034989638f84382b05250de7545046cab449347f
Author: Claus Ibsen
AuthorDate: Thu Apr 4 11:07:01 2024 +0200
CAMEL-20557: Rest DSL to use openapi spec directly
---
.../component/rest/openapi/DefaultRestOpenapiProcessorStrategy.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/DefaultRestOpenapiProcessorStrategy.java
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/DefaultRestOpenapiProcessorStrategy.java
index d98723a1ae3..2648b8084f2 100644
---
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/DefaultRestOpenapiProcessorStrategy.java
+++
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/DefaultRestOpenapiProcessorStrategy.java
@@ -96,9 +96,9 @@ public class DefaultRestOpenapiProcessorStrategy extends
ServiceSupport
if ("fail".equalsIgnoreCase(missingOperation)) {
throw new IllegalArgumentException(msg);
} else if ("ignore".equalsIgnoreCase(missingOperation)) {
-LOG.warn(msg + ". This validation error is ignored.");
+LOG.warn(msg + "\nThis validation error is ignored.");
} else if ("mock".equalsIgnoreCase(missingOperation)) {
-LOG.debug(msg + ". This validation error is ignored (Will
return a mocked/empty response).");
+LOG.debug(msg + "\nThis validation error is ignored (Will
return a mocked/empty response).");
}
}
(camel-spring-boot-examples) branch main updated: Add openapi contract first example
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-examples.git
The following commit(s) were added to refs/heads/main by this push:
new 3b3141e Add openapi contract first example
3b3141e is described below
commit 3b3141e50dc6a866a8e241ec719f6ecf6306ed1f
Author: Claus Ibsen
AuthorDate: Thu Apr 4 14:46:50 2024 +0200
Add openapi contract first example
---
README.adoc|4 +-
openapi-contract-first/daisy.json |4 +
openapi-contract-first/pom.xml | 185 +++
openapi-contract-first/readme.adoc | 63 +
.../sample/petstore/MyPetStoreApplication.java | 35 +
.../main/java/sample/petstore/PetStoreRoute.java | 60 +
.../src/main/resources/application.properties | 29 +
.../src/main/resources/petstore.json | 1240
pom.xml|1 +
9 files changed, 1620 insertions(+), 1 deletion(-)
diff --git a/README.adoc b/README.adoc
index 3c4b358..380ccb3 100644
--- a/README.adoc
+++ b/README.adoc
@@ -27,7 +27,7 @@ readme's instructions.
=== Examples
// examples: START
-Number of Examples: 55 (0 deprecated)
+Number of Examples: 56 (0 deprecated)
[width="100%",cols="4,2,4",options="header"]
|===
@@ -133,6 +133,8 @@ Number of Examples: 55 (0 deprecated)
| link:reactive-streams/readme.adoc[Reactive Streams] (reactive-streams) |
Reactive | An example that shows how Camel can exchange data using reactive
streams with Spring Boot reactor
+| link:openapi-contract-first/readme.adoc[Openapi Contract First]
(openapi-contract-first) | Rest | Contract First OpenAPI example
+
| link:platform-http/README.adoc[Platform Http] (platform-http) | Rest | An
example showing Camel REST DSL with platform HTTP
| link:rest-cxf/README.adoc[Rest Cxf] (rest-cxf) | Rest | An example showing
Camel REST using CXF with Spring Boot
diff --git a/openapi-contract-first/daisy.json
b/openapi-contract-first/daisy.json
new file mode 100644
index 000..2198d06
--- /dev/null
+++ b/openapi-contract-first/daisy.json
@@ -0,0 +1,4 @@
+{
+ "id": 555,
+ "name": "Daisy the parrot"
+}
\ No newline at end of file
diff --git a/openapi-contract-first/pom.xml b/openapi-contract-first/pom.xml
new file mode 100644
index 000..6d3fc3e
--- /dev/null
+++ b/openapi-contract-first/pom.xml
@@ -0,0 +1,185 @@
+
+
+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/maven-v4_0_0.xsd;>
+
+4.0.0
+
+
+org.apache.camel.springboot.example
+examples
+4.6.0-SNAPSHOT
+
+
+camel-example-spring-boot-openapi-contract-first
+Camel SB Examples :: OpenAPI Contract First
+Contract First OpenAPI example
+
+
+Rest
+UTF-8
+
UTF-8
+
+
+
+
+
+
+org.apache.camel.springboot
+camel-spring-boot-bom
+${camel-version}
+pom
+import
+
+
+
+org.springframework.boot
+spring-boot-dependencies
+${spring-boot-version}
+pom
+import
+
+
+
+
+
+
+
+
+org.springframework.boot
+spring-boot-starter-web
+
+
+org.springframework.boot
+spring-boot-starter-actuator
+
+
+
+
+org.apache.camel.springboot
+camel-spring-boot-starter
+
+
+
+org.apache.camel.springboot
+camel-rest-openapi-starter
+
+
+
+org.apache.camel.springboot
+camel-jackson-starter
+
+
+
+org.apache.camel.springboot
+camel-platform-http-starter
+
+
+
+org.apache.camel.springboot
+camel-console-starter
+
+
+
+org.apache.camel.springboot
+camel-management-starter
+
+
+
+org.apache.camel.springboot
+camel-cli-connector-starter
+
+
+
+
+org.springframework.boot
+spring-boot-starter-test
+test
+
+
+org.apache.camel
+camel-test-spring-junit5
+test
+
+
+
+
+
+
+io.swagger.codegen.v3
+swagger-codegen-maven-plugin
+3.0.52
+
+
+
+generate
+
+
