Re: [PR] fix(trait): watch for resource versions... [camel-k]
lburgazzoli commented on PR #5218: URL: https://github.com/apache/camel-k/pull/5218#issuecomment-1980284841 > > Maybe, should we honor the `mount.hot-reload` option ? In some cases, the user may not have full control of the configmap/secrets i.e. when those resources are generated by another controller. > > The option is already used in the controller to wake up the Integration and kick the logic: > > https://github.com/apache/camel-k/blob/825f0ce6aaf3a52c2620f8efab31b8167973c5fc/pkg/controller/integration/integration_controller.go#L191 > - do you think we need to include this again in the `getIntegrationSecretAndConfigmapResourceVersions` func? I think it may be a duplicated check, but definetely it's something that should not hurt. I don't have the full picture but my reasoning is that, the hot reload flag prevents a reconciliation to happen but, in case the reconciliation is triggered by i.e. a non destructive trait change, then we ends up in the same case as https://github.com/apache/camel-k/issues/5192, which effectively will end up in a restart/reload. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] chore(traits): store executed traits [camel-k]
squakez commented on code in PR #5216:
URL: https://github.com/apache/camel-k/pull/5216#discussion_r1513957971
##
pkg/trait/quarkus.go:
##
@@ -308,7 +308,7 @@ func propagateKitTraits(e *Environment)
v1.IntegrationKitTraits {
propagate(fmt.Sprintf("integration profile %q",
e.IntegrationProfile.Name), e.IntegrationProfile.Status.Traits, , e)
}
- propagate(fmt.Sprintf("integration %q", e.Integration.Name),
e.Integration.Spec.Traits, , e)
+ propagate(fmt.Sprintf("integration %q", e.Integration.Name),
e.Integration.Status.Traits, , e)
Review Comment:
Good point. Probably we need to use the "executed trait" that have been used
in this reconciliation loop instead of either the `spec` (which represent the
user specification) or the `status` (which represent the previous
reconciliation loop execution).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] fix(trait): watch for resource versions... [camel-k]
squakez commented on PR #5218: URL: https://github.com/apache/camel-k/pull/5218#issuecomment-1980242368 > Maybe, should we honor the `mount.hot-reload` option ? In some cases, the user may not have full control of the configmap/secrets i.e. when those resources are generated by another controller. The option is already used in the controller to wake up the Integration and kick the logic: https://github.com/apache/camel-k/blob/825f0ce6aaf3a52c2620f8efab31b8167973c5fc/pkg/controller/integration/integration_controller.go#L191 - do you think we need to include this again in the `getIntegrationSecretAndConfigmapResourceVersions` func? I think it may be a duplicated check, but definetely it's something that should not hurt. -- 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] Intermittent failure of FileTests [camel-quarkus]
aldettinger commented on issue #3584: URL: https://github.com/apache/camel-quarkus/issues/3584#issuecomment-1980235090 Every tests have been migrated to the new harness and no more flakiness on ci. Let's see how it behaves on quarkus platform ci on next release. -- 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] [4.4.x] CAMEL-20519: Servlet documentation improvements [camel]
github-actions[bot] commented on PR #13388: URL: https://github.com/apache/camel/pull/13388#issuecomment-1980234990 :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] [4.4.x] CAMEL-20519: Servlet documentation improvements [camel]
jamesnetherton opened a new pull request, #13388: URL: https://github.com/apache/camel/pull/13388 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch dependabot/maven/quarkiverse-jsch.version-3.0.7 deleted (was a93b24e344)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch dependabot/maven/quarkiverse-jsch.version-3.0.7 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git was a93b24e344 Auto generated changes for dependabot commit 07a828ae6aed044326cb5a03654303a52a0b567e 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] Bump quarkiverse-jsch.version from 3.0.6 to 3.0.7 [camel-quarkus]
jamesnetherton merged PR #5842: URL: https://github.com/apache/camel-quarkus/pull/5842 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch main updated: Bump quarkiverse-jsch.version from 3.0.6 to 3.0.7
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 6274b899f5 Bump quarkiverse-jsch.version from 3.0.6 to 3.0.7
6274b899f5 is described below
commit 6274b899f58b8e5649d708bf80ed5843217a6a13
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Wed Mar 6 07:12:05 2024 +
Bump quarkiverse-jsch.version from 3.0.6 to 3.0.7
* Bump quarkiverse-jsch.version from 3.0.6 to 3.0.7
Bumps `quarkiverse-jsch.version` from 3.0.6 to 3.0.7.
Updates `io.quarkiverse.jsch:quarkus-jsch` from 3.0.6 to 3.0.7
- [Release notes](https://github.com/quarkiverse/quarkus-jsch/releases)
-
[Commits](https://github.com/quarkiverse/quarkus-jsch/compare/3.0.6...3.0.7)
Updates `io.quarkiverse.jsch:quarkus-jsch-deployment` from 3.0.6 to 3.0.7
- [Release notes](https://github.com/quarkiverse/quarkus-jsch/releases)
-
[Commits](https://github.com/quarkiverse/quarkus-jsch/compare/3.0.6...3.0.7)
---
updated-dependencies:
- dependency-name: io.quarkiverse.jsch:quarkus-jsch
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: io.quarkiverse.jsch:quarkus-jsch-deployment
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
* Auto generated changes for dependabot commit
07a828ae6aed044326cb5a03654303a52a0b567e
-
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
pom.xml | 4 ++--
poms/bom/src/main/generated/flattened-full-pom.xml| 6 +++---
poms/bom/src/main/generated/flattened-reduced-pom.xml | 6 +++---
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1a6eedb888..a00a442ce9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
3.8.0
2.0.2
3.0.7
-3.0.6
+3.0.7
3.2.4
3.7.1
2.2.1
@@ -125,7 +125,7 @@
5.6.0
0.9.11
2.2.13
-0.2.16
+0.2.17
${json-path-version}
${jedis-client-version}
2.5.0
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 6f020fadb5..a39e94aa76 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6124,7 +6124,7 @@
com.github.mwiede
jsch
-0.2.16
+0.2.17
com.google.auth
@@ -6386,12 +6386,12 @@
io.quarkiverse.jsch
quarkus-jsch
-3.0.6
+3.0.7
io.quarkiverse.jsch
quarkus-jsch-deployment
-3.0.6
+3.0.7
io.quarkiverse.messaginghub
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 31f3ab3d7a..47a58a9493 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6124,7 +6124,7 @@
com.github.mwiede
jsch
-0.2.16
+0.2.17
com.google.auth
@@ -6351,12 +6351,12 @@
io.quarkiverse.jsch
quarkus-jsch
-3.0.6
+3.0.7
io.quarkiverse.jsch
quarkus-jsch-deployment
-3.0.6
+3.0.7
io.quarkiverse.messaginghub
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index 04102abda4..c0ab4d6406 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6124,7 +6124,7 @@
com.github.mwiede
jsch
-0.2.16
+0.2.17
com.google.auth
@@ -6351,12 +6351,12 @@
io.quarkiverse.jsch
quarkus-jsch
-3.0.6
+3.0.7
io.quarkiverse.jsch
quarkus-jsch-deployment
-3.0.6
+3.0.7
io.quarkiverse.messaginghub
(camel) branch regen_bot updated (0958ebb0f2a -> 8455c3a9f3d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 0958ebb0f2a CAMEL-20519: Servlet documentation improvements (#13385) add 8455c3a9f3d CAMEL-20516 - Camel-AWS-Bedrock: Support AI21 Jurassic2 Mid model (#13386) No new revisions were added by this update. Summary of changes: .../component/aws2/bedrock/BedrockModels.java | 3 +- .../component/aws2/bedrock/BedrockProducer.java| 2 +- .../bedrock/integration/BedrockProducerIT.java | 48 ++ 3 files changed, 51 insertions(+), 2 deletions(-)
(camel) branch CAMEL-20516 deleted (was 77129840f39)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch CAMEL-20516 in repository https://gitbox.apache.org/repos/asf/camel.git was 77129840f39 CAMEL-20516 - Camel-AWS-Bedrock: Support AI21 Jurassic2 Mid model 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-20516 - Camel-AWS-Bedrock: Support AI21 Jurassic2 Mid model [camel]
oscerd merged PR #13386: URL: https://github.com/apache/camel/pull/13386 -- 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-20516 - Camel-AWS-Bedrock: Support AI21 Jurassic2 Mid model (#13386)
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 8455c3a9f3d CAMEL-20516 - Camel-AWS-Bedrock: Support AI21 Jurassic2
Mid model (#13386)
8455c3a9f3d is described below
commit 8455c3a9f3dd2c1ad7c765055208b23576005819
Author: Andrea Cosentino
AuthorDate: Wed Mar 6 07:50:02 2024 +0100
CAMEL-20516 - Camel-AWS-Bedrock: Support AI21 Jurassic2 Mid model (#13386)
Signed-off-by: Andrea Cosentino
---
.../component/aws2/bedrock/BedrockModels.java | 3 +-
.../component/aws2/bedrock/BedrockProducer.java| 2 +-
.../bedrock/integration/BedrockProducerIT.java | 48 ++
3 files changed, 51 insertions(+), 2 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 5d322aa340d..bc16f068e7e 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
@@ -22,7 +22,8 @@ public enum BedrockModels {
TITAN_TEXT_LITE_V1("amazon.titan-text-lite-v1"),
TITAN_IMAGE_GENERATOR_V1("amazon.titan-image-generator-v1"),
TITAN_EMBEDDINGS_G1("amazon.titan-embed-text-v1"),
-JURASSIC2_ULTRA("ai21.j2-ultra-v1"),;
+JURASSIC2_ULTRA("ai21.j2-ultra-v1"),
+JURASSIC2_MID("ai21.j2-mid-v1");
public final String model;
diff --git
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockProducer.java
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockProducer.java
index 421e75bf882..3434fea5921 100644
---
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockProducer.java
+++
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockProducer.java
@@ -235,7 +235,7 @@ public class BedrockProducer extends DefaultProducer {
protected void setResponseText(InvokeModelResponse result, Message
message) {
switch (getConfiguration().getModelId()) {
case "amazon.titan-text-express-v1", "amazon.titan-text-lite-v1"
-> setTitanText(result, message);
-case "ai21.j2-ultra-v1" -> {
+case "ai21.j2-ultra-v1", "ai21.j2-mid-v1" -> {
try {
setAi21Text(result, message);
} catch (JsonProcessingException e) {
diff --git
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/integration/BedrockProducerIT.java
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/integration/BedrockProducerIT.java
index 12debf2fcaa..a071215eb02 100644
---
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/integration/BedrockProducerIT.java
+++
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/integration/BedrockProducerIT.java
@@ -167,6 +167,45 @@ class BedrockProducerIT extends CamelTestSupport {
rootNode.putIfAbsent("temperature", new IntNode(0));
rootNode.putIfAbsent("topP", new IntNode(1));
+ArrayNode stopSequences = mapper.createArrayNode();
+stopSequences.add("###");
+
+rootNode.putIfAbsent("stopSequences", stopSequences);
+
+ObjectNode childNode = mapper.createObjectNode();
+childNode.putIfAbsent("scale", new IntNode(0));
+
+rootNode.putIfAbsent("presencePenalty", childNode);
+rootNode.putIfAbsent("frequencyPenalty", childNode);
+
+
exchange.getMessage().setBody(mapper.writer().writeValueAsString(rootNode));
+
exchange.getMessage().setHeader(BedrockConstants.MODEL_CONTENT_TYPE,
"application/json");
+
exchange.getMessage().setHeader(BedrockConstants.MODEL_ACCEPT_CONTENT_TYPE,
"application/json");
+});
+
+MockEndpoint.assertIsSatisfied(context);
+}
+
+@Test
+public void testInvokeJurassic2MidModel() throws InterruptedException {
+
+result.expectedMessageCount(1);
+final Exchange result =
template.send("direct:send_jurassic2_mid_model", exchange -> {
+ObjectMapper mapper = new ObjectMapper();
+ObjectNode rootNode = mapper.createObjectNode();
+rootNode.putIfAbsent("prompt",
+new TextNode(
+"\"Apple Inc. (NASDAQ:AAPL) Q3 2023 Earnings
Conference Call August 3, 2023 5:00 PM ET
Re: [PR] Bump hapi-fhir-version from 7.0.1 to 7.0.2 [camel]
github-actions[bot] commented on PR #13387: URL: https://github.com/apache/camel/pull/13387#issuecomment-1980187006 :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
(camel) branch dependabot/maven/hapi-fhir-version-7.0.2 created (now 9d93c915fcc)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/hapi-fhir-version-7.0.2 in repository https://gitbox.apache.org/repos/asf/camel.git at 9d93c915fcc Bump hapi-fhir-version from 7.0.1 to 7.0.2 No new revisions were added by this update.
[PR] Bump hapi-fhir-version from 7.0.1 to 7.0.2 [camel]
dependabot[bot] opened a new pull request, #13387: URL: https://github.com/apache/camel/pull/13387 Bumps `hapi-fhir-version` from 7.0.1 to 7.0.2. Updates `ca.uhn.hapi.fhir:hapi-fhir-base` from 7.0.1 to 7.0.2 Updates `ca.uhn.hapi.fhir:hapi-fhir-client` from 7.0.1 to 7.0.2 Updates `ca.uhn.hapi.fhir:hapi-fhir-structures-r5` from 7.0.1 to 7.0.2 Updates `ca.uhn.hapi.fhir:hapi-fhir-structures-r4` from 7.0.1 to 7.0.2 Updates `ca.uhn.hapi.fhir:hapi-fhir-structures-dstu3` from 7.0.1 to 7.0.2 Updates `ca.uhn.hapi.fhir:hapi-fhir-structures-dstu2` from 7.0.1 to 7.0.2 Updates `ca.uhn.hapi.fhir:hapi-fhir-structures-dstu2.1` from 7.0.1 to 7.0.2 Updates `ca.uhn.hapi.fhir:hapi-fhir-structures-hl7org-dstu2` from 7.0.1 to 7.0.2 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-20516 - Camel-AWS-Bedrock: Support AI21 Jurassic2 Mid model [camel]
github-actions[bot] commented on PR #13386: URL: https://github.com/apache/camel/pull/13386#issuecomment-1980172471 :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-20516 - Camel-AWS-Bedrock: Support AI21 Jurassic2 Mid model [camel]
oscerd commented on PR #13386: URL: https://github.com/apache/camel/pull/13386#issuecomment-1980172076 /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-20516 - Camel-AWS-Bedrock: Support AI21 Jurassic2 Mid model [camel]
github-actions[bot] commented on PR #13386: URL: https://github.com/apache/camel/pull/13386#issuecomment-1980161499 :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-20516 - Camel-AWS-Bedrock: Support AI21 Jurassic2 Mid model [camel]
github-actions[bot] commented on PR #13386: URL: https://github.com/apache/camel/pull/13386#issuecomment-1980161110 :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-20516 - Camel-AWS-Bedrock: Support AI21 Jurassic2 Mid model [camel]
oscerd opened a new pull request, #13386: URL: https://github.com/apache/camel/pull/13386 # 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
Re: [PR] CAMEL-20516 - Camel-AWS-Bedrock: Support AI21 Jurassic2 Mid model [camel]
oscerd commented on PR #13386: URL: https://github.com/apache/camel/pull/13386#issuecomment-1980161043 /component-test -- 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-20516 - Camel-AWS-Bedrock: Support AI21 Jurassic2 Mid model
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch CAMEL-20516
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 77129840f39deeaaeabedcb002ad4b620fed54d5
Author: Andrea Cosentino
AuthorDate: Wed Mar 6 07:16:22 2024 +0100
CAMEL-20516 - Camel-AWS-Bedrock: Support AI21 Jurassic2 Mid model
Signed-off-by: Andrea Cosentino
---
.../component/aws2/bedrock/BedrockModels.java | 3 +-
.../component/aws2/bedrock/BedrockProducer.java| 2 +-
.../bedrock/integration/BedrockProducerIT.java | 48 ++
3 files changed, 51 insertions(+), 2 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 5d322aa340d..bc16f068e7e 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
@@ -22,7 +22,8 @@ public enum BedrockModels {
TITAN_TEXT_LITE_V1("amazon.titan-text-lite-v1"),
TITAN_IMAGE_GENERATOR_V1("amazon.titan-image-generator-v1"),
TITAN_EMBEDDINGS_G1("amazon.titan-embed-text-v1"),
-JURASSIC2_ULTRA("ai21.j2-ultra-v1"),;
+JURASSIC2_ULTRA("ai21.j2-ultra-v1"),
+JURASSIC2_MID("ai21.j2-mid-v1");
public final String model;
diff --git
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockProducer.java
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockProducer.java
index 421e75bf882..3434fea5921 100644
---
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockProducer.java
+++
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockProducer.java
@@ -235,7 +235,7 @@ public class BedrockProducer extends DefaultProducer {
protected void setResponseText(InvokeModelResponse result, Message
message) {
switch (getConfiguration().getModelId()) {
case "amazon.titan-text-express-v1", "amazon.titan-text-lite-v1"
-> setTitanText(result, message);
-case "ai21.j2-ultra-v1" -> {
+case "ai21.j2-ultra-v1", "ai21.j2-mid-v1" -> {
try {
setAi21Text(result, message);
} catch (JsonProcessingException e) {
diff --git
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/integration/BedrockProducerIT.java
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/integration/BedrockProducerIT.java
index 12debf2fcaa..a071215eb02 100644
---
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/integration/BedrockProducerIT.java
+++
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/integration/BedrockProducerIT.java
@@ -167,6 +167,45 @@ class BedrockProducerIT extends CamelTestSupport {
rootNode.putIfAbsent("temperature", new IntNode(0));
rootNode.putIfAbsent("topP", new IntNode(1));
+ArrayNode stopSequences = mapper.createArrayNode();
+stopSequences.add("###");
+
+rootNode.putIfAbsent("stopSequences", stopSequences);
+
+ObjectNode childNode = mapper.createObjectNode();
+childNode.putIfAbsent("scale", new IntNode(0));
+
+rootNode.putIfAbsent("presencePenalty", childNode);
+rootNode.putIfAbsent("frequencyPenalty", childNode);
+
+
exchange.getMessage().setBody(mapper.writer().writeValueAsString(rootNode));
+
exchange.getMessage().setHeader(BedrockConstants.MODEL_CONTENT_TYPE,
"application/json");
+
exchange.getMessage().setHeader(BedrockConstants.MODEL_ACCEPT_CONTENT_TYPE,
"application/json");
+});
+
+MockEndpoint.assertIsSatisfied(context);
+}
+
+@Test
+public void testInvokeJurassic2MidModel() throws InterruptedException {
+
+result.expectedMessageCount(1);
+final Exchange result =
template.send("direct:send_jurassic2_mid_model", exchange -> {
+ObjectMapper mapper = new ObjectMapper();
+ObjectNode rootNode = mapper.createObjectNode();
+rootNode.putIfAbsent("prompt",
+new TextNode(
+"\"Apple Inc. (NASDAQ:AAPL) Q3 2023 Earnings
Conference Call August 3, 2023 5:00 PM ET OperatornGood day, and welcome to
the Apple Q3 Fiscal Year 2023 Earnings Conference Call. Today's call is being
recorded. At this time, for opening remarks and introductions, I would like to
turn the call over
(camel) branch CAMEL-20516 created (now 77129840f39)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch CAMEL-20516 in repository https://gitbox.apache.org/repos/asf/camel.git at 77129840f39 CAMEL-20516 - Camel-AWS-Bedrock: Support AI21 Jurassic2 Mid model This branch includes the following new commits: new 77129840f39 CAMEL-20516 - Camel-AWS-Bedrock: Support AI21 Jurassic2 Mid model 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] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
oscerd closed pull request #1100: [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) URL: https://github.com/apache/camel-spring-boot/pull/1100 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch regen_bot updated (b6c10971f49 -> 0958ebb0f2a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from b6c10971f49 CAMEL-20508: camel-jsonpath - Align how it converts to resultType like camel-jq (#13384) add 0958ebb0f2a CAMEL-20519: Servlet documentation improvements (#13385) No new revisions were added by this update. Summary of changes: .../src/main/docs/servlet-component.adoc | 379 + 1 file changed, 94 insertions(+), 285 deletions(-)
(camel) branch main updated: CAMEL-20519: Servlet documentation improvements (#13385)
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 0958ebb0f2a CAMEL-20519: Servlet documentation improvements (#13385) 0958ebb0f2a is described below commit 0958ebb0f2ab51cb5576b62eb27c6be50aec7f17 Author: James Netherton AuthorDate: Wed Mar 6 04:52:30 2024 + CAMEL-20519: Servlet documentation improvements (#13385) --- .../src/main/docs/servlet-component.adoc | 379 + 1 file changed, 94 insertions(+), 285 deletions(-) diff --git a/components/camel-servlet/src/main/docs/servlet-component.adoc b/components/camel-servlet/src/main/docs/servlet-component.adoc index 7bf03d341b4..2400c355df6 100644 --- a/components/camel-servlet/src/main/docs/servlet-component.adoc +++ b/components/camel-servlet/src/main/docs/servlet-component.adoc @@ -84,114 +84,24 @@ Therefore, it should be used only as input into your Camel routes. To issue HTTP requests against other HTTP endpoints, use the xref:http-component.adoc[HTTP Component]. -== Putting Camel JARs in the app server boot classpath +== Example `CamelHttpTransportServlet` configuration -If you put the Camel JARs such as `camel-core`, `camel-servlet`, etc. in -the boot classpath of your application server (e.g., usually in its lib -directory), then mind that the servlet mapping list is now shared -between multiple deployed Camel application in the app server. +=== Camel Spring Boot / Camel Quarkus -Mind that putting Camel JARs in the boot classpath of the application -server is generally not best practice! +When running camel-servlet on the Spring Boot or Camel Quarkus runtimes, `CamelHttpTransportServlet` is configured for +you automatically and is driven by configuration properties. Refer to the camel-servlet configuration documentation for these runtimes. -So in those situations you *must* define a custom and unique servlet -name in each of your Camel applications, e.g., in the `web.xml` define: +=== Servlet container / application server -[source,xml] -- - - MyServlet - org.apache.camel.component.servlet.CamelHttpTransportServlet - 1 - - - - MyServlet - /* - -- - -And in your Camel endpoints then include the servlet name as well - -[source,xml] - - - ... - - -Camel detects this duplicate and fails to -start the application. You can control to ignore this duplicate by -setting the servlet init-parameter ignoreDuplicateServletName to true as -follows: - -[source,xml] - -CamelServlet -Camel Http Transport Servlet - org.apache.camel.component.servlet.CamelHttpTransportServlet - - ignoreDuplicateServletName - true - - - -But it is *strongly advised* to use unique `servlet-name` for each Camel -application to avoid this duplication clash, as well any unforeseen -side effects. - -== Servlet >= 3.0 and AsyncContext - -To enable Camel to benefit from Servlet asynchronous support, you must: +If you're running Camel standalone on a Servlet container or application server, you can use `web.xml` to configure `CamelHttpTransportServlet`. -. Enable `async` boolean init parameter by setting it to `true` -. Without more configuration it will reuse servlet thread pool to handle the processing, but you can set `executorRef` to an executor service reference to let another pool handle the processing of the exchange. -It will use camel context registry by default and potentially fallback on an executor policy or default executor service if no bean matches this name. - -Note that to force camel to get back pre-3.7.0 behavior which was to wait in another container background thread, you can set `forceAwait` boolean init parameter to `true`. - -Sample async configuration: - -[source,xml] - -CamelServlet -Camel Http Transport Servlet - org.apache.camel.component.servlet.CamelHttpTransportServlet - - async - true - - - executorRef - my-threads - - - - -== Sample - -Use xref:servlet-component.adoc[Servlet] in Spring web applications for simplicity's sake. -In this sample, we define a route that exposes an HTTP service at -http://localhost:8080/camel/services/hello. - -First,
Re: [PR] CAMEL-20519: Servlet documentation improvements [camel]
davsclaus merged PR #13385: URL: https://github.com/apache/camel/pull/13385 -- 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-karavan) branch main updated: Basic fix
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new a361b18e Basic fix
a361b18e is described below
commit a361b18ee53ea4904e535189963342f0feb84a06
Author: Marat Gubaidullin
AuthorDate: Tue Mar 5 21:44:28 2024 -0500
Basic fix
---
karavan-app/src/main/webui/src/api/LogWatchApi.tsx | 2 ++
karavan-app/src/main/webui/src/api/NotificationApi.tsx | 2 ++
2 files changed, 4 insertions(+)
diff --git a/karavan-app/src/main/webui/src/api/LogWatchApi.tsx
b/karavan-app/src/main/webui/src/api/LogWatchApi.tsx
index f761f7b3..eb8abf73 100644
--- a/karavan-app/src/main/webui/src/api/LogWatchApi.tsx
+++ b/karavan-app/src/main/webui/src/api/LogWatchApi.tsx
@@ -32,6 +32,8 @@ export class LogWatchApi {
} else if (KaravanApi.authType === 'basic' &&
KaravanApi.basicToken?.length > 0) {
headers.Authorization = "Basic " + KaravanApi.basicToken
ready = true;
+} else {
+ready = KaravanApi.authType === 'public';
}
if (ready) {
await fetchEventSource("/api/logwatch/" + type + "/" +
podName, {
diff --git a/karavan-app/src/main/webui/src/api/NotificationApi.tsx
b/karavan-app/src/main/webui/src/api/NotificationApi.tsx
index c4971e17..93692dd7 100644
--- a/karavan-app/src/main/webui/src/api/NotificationApi.tsx
+++ b/karavan-app/src/main/webui/src/api/NotificationApi.tsx
@@ -50,6 +50,8 @@ export class NotificationApi {
} else if (KaravanApi.authType === 'basic' &&
KaravanApi.basicToken?.length > 0) {
headers.Authorization = "Basic " + KaravanApi.basicToken
ready = true;
+} else {
+ready = KaravanApi.authType === 'public';
}
if (ready) {
NotificationApi.fetch('/api/notification/system', controller,
headers,
(camel-karavan) branch main updated: Basic authentication
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 3b17180f Basic authentication
3b17180f is described below
commit 3b17180f9838c00695f21aa6a24db17cfe4b2293
Author: Marat Gubaidullin
AuthorDate: Tue Mar 5 21:32:05 2024 -0500
Basic authentication
---
.../org/apache/camel/karavan/api/AuthResource.java | 50 ++
.../apache/camel/karavan/api/UsersResource.java| 2 +-
karavan-app/src/main/webui/src/api/KaravanApi.tsx | 44 +++-
karavan-app/src/main/webui/src/api/LogWatchApi.tsx | 59 --
.../src/main/webui/src/api/NotificationApi.tsx | 20 +---
karavan-app/src/main/webui/src/api/ProjectStore.ts | 6 +++
6 files changed, 137 insertions(+), 44 deletions(-)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
b/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
index 00751702..a277360d 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
@@ -17,20 +17,18 @@
package org.apache.camel.karavan.api;
import jakarta.inject.Inject;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
-import org.apache.camel.karavan.service.KaravanCacheService;
import org.apache.camel.karavan.kubernetes.KubernetesService;
import org.apache.camel.karavan.service.AuthService;
import org.apache.camel.karavan.service.ProjectService;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.health.HealthCheckResponse;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.*;
@Path("/public")
public class AuthResource {
@@ -44,8 +42,42 @@ public class AuthResource {
@Inject
KubernetesService kubernetesService;
-@Inject
-KaravanCacheService karavanCacheService;
+@ConfigProperty(name = "quarkus.security.users.embedded.realm-name",
defaultValue = "")
+Optional realm;
+
+@ConfigProperty(name = "quarkus.security.users.embedded.users")
+Optional> users;
+
+public static String getMd5Hash(String input) throws
NoSuchAlgorithmException {
+MessageDigest md = MessageDigest.getInstance("MD5");
+byte[] digest = md.digest(input.getBytes());
+StringBuilder sb = new StringBuilder();
+for (byte b : digest) {
+sb.append(String.format("%02x", b));
+}
+return sb.toString();
+}
+
+@Path("/auth")
+@POST
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+public Response authenticateUser(@FormParam("username") String username,
@FormParam("password") String password) {
+try {
+if (users.isPresent() && users.get().containsKey(username)) {
+var pwdStored = users.get().get(username);
+var pwdReceived = new
String(Base64.getDecoder().decode(password));
+var pwdString = username + ":" + realm.orElse("") + ":" +
pwdReceived;
+String pwdToCheck = getMd5Hash(pwdString);
+if (Objects.equals(pwdToCheck, pwdStored)) {
+return Response.ok().build();
+}
+}
+return
Response.status(Response.Status.FORBIDDEN).entity("Incorrect Username and/or
Password!").build();
+} catch (Exception e) {
+return
Response.status(Response.Status.FORBIDDEN).entity(e.getMessage()).build();
+}
+}
@GET
@Path("/auth")
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/api/UsersResource.java
b/karavan-app/src/main/java/org/apache/camel/karavan/api/UsersResource.java
index f63c1eb0..36d0a12f 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/api/UsersResource.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/api/UsersResource.java
@@ -53,7 +53,7 @@ public class UsersResource {
UserInfo userInfo = (UserInfo)
securityIdentity.getAttributes().get("userinfo");
this.userName = securityIdentity.getPrincipal().getName();
this.roles = securityIdentity.getRoles();
-this.displayName = userInfo.getName();
+this.displayName = userInfo != null ? userInfo.getName() :
userName;
}
public String getDisplayName() {
diff --git a/karavan-app/src/main/webui/src/api/KaravanApi.tsx
b/karavan-app/src/main/webui/src/api/KaravanApi.tsx
index 8ef409dd..1738290f 100644
---
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-1979964204 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 8165912549-1413-fcfac8c4-85f8-4bbc-a97c-1f700034da7c * Camel Quarkus Commit: 50c860f036779ed78daccb357b70cdb00bf0f73b * Quarkus Main Commit: eb025a743de85f97d0d547165e8b5a003cc77c33 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/8165912549 -- 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] Bump quarkiverse-jsch.version from 3.0.6 to 3.0.7 [camel-quarkus]
github-actions[bot] commented on PR #5842: URL: https://github.com/apache/camel-quarkus/pull/5842#issuecomment-1979923964 :warning: :warning: :warning: Branch auto synchronized due to changes in generated files. New workflow run triggered: https://github.com/apache/camel-quarkus/actions/runs/8165615581 Please check the workflow result before merging. :warning: :warning: :warning: -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch dependabot/maven/quarkiverse-jsch.version-3.0.7 updated (07a828ae6a -> a93b24e344)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkiverse-jsch.version-3.0.7 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 07a828ae6a Bump quarkiverse-jsch.version from 3.0.6 to 3.0.7 add a93b24e344 Auto generated changes for dependabot commit 07a828ae6aed044326cb5a03654303a52a0b567e No new revisions were added by this update. Summary of changes: pom.xml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml| 6 +++--- poms/bom/src/main/generated/flattened-reduced-pom.xml | 6 +++--- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-)
(camel-quarkus) branch dependabot/maven/quarkiverse-jsch.version-3.0.7 updated (d8483d48ca -> 07a828ae6a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkiverse-jsch.version-3.0.7 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard d8483d48ca Auto generated changes for dependabot commit d8d615ff45559b53f6f06596fd7f1c5678122c9f discard d8d615ff45 Bump quarkiverse-jsch.version from 3.0.6 to 3.0.7 add 771d92245f Migrate file watch tests to new harness #3584 (#5840) add eb025a743d Bump quarkiverse-jgit.version from 3.0.6 to 3.0.7 (#5841) add 07a828ae6a Bump quarkiverse-jsch.version from 3.0.6 to 3.0.7 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 (d8483d48ca) \ N -- N -- N refs/heads/dependabot/maven/quarkiverse-jsch.version-3.0.7 (07a828ae6a) 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. No new revisions were added by this update. Summary of changes: .../camel/quarkus/component/file/it/FileIT.java| 24 -- .../camel/quarkus/component/file/it/FileTest.java | 88 -- .../component/file/it/NonFlakyFileTest.java| 74 +- pom.xml| 4 +- poms/bom/src/main/generated/flattened-full-pom.xml | 10 +-- .../src/main/generated/flattened-reduced-pom.xml | 10 +-- .../generated/flattened-reduced-verbose-pom.xml| 10 +-- 7 files changed, 90 insertions(+), 130 deletions(-) delete mode 100644 integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileIT.java delete mode 100644 integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileTest.java
Re: [PR] Bump quarkiverse-jsch.version from 3.0.6 to 3.0.7 [camel-quarkus]
zhfeng commented on PR #5842: URL: https://github.com/apache/camel-quarkus/pull/5842#issuecomment-1979916217 @dependabot rebase -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch dependabot/maven/quarkiverse-jgit.version-3.0.7 deleted (was bc4fb71a4d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkiverse-jgit.version-3.0.7 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git was bc4fb71a4d Auto generated changes for dependabot commit e550e3b88f66dfb9f64b4c5777158ba38a4ec588 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-quarkus) branch main updated: Bump quarkiverse-jgit.version from 3.0.6 to 3.0.7 (#5841)
This is an automated email from the ASF dual-hosted git repository. zhfeng pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new eb025a743d Bump quarkiverse-jgit.version from 3.0.6 to 3.0.7 (#5841) eb025a743d is described below commit eb025a743de85f97d0d547165e8b5a003cc77c33 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Mar 6 09:28:07 2024 +0800 Bump quarkiverse-jgit.version from 3.0.6 to 3.0.7 (#5841) * Bump quarkiverse-jgit.version from 3.0.6 to 3.0.7 Bumps `quarkiverse-jgit.version` from 3.0.6 to 3.0.7. Updates `io.quarkiverse.jgit:quarkus-jgit` from 3.0.6 to 3.0.7 - [Release notes](https://github.com/quarkiverse/quarkus-jgit/releases) - [Commits](https://github.com/quarkiverse/quarkus-jgit/compare/3.0.6...3.0.7) Updates `io.quarkiverse.jgit:quarkus-jgit-deployment` from 3.0.6 to 3.0.7 - [Release notes](https://github.com/quarkiverse/quarkus-jgit/releases) - [Commits](https://github.com/quarkiverse/quarkus-jgit/compare/3.0.6...3.0.7) --- updated-dependencies: - dependency-name: io.quarkiverse.jgit:quarkus-jgit dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkiverse.jgit:quarkus-jgit-deployment dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Auto generated changes for dependabot commit e550e3b88f66dfb9f64b4c5777158ba38a4ec588 - Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml| 4 ++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index cd59ba8fc5..1a6eedb888 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ 1.0.0 3.8.0 2.0.2 -3.0.6 +3.0.7 3.0.6 3.2.4 3.7.1 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 7887458742..6f020fadb5 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6376,12 +6376,12 @@ io.quarkiverse.jgit quarkus-jgit -3.0.6 +3.0.7 io.quarkiverse.jgit quarkus-jgit-deployment -3.0.6 +3.0.7 io.quarkiverse.jsch diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 46d002a059..31f3ab3d7a 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6341,12 +6341,12 @@ io.quarkiverse.jgit quarkus-jgit -3.0.6 +3.0.7 io.quarkiverse.jgit quarkus-jgit-deployment -3.0.6 +3.0.7 io.quarkiverse.jsch diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 85e312400a..04102abda4 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6341,12 +6341,12 @@ io.quarkiverse.jgit quarkus-jgit -3.0.6 +3.0.7 io.quarkiverse.jgit quarkus-jgit-deployment -3.0.6 +3.0.7 io.quarkiverse.jsch
Re: [PR] Bump quarkiverse-jgit.version from 3.0.6 to 3.0.7 [camel-quarkus]
zhfeng merged PR #5841: URL: https://github.com/apache/camel-quarkus/pull/5841 -- 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: Migrate file watch tests to new harness #3584 (#5840)
This is an automated email from the ASF dual-hosted git repository.
zhfeng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 771d92245f Migrate file watch tests to new harness #3584 (#5840)
771d92245f is described below
commit 771d92245f602cfefaa7206ce2ee716c640f578b
Author: Alexandre Gallice
AuthorDate: Wed Mar 6 02:27:41 2024 +0100
Migrate file watch tests to new harness #3584 (#5840)
---
.../camel/quarkus/component/file/it/FileIT.java| 24 --
.../camel/quarkus/component/file/it/FileTest.java | 88 --
.../component/file/it/NonFlakyFileTest.java| 74 +-
3 files changed, 73 insertions(+), 113 deletions(-)
diff --git
a/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileIT.java
b/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileIT.java
deleted file mode 100644
index 62dda77376..00
---
a/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileIT.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.quarkus.component.file.it;
-
-import io.quarkus.test.junit.QuarkusIntegrationTest;
-
-@QuarkusIntegrationTest
-class FileIT extends FileTest {
-
-}
diff --git
a/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileTest.java
b/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileTest.java
deleted file mode 100644
index 12238e8cc6..00
---
a/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.quarkus.component.file.it;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.concurrent.TimeUnit;
-
-import io.quarkus.test.junit.QuarkusTest;
-import io.restassured.RestAssured;
-import io.restassured.path.json.JsonPath;
-import io.restassured.response.ValidatableResponse;
-import org.apache.camel.quarkus.core.util.FileUtils;
-import org.junit.jupiter.api.Test;
-
-import static org.awaitility.Awaitility.await;
-
-@QuarkusTest
-class FileTest {
-
-@Test
-public void fileWatchCreateUpdate() throws IOException {
-final Path dir =
Files.createTempDirectory(FileTest.class.getSimpleName()).toRealPath();
-RestAssured.given()
-.queryParam("path", dir.toString())
-.get("/file-watch/get-events")
-.then()
-.statusCode(204);
-
-final Path file = dir.resolve("file.txt");
-Files.write(file, "a file content".getBytes(StandardCharsets.UTF_8));
-
-awaitEvent(dir, file, "CREATE");
-
-Files.write(file, "changed content".getBytes(StandardCharsets.UTF_8));
-
-awaitEvent(dir, file, "MODIFY");
-
-Files.delete(file);
-
-awaitEvent(dir, file, "DELETE");
-}
-
-private static void awaitEvent(final Path dir, final Path file, final
String type) {
-await()
-.pollInterval(10, TimeUnit.MILLISECONDS)
-.atMost(20, TimeUnit.SECONDS)
-.until(() -> {
-final
Re: [PR] Migrate file watch tests to new harness #3584 [camel-quarkus]
zhfeng merged PR #5840: URL: https://github.com/apache/camel-quarkus/pull/5840 -- 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/knative.dev/eventing-0.40.3 created (now 9c2872cf0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/knative.dev/eventing-0.40.3 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 9c2872cf0 chore(deps): bump knative.dev/eventing from 0.39.3 to 0.40.3 No new revisions were added by this update.
[PR] chore(deps): bump knative.dev/eventing from 0.39.3 to 0.40.3 [camel-k]
dependabot[bot] opened a new pull request, #5220: URL: https://github.com/apache/camel-k/pull/5220 Bumps [knative.dev/eventing](https://github.com/knative/eventing) from 0.39.3 to 0.40.3. Commits https://github.com/knative/eventing/commit/b5528fcb63b26e81f6788bd91f1565e90d3d332f;>b5528fc [release-1.13] Remove assumption on default namespace for EventType reference... https://github.com/knative/eventing/commit/40637813ad8dd63481c73223b0bc930e114eb404;>4063781 [release-1.13] Move OIDC tests to test/rekt (https://redirect.github.com/knative/eventing/issues/7705;>#7705) https://github.com/knative/eventing/commit/c818a3aa817aa0a9b2dd17563ff0eda938a96c6d;>c818a3a [release-1.13] Create SinkBindings token-secret only if sink has an audience ... https://github.com/knative/eventing/commit/a78fb6a2fac2db9523dccbf2c1549b839e0018b1;>a78fb6a [release-1.13] feat: replace yaml merge tags (https://redirect.github.com/knative/eventing/issues/7664;>#7664) https://github.com/knative/eventing/commit/2e6742c63afe771e751d5d03b25b478b79bf6ef9;>2e6742c [release-1.13] Fix mtbroker-filter to proxy response headers (https://redirect.github.com/knative/eventing/issues/7633;>#7633) https://github.com/knative/eventing/commit/fd952282e353070526aa8f474856b981e64560bb;>fd95228 Enable storage of EventType v1b2 (https://redirect.github.com/knative/eventing/issues/7594;>#7594) https://github.com/knative/eventing/commit/6962251f674cb7d276fe0434e2b4b53a49cd1716;>6962251 Add a Prerequisite helper to check if the OIDC authentication feature flag is... https://github.com/knative/eventing/commit/341a8df35c29f8721838c6762f65c4df904a1758;>341a8df [main] Update community files (https://redirect.github.com/knative/eventing/issues/7611;>#7611) https://github.com/knative/eventing/commit/bb5313df8dd5295573cbc4a08206af741edeeef0;>bb5313d Remove OIDC service account, when OIDC feature is disabled again (https://redirect.github.com/knative/eventing/issues/7570;>#7570) https://github.com/knative/eventing/commit/44ff98b38212a812337725924a7fcd58be526a86;>44ff98b Eventing TLS: Add scheme label to metrics (https://redirect.github.com/knative/eventing/issues/7581;>#7581) Additional commits viewable in https://github.com/knative/eventing/compare/v0.39.3...v0.40.3;>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
[PR] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
github-actions[bot] opened a new pull request, #1100: URL: https://github.com/apache/camel-spring-boot/pull/1100 Periodic Sync of Camel Spring Boot Main Branch with main Camel Main. see https://github.com/apache/camel-spring-boot/blob/main/.github/workflows/automatic-sync-main.yml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-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 825f0ce6a chore: nightly automatic updates 825f0ce6a is described below commit 825f0ce6aaf3a52c2620f8efab31b8167973c5fc Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Mar 5 23:46:11 2024 + chore: nightly automatic updates --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 895b7fa94..b5525e903 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,8 @@ **Merged pull requests:** +- chore\(deps\): bump golang.org/x/oauth2 from 0.17.0 to 0.18.0 [\#5214](https://github.com/apache/camel-k/pull/5214) ([dependabot[bot]](https://github.com/apps/dependabot)) +- fix\(ci\): add snapshot repo [\#5209](https://github.com/apache/camel-k/pull/5209) ([squakez](https://github.com/squakez)) - chore\(deps\): bump github.com/stretchr/testify from 1.8.4 to 1.9.0 [\#5208](https://github.com/apache/camel-k/pull/5208) ([dependabot[bot]](https://github.com/apps/dependabot)) - fix\(e2e\): stricter pipe test check [\#5202](https://github.com/apache/camel-k/pull/5202) ([squakez](https://github.com/squakez)) - fix\(trait\): deprecate operator inspecting secrets [\#5201](https://github.com/apache/camel-k/pull/5201) ([squakez](https://github.com/squakez))
Re: [PR] Bump quarkiverse-jsch.version from 3.0.6 to 3.0.7 [camel-quarkus]
github-actions[bot] commented on PR #5842: URL: https://github.com/apache/camel-quarkus/pull/5842#issuecomment-1979762645 :warning: :warning: :warning: Branch auto synchronized due to changes in generated files. New workflow run triggered: https://github.com/apache/camel-quarkus/actions/runs/8164013466 Please check the workflow result before merging. :warning: :warning: :warning: -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch dependabot/maven/quarkiverse-jsch.version-3.0.7 updated (d8d615ff45 -> d8483d48ca)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkiverse-jsch.version-3.0.7 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from d8d615ff45 Bump quarkiverse-jsch.version from 3.0.6 to 3.0.7 add d8483d48ca Auto generated changes for dependabot commit d8d615ff45559b53f6f06596fd7f1c5678122c9f No new revisions were added by this update. Summary of changes: pom.xml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml| 6 +++--- poms/bom/src/main/generated/flattened-reduced-pom.xml | 6 +++--- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-)
[PR] Bump quarkiverse-jsch.version from 3.0.6 to 3.0.7 [camel-quarkus]
dependabot[bot] opened a new pull request, #5842: URL: https://github.com/apache/camel-quarkus/pull/5842 Bumps `quarkiverse-jsch.version` from 3.0.6 to 3.0.7. Updates `io.quarkiverse.jsch:quarkus-jsch` from 3.0.6 to 3.0.7 Commits https://github.com/quarkiverse/quarkus-jsch/commit/3a4d620df1ff61d675aa480dfb90856a98e60022;>3a4d620 [maven-release-plugin] prepare release 3.0.7 https://github.com/quarkiverse/quarkus-jsch/commit/2e4f843f7dad71e4bc3c4f9c3ea8a0b756d8957b;>2e4f843 Update the latest release version 3.0.7 in documentation https://github.com/quarkiverse/quarkus-jsch/commit/6fd8dd5e47ddc2524b1faf1bdf0cb32c2dcea1e5;>6fd8dd5 Release 3.0.7 (https://redirect.github.com/quarkiverse/quarkus-jsch/issues/136;>#136) https://github.com/quarkiverse/quarkus-jsch/commit/691369ddf8da055dd383ca6146a987d79e00b42b;>691369d Bump com.github.mwiede:jsch from 0.2.16 to 0.2.17 (https://redirect.github.com/quarkiverse/quarkus-jsch/issues/135;>#135) https://github.com/quarkiverse/quarkus-jsch/commit/c81f26c306cb3fb379099a6ebeeb9098aad6b67e;>c81f26c Bump version.sshd from 2.12.0 to 2.12.1 (https://redirect.github.com/quarkiverse/quarkus-jsch/issues/134;>#134) https://github.com/quarkiverse/quarkus-jsch/commit/df3193556abd2cd4a1df1e02ff61e4e5add71ac0;>df31935 Bump io.quarkiverse:quarkiverse-parent from 15 to 16 (https://redirect.github.com/quarkiverse/quarkus-jsch/issues/133;>#133) https://github.com/quarkiverse/quarkus-jsch/commit/0467acfb215a9d2d4b7c4fd7519b42837bd0403a;>0467acf Bump build/release workflow to JDK 17 (https://redirect.github.com/quarkiverse/quarkus-jsch/issues/132;>#132) https://github.com/quarkiverse/quarkus-jsch/commit/9552d7ea858ddfbe2ba3645ddc603c174296e465;>9552d7e Update release.yml https://github.com/quarkiverse/quarkus-jsch/commit/f5173a07f61afc6915af8f452fb9327cfdd884ec;>f5173a0 [maven-release-plugin] prepare for next development iteration See full diff in https://github.com/quarkiverse/quarkus-jsch/compare/3.0.6...3.0.7;>compare view Updates `io.quarkiverse.jsch:quarkus-jsch-deployment` from 3.0.6 to 3.0.7 Commits https://github.com/quarkiverse/quarkus-jsch/commit/3a4d620df1ff61d675aa480dfb90856a98e60022;>3a4d620 [maven-release-plugin] prepare release 3.0.7 https://github.com/quarkiverse/quarkus-jsch/commit/2e4f843f7dad71e4bc3c4f9c3ea8a0b756d8957b;>2e4f843 Update the latest release version 3.0.7 in documentation https://github.com/quarkiverse/quarkus-jsch/commit/6fd8dd5e47ddc2524b1faf1bdf0cb32c2dcea1e5;>6fd8dd5 Release 3.0.7 (https://redirect.github.com/quarkiverse/quarkus-jsch/issues/136;>#136) https://github.com/quarkiverse/quarkus-jsch/commit/691369ddf8da055dd383ca6146a987d79e00b42b;>691369d Bump com.github.mwiede:jsch from 0.2.16 to 0.2.17 (https://redirect.github.com/quarkiverse/quarkus-jsch/issues/135;>#135) https://github.com/quarkiverse/quarkus-jsch/commit/c81f26c306cb3fb379099a6ebeeb9098aad6b67e;>c81f26c Bump version.sshd from 2.12.0 to 2.12.1 (https://redirect.github.com/quarkiverse/quarkus-jsch/issues/134;>#134) https://github.com/quarkiverse/quarkus-jsch/commit/df3193556abd2cd4a1df1e02ff61e4e5add71ac0;>df31935 Bump io.quarkiverse:quarkiverse-parent from 15 to 16 (https://redirect.github.com/quarkiverse/quarkus-jsch/issues/133;>#133) https://github.com/quarkiverse/quarkus-jsch/commit/0467acfb215a9d2d4b7c4fd7519b42837bd0403a;>0467acf Bump build/release workflow to JDK 17 (https://redirect.github.com/quarkiverse/quarkus-jsch/issues/132;>#132) https://github.com/quarkiverse/quarkus-jsch/commit/9552d7ea858ddfbe2ba3645ddc603c174296e465;>9552d7e Update release.yml https://github.com/quarkiverse/quarkus-jsch/commit/f5173a07f61afc6915af8f452fb9327cfdd884ec;>f5173a0 [maven-release-plugin] prepare for next development iteration See full diff in https://github.com/quarkiverse/quarkus-jsch/compare/3.0.6...3.0.7;>compare view 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
(camel-quarkus) branch dependabot/maven/quarkiverse-jsch.version-3.0.7 created (now d8d615ff45)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkiverse-jsch.version-3.0.7 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at d8d615ff45 Bump quarkiverse-jsch.version from 3.0.6 to 3.0.7 No new revisions were added by this update.
Re: [PR] Bump quarkiverse-jgit.version from 3.0.6 to 3.0.7 [camel-quarkus]
github-actions[bot] commented on PR #5841: URL: https://github.com/apache/camel-quarkus/pull/5841#issuecomment-1979726059 :warning: :warning: :warning: Branch auto synchronized due to changes in generated files. New workflow run triggered: https://github.com/apache/camel-quarkus/actions/runs/8163680875 Please check the workflow result before merging. :warning: :warning: :warning: -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch dependabot/maven/quarkiverse-jgit.version-3.0.7 updated (e550e3b88f -> bc4fb71a4d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkiverse-jgit.version-3.0.7 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from e550e3b88f Bump quarkiverse-jgit.version from 3.0.6 to 3.0.7 add bc4fb71a4d Auto generated changes for dependabot commit e550e3b88f66dfb9f64b4c5777158ba38a4ec588 No new revisions were added by this update. Summary of changes: poms/bom/src/main/generated/flattened-full-pom.xml| 4 ++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
(camel-quarkus) branch dependabot/maven/quarkiverse-jgit.version-3.0.7 created (now e550e3b88f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkiverse-jgit.version-3.0.7 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at e550e3b88f Bump quarkiverse-jgit.version from 3.0.6 to 3.0.7 No new revisions were added by this update.
[PR] Bump quarkiverse-jgit.version from 3.0.6 to 3.0.7 [camel-quarkus]
dependabot[bot] opened a new pull request, #5841: URL: https://github.com/apache/camel-quarkus/pull/5841 Bumps `quarkiverse-jgit.version` from 3.0.6 to 3.0.7. Updates `io.quarkiverse.jgit:quarkus-jgit` from 3.0.6 to 3.0.7 Release notes Sourced from https://github.com/quarkiverse/quarkus-jgit/releases;>io.quarkiverse.jgit:quarkus-jgit's releases. 3.0.7 What's Changed Update release workflow by https://github.com/gastaldi;>@​gastaldi in https://redirect.github.com/quarkiverse/quarkus-jgit/pull/112;>quarkiverse/quarkus-jgit#112 Bump quarkus-jsch.version from 3.0.5 to 3.0.6 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/quarkiverse/quarkus-jgit/pull/113;>quarkiverse/quarkus-jgit#113 Bump io.quarkiverse:quarkiverse-parent from 15 to 16 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/quarkiverse/quarkus-jgit/pull/114;>quarkiverse/quarkus-jgit#114 Bump to Quarkus 3.2.10.Final by https://github.com/gastaldi;>@​gastaldi in https://redirect.github.com/quarkiverse/quarkus-jgit/pull/115;>quarkiverse/quarkus-jgit#115 Bump quarkus-jsch.version from 3.0.6 to 3.0.7 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/quarkiverse/quarkus-jgit/pull/116;>quarkiverse/quarkus-jgit#116 Release 3.0.7 by https://github.com/gastaldi;>@​gastaldi in https://redirect.github.com/quarkiverse/quarkus-jgit/pull/117;>quarkiverse/quarkus-jgit#117 Full Changelog: https://github.com/quarkiverse/quarkus-jgit/compare/3.0.6...3.0.7;>https://github.com/quarkiverse/quarkus-jgit/compare/3.0.6...3.0.7 Commits https://github.com/quarkiverse/quarkus-jgit/commit/d1fda5bb5b1c7d9fc733714060704150022073da;>d1fda5b [maven-release-plugin] prepare release 3.0.7 https://github.com/quarkiverse/quarkus-jgit/commit/b6c10df74ce85621905dcd2f0c38e054aee435dd;>b6c10df Update the latest release version 3.0.7 in documentation https://github.com/quarkiverse/quarkus-jgit/commit/4676c939cbc29f13e3db4e7eebedabf59d25aba7;>4676c93 Release 3.0.7 (https://redirect.github.com/quarkiverse/quarkus-jgit/issues/117;>#117) https://github.com/quarkiverse/quarkus-jgit/commit/70a8e8b85a0bdb2d25ccdd0a48d126b010c873bb;>70a8e8b Bump quarkus-jsch.version from 3.0.6 to 3.0.7 (https://redirect.github.com/quarkiverse/quarkus-jgit/issues/116;>#116) https://github.com/quarkiverse/quarkus-jgit/commit/799c6eea146ab3f24bba8592287cadbd3d4b667e;>799c6ee Bump to Quarkus 3.2.10.Final (https://redirect.github.com/quarkiverse/quarkus-jgit/issues/115;>#115) https://github.com/quarkiverse/quarkus-jgit/commit/1dc55d728a4293bf2cc5d29097b03362b587af3b;>1dc55d7 Bump io.quarkiverse:quarkiverse-parent from 15 to 16 (https://redirect.github.com/quarkiverse/quarkus-jgit/issues/114;>#114) https://github.com/quarkiverse/quarkus-jgit/commit/40bc82edfe121dbf7a3ebb431ab4bad36a360bc7;>40bc82e Bump quarkus-jsch.version from 3.0.5 to 3.0.6 https://github.com/quarkiverse/quarkus-jgit/commit/23ce97d5daecd3e4068bb97db580c580db75eb28;>23ce97d Update build.yml https://github.com/quarkiverse/quarkus-jgit/commit/4430fbb5e1753b9c77c4415d5d38eb00b7161ba3;>4430fbb Update release workflow (https://redirect.github.com/quarkiverse/quarkus-jgit/issues/112;>#112) https://github.com/quarkiverse/quarkus-jgit/commit/af3e0da41c9860da511d3f2df3097adc0e7b727f;>af3e0da [maven-release-plugin] prepare for next development iteration See full diff in https://github.com/quarkiverse/quarkus-jgit/compare/3.0.6...3.0.7;>compare view Updates `io.quarkiverse.jgit:quarkus-jgit-deployment` from 3.0.6 to 3.0.7 Release notes Sourced from https://github.com/quarkiverse/quarkus-jgit/releases;>io.quarkiverse.jgit:quarkus-jgit-deployment's releases. 3.0.7 What's Changed Update release workflow by https://github.com/gastaldi;>@​gastaldi in https://redirect.github.com/quarkiverse/quarkus-jgit/pull/112;>quarkiverse/quarkus-jgit#112 Bump quarkus-jsch.version from 3.0.5 to 3.0.6 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/quarkiverse/quarkus-jgit/pull/113;>quarkiverse/quarkus-jgit#113 Bump io.quarkiverse:quarkiverse-parent from 15 to 16 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/quarkiverse/quarkus-jgit/pull/114;>quarkiverse/quarkus-jgit#114 Bump to Quarkus 3.2.10.Final by https://github.com/gastaldi;>@​gastaldi in https://redirect.github.com/quarkiverse/quarkus-jgit/pull/115;>quarkiverse/quarkus-jgit#115 Bump quarkus-jsch.version from 3.0.6 to 3.0.7 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/quarkiverse/quarkus-jgit/pull/116;>quarkiverse/quarkus-jgit#116 Release 3.0.7 by https://github.com/gastaldi;>@​gastaldi in https://redirect.github.com/quarkiverse/quarkus-jgit/pull/117;>quarkiverse/quarkus-jgit#117 Full Changelog:
Re: [PR] Upgrade cq-maven-plugin to 4.6.1 [camel-quarkus]
jamesnetherton merged PR #5838: URL: https://github.com/apache/camel-quarkus/pull/5838 -- 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: Upgrade cq-maven-plugin to 4.6.1
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 fb5dcac6a0 Upgrade cq-maven-plugin to 4.6.1 fb5dcac6a0 is described below commit fb5dcac6a0ba363805c75597e980b744309deb8b Author: James Netherton AuthorDate: Tue Mar 5 14:49:35 2024 + Upgrade cq-maven-plugin to 4.6.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fc6a15ad0a..cd59ba8fc5 100644 --- a/pom.xml +++ b/pom.xml @@ -178,7 +178,7 @@ 0.1.0 -4.5.0 +4.6.1 2.7.11 3.5.0 3.2.0
(camel-quarkus) 07/07: Upgrade cq-maven-plugin to 4.6.1
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 8243917e6a06722133ba6099b5276e1f97d2c892 Author: James Netherton AuthorDate: Tue Mar 5 14:49:35 2024 + Upgrade cq-maven-plugin to 4.6.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 969b1d1c0d..e9695e5469 100644 --- a/pom.xml +++ b/pom.xml @@ -178,7 +178,7 @@ 0.1.0 -4.5.0 +4.6.1 2.7.11 3.5.0 3.1.1
(camel-quarkus) 06/07: Add additional Servlet test coverage
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 4d907e3bd71f239a4268c4a508b372bd70d2dc8e
Author: James Netherton
AuthorDate: Tue Mar 5 09:48:35 2024 +
Add additional Servlet test coverage
---
.../quarkus/component/servlet/CamelRoute.java | 26 +-
.../quarkus/component/servlet/CustomException.java | 28 +++
.../src/main/resources/application.properties | 6 ++
.../component/servlet/CamelServletTest.java| 97 --
4 files changed, 148 insertions(+), 9 deletions(-)
diff --git
a/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CamelRoute.java
b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CamelRoute.java
index 6c8c117c35..2ca381f295 100644
---
a/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CamelRoute.java
+++
b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CamelRoute.java
@@ -44,10 +44,34 @@ public class CamelRoute extends RouteBuilder {
.to("direct:echoMethodPath")
.post("/rest-post")
+.to("direct:echoMethodPath")
+
+.put("/rest-put")
+.to("direct:echoMethodPath")
+
+.patch("/rest-patch")
+.to("direct:echoMethodPath")
+
+.delete("/rest-delete")
+.to("direct:echoMethodPath")
+
+.head("/rest-head")
.to("direct:echoMethodPath");
from("servlet://hello?matchOnUriPrefix=true")
-.setBody(constant("GET: /hello"));
+.to("direct:echoMethodPath");
+
+
from("servlet://options?servletName=options-method-servlet=true")
+.to("direct:echoMethodPath");
+
+
from("servlet://trace?servletName=trace-method-servlet=true")
+.to("direct:echoMethodPath");
+
+
from("servlet://transfer/exception?transferException=true=false")
+.throwException(new CustomException());
+
+from("servlet://params")
+.setBody().simple("${header.prefix} ${header.suffix}");
from("servlet://configuration")
.process(servletConfigInfoProcessor);
diff --git
a/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CustomException.java
b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CustomException.java
new file mode 100644
index 00..33fb3db78d
--- /dev/null
+++
b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CustomException.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.component.servlet;
+
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
+@RegisterForReflection(serialization = true)
+public class CustomException extends Exception {
+public static final String MESSAGE = "Something went wrong";
+
+public CustomException() {
+super(MESSAGE);
+}
+}
diff --git
a/integration-tests/servlet/src/main/resources/application.properties
b/integration-tests/servlet/src/main/resources/application.properties
index 06920af73f..76be5f65b3 100644
--- a/integration-tests/servlet/src/main/resources/application.properties
+++ b/integration-tests/servlet/src/main/resources/application.properties
@@ -15,6 +15,9 @@
## limitations under the License.
## ---
+# For transferException
+quarkus.camel.native.reflection.serialization-enabled=true
+
# Default servlet configuration
quarkus.camel.servlet.url-patterns=/folder-1/*,/folder-2/*,/debug/*
@@ -51,3 +54,6 @@
quarkus.camel.servlet.custom-executor-servlet.url-patterns=/custom-executor/*
quarkus.camel.servlet.custom-executor-servlet.async=true
quarkus.camel.servlet.custom-executor-servlet.executor-ref=customServletExecutor
+# Servlet to allow OPTIONS & TRACE
(camel-quarkus) branch 3.8.x updated (d9069881aa -> 8243917e6a)
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 d9069881aa Upgrade cq-maven-plugin to 4.5.0
new 3228a32d49 Add multipart configuration options to servlet extension
new 7386bcd672 Remove registration of Servlet classes with
AdditionalBeanBuildItem
new c0dee92d90 Document basic servlet extension usage and configuration
options
new e77cbd02a8 Support loadOnStartup, async, forceAwait & executorRef
configuration options
new 4f95132e32 Enable web.xml to be used to configure
CamelHttpTransportServlet for the servlet extension
new 4d907e3bd7 Add additional Servlet test coverage
new 8243917e6a Upgrade cq-maven-plugin to 4.6.1
The 7 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:
.../ROOT/pages/reference/extensions/servlet.adoc | 206
.../servlet/deployment/ServletProcessor.java | 53 +-
...nimalConfigTest.java => WebXmlServletTest.java} | 55 +++---
extensions/servlet/runtime/src/main/doc/usage.adoc | 103 ++
.../servlet/runtime/CamelServletConfig.java| 63 +++
integration-tests/servlet/pom.xml | 17 ++
.../quarkus/component/servlet/CamelRoute.java | 73 ++--
.../component/servlet}/CustomException.java| 11 +-
.../component/servlet/MultiPartProcessor.java} | 17 +-
.../component/servlet/ServletProducers.java| 71 +++
.../src/main/resources/application.properties | 50 -
.../component/servlet/CamelServletTest.java| 207 +++--
pom.xml| 2 +-
13 files changed, 844 insertions(+), 84 deletions(-)
copy
extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/{MinimalConfigTest.java
=> WebXmlServletTest.java} (59%)
create mode 100644 extensions/servlet/runtime/src/main/doc/usage.adoc
copy integration-tests/{main-yaml/src/main/java/org/apache/camel/quarkus/main
=>
servlet/src/main/java/org/apache/camel/quarkus/component/servlet}/CustomException.java
(83%)
copy
integration-tests/{camel-k-runtime/src/main/java/org/apache/camel/quarkus/k/it/yaml/MyProcessor.java
=>
servlet/src/main/java/org/apache/camel/quarkus/component/servlet/MultiPartProcessor.java}
(63%)
create mode 100644
integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/ServletProducers.java
(camel-quarkus) 05/07: Enable web.xml to be used to configure CamelHttpTransportServlet for the servlet extension
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 4f95132e32305e0d0877a59f39ffc9e0b8eeddd2
Author: James Netherton
AuthorDate: Mon Mar 4 15:54:57 2024 +
Enable web.xml to be used to configure CamelHttpTransportServlet for the
servlet extension
Fixes #5835
---
.../ROOT/pages/reference/extensions/servlet.adoc | 37
.../servlet/deployment/ServletProcessor.java | 14 -
.../component/servlet/test/WebXmlServletTest.java | 65 ++
extensions/servlet/runtime/src/main/doc/usage.adoc | 37
4 files changed, 152 insertions(+), 1 deletion(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/servlet.adoc
b/docs/modules/ROOT/pages/reference/extensions/servlet.adoc
index 848ac1299c..39fca43e78 100644
--- a/docs/modules/ROOT/pages/reference/extensions/servlet.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/servlet.adoc
@@ -117,6 +117,43 @@ from("servlet://goodbye?servletName=my-custom-b")
.setBody().constant("Goodbye World");
+*Finer control of Servlet configuration*
+
+If you need more control of the Servlet configuration, for example to
configure custom init parameters,
+then you can do this with a custom Servlet class through the
`jakarta.servlet.annotation.WebServlet` annotation options.
+
+[source,java]
+
+import jakarta.servlet.annotation.WebServlet;
+import org.apache.camel.component.servlet.CamelHttpTransportServlet;
+
+@WebServlet(
+urlPatterns = {"/*"},
+initParams = {
+@WebInitParam(name = "myParam", value = "myValue")
+}
+)
+public class MyCustomServlet extends CamelHttpTransportServlet {
+}
+
+
+Or you can configure the `CamelHttpTransportServlet` using a `web-app`
descriptor placed into `src/main/resources/META-INF/web.xml`.
+
+[source,xml]
+
+
+
+CamelServlet
+
org.apache.camel.component.servlet.CamelHttpTransportServlet
+
+
+
+CamelServlet
+/services/*
+
+
+
+
[id="extensions-servlet-transferexception-option-in-native-mode"]
== transferException option in native mode
diff --git
a/extensions/servlet/deployment/src/main/java/org/apache/camel/quarkus/component/servlet/deployment/ServletProcessor.java
b/extensions/servlet/deployment/src/main/java/org/apache/camel/quarkus/component/servlet/deployment/ServletProcessor.java
index 6afaf14202..a7ab69969f 100644
---
a/extensions/servlet/deployment/src/main/java/org/apache/camel/quarkus/component/servlet/deployment/ServletProcessor.java
+++
b/extensions/servlet/deployment/src/main/java/org/apache/camel/quarkus/component/servlet/deployment/ServletProcessor.java
@@ -25,10 +25,14 @@ import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.undertow.deployment.ServletBuildItem;
import io.quarkus.undertow.deployment.ServletBuildItem.Builder;
+import io.quarkus.undertow.deployment.WebMetadataBuildItem;
import jakarta.servlet.MultipartConfigElement;
import org.apache.camel.quarkus.servlet.runtime.CamelServletConfig;
import
org.apache.camel.quarkus.servlet.runtime.CamelServletConfig.ServletConfig;
import
org.apache.camel.quarkus.servlet.runtime.CamelServletConfig.ServletConfig.MultipartConfig;
+import org.jboss.metadata.web.spec.WebMetaData;
+
+import static
org.apache.camel.quarkus.servlet.runtime.CamelServletConfig.ServletConfig.DEFAULT_SERVLET_CLASS;
class ServletProcessor {
private static final String FEATURE = "camel-servlet";
@@ -41,8 +45,16 @@ class ServletProcessor {
}
@BuildStep
-void build(BuildProducer servlet) {
+void build(BuildProducer servlet, WebMetadataBuildItem
webMetadata) {
boolean servletCreated = false;
+
+WebMetaData metaData = webMetadata.getWebMetaData();
+if (metaData != null && metaData.getServlets() != null) {
+servletCreated = metaData.getServlets()
+.stream()
+.anyMatch(meta ->
meta.getServletClass().equals(DEFAULT_SERVLET_CLASS));
+}
+
if (camelServletConfig.defaultServlet.isValid()) {
servlet.produce(
newServlet(ServletConfig.DEFAULT_SERVLET_NAME,
camelServletConfig.defaultServlet));
diff --git
a/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/WebXmlServletTest.java
b/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/WebXmlServletTest.java
new file mode 100644
index 00..1c39eb7954
--- /dev/null
+++
b/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/WebXmlServletTest.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for
(camel-quarkus) 04/07: Support loadOnStartup, async, forceAwait & executorRef configuration options
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 e77cbd02a8cd6c947c12f1f93b5e2371bf42ad6e Author: James Netherton AuthorDate: Mon Mar 4 15:50:48 2024 + Support loadOnStartup, async, forceAwait & executorRef configuration options Fixes #5834 --- .../ROOT/pages/reference/extensions/servlet.adoc | 48 .../servlet/deployment/ServletProcessor.java | 19 - .../servlet/runtime/CamelServletConfig.java| 27 +++ .../quarkus/component/servlet/CamelRoute.java | 34 +++-- .../component/servlet/ServletProducers.java| 71 + .../src/main/resources/application.properties | 50 .../component/servlet/CamelServletTest.java| 89 ++ 7 files changed, 304 insertions(+), 34 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/servlet.adoc b/docs/modules/ROOT/pages/reference/extensions/servlet.adoc index ac9303ed92..848ac1299c 100644 --- a/docs/modules/ROOT/pages/reference/extensions/servlet.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/servlet.adoc @@ -156,6 +156,30 @@ A servletName as it would be defined in a `web.xml` file or in the `jakarta.serv | `string` | `CamelServlet` +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.load-on-startup]]`link:#quarkus.camel.servlet.load-on-startup[quarkus.camel.servlet.load-on-startup]` + +Sets the loadOnStartup priority on the Servlet. A loadOnStartup is a value greater than or equal to zero, indicates to the container the initialization priority of the Servlet. If loadOnStartup is a negative integer, the Servlet is initialized lazily. +| `java.lang.Integer` +| `-1` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.async]]`link:#quarkus.camel.servlet.async[quarkus.camel.servlet.async]` + +Enables Camel to benefit from asynchronous Servlet support. +| `boolean` +| `false` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.force-await]]`link:#quarkus.camel.servlet.force-await[quarkus.camel.servlet.force-await]` + +When set to `true` used in conjunction with `quarkus.camel.servlet.async = true`, this will force route processing to run synchronously. +| `boolean` +| `false` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.executor-ref]]`link:#quarkus.camel.servlet.executor-ref[quarkus.camel.servlet.executor-ref]` + +The name of a bean to configure an optional custom thread pool for handling Camel Servlet processing. +| `string` +| + |icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.multipart.location]]`link:#quarkus.camel.servlet.multipart.location[quarkus.camel.servlet.multipart.location]` An absolute path to a directory on the file system to store files temporarily while the parts are processed or when the size of the file exceeds the specified file-size-threshold configuration value. @@ -198,6 +222,30 @@ A servletName as it would be defined in a `web.xml` file or in the `jakarta.serv | `string` | `CamelServlet` +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.-named-servlets-.load-on-startup]]`link:#quarkus.camel.servlet.-named-servlets-.load-on-startup[quarkus.camel.servlet."named-servlets".load-on-startup]` + +Sets the loadOnStartup priority on the Servlet. A loadOnStartup is a value greater than or equal to zero, indicates to the container the initialization priority of the Servlet. If loadOnStartup is a negative integer, the Servlet is initialized lazily. +| `java.lang.Integer` +| `-1` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.-named-servlets-.async]]`link:#quarkus.camel.servlet.-named-servlets-.async[quarkus.camel.servlet."named-servlets".async]` + +Enables Camel to benefit from asynchronous Servlet support. +| `boolean` +| `false` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.-named-servlets-.force-await]]`link:#quarkus.camel.servlet.-named-servlets-.force-await[quarkus.camel.servlet."named-servlets".force-await]` + +When set to `true` used in conjunction with `quarkus.camel.servlet.async = true`, this will force route processing to run synchronously. +| `boolean` +| `false` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.-named-servlets-.executor-ref]]`link:#quarkus.camel.servlet.-named-servlets-.executor-ref[quarkus.camel.servlet."named-servlets".executor-ref]` + +The name of a bean to configure an optional custom thread pool for handling Camel Servlet processing. +| `string` +| + |icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.-named-servlets-.multipart.location]]`link:#quarkus.camel.servlet.-named-servlets-.multipart.location[quarkus.camel.servlet."named-servlets".multipart.location]` An absolute path to a directory on the file system to store files temporarily while the parts are
(camel-quarkus) 03/07: Document basic servlet extension usage and configuration options
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 c0dee92d90251cd64d04afb9d476e7cd5bb0eaae
Author: James Netherton
AuthorDate: Tue Mar 5 07:52:43 2024 +
Document basic servlet extension usage and configuration options
---
.../ROOT/pages/reference/extensions/servlet.adoc | 73 ++
extensions/servlet/runtime/src/main/doc/usage.adoc | 66 +++
2 files changed, 139 insertions(+)
diff --git a/docs/modules/ROOT/pages/reference/extensions/servlet.adoc
b/docs/modules/ROOT/pages/reference/extensions/servlet.adoc
index fd56d2364a..ac9303ed92 100644
--- a/docs/modules/ROOT/pages/reference/extensions/servlet.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/servlet.adoc
@@ -45,6 +45,79 @@ ifeval::[{doc-show-user-guide-link} == true]
Check the xref:user-guide/index.adoc[User guide] for more information about
writing Camel Quarkus applications.
endif::[]
+[id="extensions-servlet-usage"]
+== Usage
+[id="extensions-servlet-usage-configuring-camelhttptransportservlet"]
+=== Configuring CamelHttpTransportServlet
+
+[id="extensions-servlet-usage-minimal-configuration"]
+ Minimal configuration
+
+The simplest way to configure `CamelHttpTransportServlet` is with
configuration properties.
+The most minimal setup requires that you define one or more URL patterns for
the Servlet with `quarkus.camel.servlet.url-patterns`.
+
+For example with configuration like the following.
+
+[source,properties]
+
+quarkus.camel.servlet.url-patterns = /*
+
+
+And a Camel route.
+
+[source,java]
+
+from("servlet://greet")
+.setBody().constant("Hello World");
+
+
+Produces the message `Hello World`.
+
+[id="extensions-servlet-usage-advanced-configuration"]
+ Advanced configuration
+
+*Servlet name*
+
+To give a specific name to the Servlet you can use the
`quarkus.camel.servlet.servlet-name` configuration option.
+
+[source,properties]
+
+quarkus.camel.servlet.url-patterns = My Custom Name
+
+
+*Servlet class*
+
+You may use a custom Servlet class (E.g one that extends
`CamelHttpTransportServlet`) in your Camel routes.
+
+[source,properties]
+
+quarkus.camel.servlet.servlet-class = org.acme.MyCustomServlet
+
+
+*Multiple named Servlets*
+
+For more advanced use cases you can configure multiple 'named' Servlets.
+
+[source,properties]
+
+quarkus.camel.servlet.my-servlet-a.servlet-name = my-custom-a
+quarkus.camel.servlet.my-servlet-a.url-patterns = /custom/a/*
+
+quarkus.camel.servlet.my-servlet-b.servlet-name = my-custom-b
+quarkus.camel.servlet.my-servlet-b.servlet-class = org.acme.CustomServletB
+quarkus.camel.servlet.my-servlet-b.url-patterns = /custom/b/*
+
+
+[source,java]
+
+from("servlet://greet?servletName=my-custom-a")
+.setBody().constant("Hello World");
+
+from("servlet://goodbye?servletName=my-custom-b")
+.setBody().constant("Goodbye World");
+
+
+
[id="extensions-servlet-transferexception-option-in-native-mode"]
== transferException option in native mode
diff --git a/extensions/servlet/runtime/src/main/doc/usage.adoc
b/extensions/servlet/runtime/src/main/doc/usage.adoc
new file mode 100644
index 00..7ad44a268c
--- /dev/null
+++ b/extensions/servlet/runtime/src/main/doc/usage.adoc
@@ -0,0 +1,66 @@
+=== Configuring CamelHttpTransportServlet
+
+ Minimal configuration
+
+The simplest way to configure `CamelHttpTransportServlet` is with
configuration properties.
+The most minimal setup requires that you define one or more URL patterns for
the Servlet with `quarkus.camel.servlet.url-patterns`.
+
+For example with configuration like the following.
+
+[source,properties]
+
+quarkus.camel.servlet.url-patterns = /*
+
+
+And a Camel route.
+
+[source,java]
+
+from("servlet://greet")
+.setBody().constant("Hello World");
+
+
+Produces the message `Hello World`.
+
+ Advanced configuration
+
+*Servlet name*
+
+To give a specific name to the Servlet you can use the
`quarkus.camel.servlet.servlet-name` configuration option.
+
+[source,properties]
+
+quarkus.camel.servlet.url-patterns = My Custom Name
+
+
+*Servlet class*
+
+You may use a custom Servlet class (E.g one that extends
`CamelHttpTransportServlet`) in your Camel routes.
+
+[source,properties]
+
+quarkus.camel.servlet.servlet-class = org.acme.MyCustomServlet
+
+
+*Multiple named Servlets*
+
+For more advanced use cases you can configure multiple 'named' Servlets.
+
+[source,properties]
+
+quarkus.camel.servlet.my-servlet-a.servlet-name = my-custom-a
+quarkus.camel.servlet.my-servlet-a.url-patterns = /custom/a/*
+
+quarkus.camel.servlet.my-servlet-b.servlet-name = my-custom-b
+quarkus.camel.servlet.my-servlet-b.servlet-class = org.acme.CustomServletB
+quarkus.camel.servlet.my-servlet-b.url-patterns = /custom/b/*
+
+
+[source,java]
+
(camel-quarkus) 02/07: Remove registration of Servlet classes with AdditionalBeanBuildItem
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 7386bcd6723841adba711e9ddfe4a0056efb297d
Author: James Netherton
AuthorDate: Fri Mar 1 13:48:20 2024 +
Remove registration of Servlet classes with AdditionalBeanBuildItem
Fixes #3204
---
.../component/servlet/deployment/ServletProcessor.java| 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git
a/extensions/servlet/deployment/src/main/java/org/apache/camel/quarkus/component/servlet/deployment/ServletProcessor.java
b/extensions/servlet/deployment/src/main/java/org/apache/camel/quarkus/component/servlet/deployment/ServletProcessor.java
index 308f5489db..7e21a43adb 100644
---
a/extensions/servlet/deployment/src/main/java/org/apache/camel/quarkus/component/servlet/deployment/ServletProcessor.java
+++
b/extensions/servlet/deployment/src/main/java/org/apache/camel/quarkus/component/servlet/deployment/ServletProcessor.java
@@ -20,7 +20,6 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.Optional;
-import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
@@ -42,11 +41,11 @@ class ServletProcessor {
}
@BuildStep
-void build(BuildProducer servlet,
BuildProducer additionalBean) {
+void build(BuildProducer servlet) {
boolean servletCreated = false;
if (camelServletConfig.defaultServlet.isValid()) {
servlet.produce(
-newServlet(ServletConfig.DEFAULT_SERVLET_NAME,
camelServletConfig.defaultServlet, additionalBean));
+newServlet(ServletConfig.DEFAULT_SERVLET_NAME,
camelServletConfig.defaultServlet));
servletCreated = true;
}
@@ -56,7 +55,7 @@ class ServletProcessor {
String.format("Use quarkus.camel.servlet.url-patterns
instead of quarkus.camel.servlet.%s.url-patterns",
ServletConfig.DEFAULT_SERVLET_NAME));
}
-servlet.produce(newServlet(e.getKey(), e.getValue(),
additionalBean));
+servlet.produce(newServlet(e.getKey(), e.getValue()));
servletCreated = true;
}
@@ -67,8 +66,7 @@ class ServletProcessor {
}
-static ServletBuildItem newServlet(String key, ServletConfig servletConfig,
-BuildProducer additionalBean) {
+static ServletBuildItem newServlet(String key, ServletConfig
servletConfig) {
final String servletName = servletConfig.getEffectiveServletName(key);
final Optional> urlPatterns = servletConfig.urlPatterns;
if (!urlPatterns.isPresent() || urlPatterns.get().isEmpty()) {
@@ -78,7 +76,6 @@ class ServletProcessor {
}
final Builder builder = ServletBuildItem.builder(servletName,
servletConfig.servletClass);
-additionalBean.produce(new
AdditionalBeanBuildItem(servletConfig.servletClass));
for (String pattern : urlPatterns.get()) {
builder.addMapping(pattern);
}
(camel-quarkus) 01/07: Add multipart configuration options to servlet extension
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 3228a32d49a1e4550601ea24a30229548583f5b1
Author: James Netherton
AuthorDate: Fri Mar 1 13:30:51 2024 +
Add multipart configuration options to servlet extension
Fixes #5326
---
.../ROOT/pages/reference/extensions/servlet.adoc | 48 ++
.../servlet/deployment/ServletProcessor.java | 11 +
.../servlet/runtime/CamelServletConfig.java| 36
integration-tests/servlet/pom.xml | 17
.../quarkus/component/servlet/CamelRoute.java | 17
.../component/servlet/MultiPartProcessor.java | 37 +
.../src/main/resources/application.properties | 6 +++
.../component/servlet/CamelServletTest.java| 41 --
8 files changed, 202 insertions(+), 11 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/servlet.adoc
b/docs/modules/ROOT/pages/reference/extensions/servlet.adoc
index 39c76cf246..fd56d2364a 100644
--- a/docs/modules/ROOT/pages/reference/extensions/servlet.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/servlet.adoc
@@ -83,6 +83,30 @@ A servletName as it would be defined in a `web.xml` file or
in the `jakarta.serv
| `string`
| `CamelServlet`
+|icon:lock[title=Fixed at build time]
[[quarkus.camel.servlet.multipart.location]]`link:#quarkus.camel.servlet.multipart.location[quarkus.camel.servlet.multipart.location]`
+
+An absolute path to a directory on the file system to store files temporarily
while the parts are processed or when the size of the file exceeds the
specified file-size-threshold configuration value.
+| `string`
+| `${java.io.tmpdir}`
+
+|icon:lock[title=Fixed at build time]
[[quarkus.camel.servlet.multipart.max-file-size]]`link:#quarkus.camel.servlet.multipart.max-file-size[quarkus.camel.servlet.multipart.max-file-size]`
+
+The maximum size allowed in bytes for uploaded files. The default size (-1)
allows an unlimited size.
+| `long`
+| `-1`
+
+|icon:lock[title=Fixed at build time]
[[quarkus.camel.servlet.multipart.max-request-size]]`link:#quarkus.camel.servlet.multipart.max-request-size[quarkus.camel.servlet.multipart.max-request-size]`
+
+The maximum size allowed in bytes for a multipart/form-data request. The
default size (-1) allows an unlimited size.
+| `long`
+| `-1`
+
+|icon:lock[title=Fixed at build time]
[[quarkus.camel.servlet.multipart.file-size-threshold]]`link:#quarkus.camel.servlet.multipart.file-size-threshold[quarkus.camel.servlet.multipart.file-size-threshold]`
+
+The file size in bytes after which the file will be temporarily stored on disk.
+| `int`
+| `0`
+
|icon:lock[title=Fixed at build time]
[[quarkus.camel.servlet.-named-servlets-.url-patterns]]`link:#quarkus.camel.servlet.-named-servlets-.url-patterns[quarkus.camel.servlet."named-servlets".url-patterns]`
A comma separated list of path patterns under which the CamelServlet should be
accessible. Example path patterns: `/++*++`, `/services/++*++`
@@ -100,6 +124,30 @@ A fully qualified name of a servlet class to serve paths
that match `url-pattern
A servletName as it would be defined in a `web.xml` file or in the
`jakarta.servlet.annotation.WebServlet++#++name()` annotation.
| `string`
| `CamelServlet`
+
+|icon:lock[title=Fixed at build time]
[[quarkus.camel.servlet.-named-servlets-.multipart.location]]`link:#quarkus.camel.servlet.-named-servlets-.multipart.location[quarkus.camel.servlet."named-servlets".multipart.location]`
+
+An absolute path to a directory on the file system to store files temporarily
while the parts are processed or when the size of the file exceeds the
specified file-size-threshold configuration value.
+| `string`
+| `${java.io.tmpdir}`
+
+|icon:lock[title=Fixed at build time]
[[quarkus.camel.servlet.-named-servlets-.multipart.max-file-size]]`link:#quarkus.camel.servlet.-named-servlets-.multipart.max-file-size[quarkus.camel.servlet."named-servlets".multipart.max-file-size]`
+
+The maximum size allowed in bytes for uploaded files. The default size (-1)
allows an unlimited size.
+| `long`
+| `-1`
+
+|icon:lock[title=Fixed at build time]
[[quarkus.camel.servlet.-named-servlets-.multipart.max-request-size]]`link:#quarkus.camel.servlet.-named-servlets-.multipart.max-request-size[quarkus.camel.servlet."named-servlets".multipart.max-request-size]`
+
+The maximum size allowed in bytes for a multipart/form-data request. The
default size (-1) allows an unlimited size.
+| `long`
+| `-1`
+
+|icon:lock[title=Fixed at build time]
[[quarkus.camel.servlet.-named-servlets-.multipart.file-size-threshold]]`link:#quarkus.camel.servlet.-named-servlets-.multipart.file-size-threshold[quarkus.camel.servlet."named-servlets".multipart.file-size-threshold]`
+
+The file size in bytes after which the file will be temporarily stored on
Re: [PR] [3.8.x] Backports [camel-quarkus]
jamesnetherton merged PR #5839: URL: https://github.com/apache/camel-quarkus/pull/5839 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] chore(traits): store executed traits [camel-k]
lburgazzoli commented on code in PR #5216:
URL: https://github.com/apache/camel-k/pull/5216#discussion_r1513299222
##
pkg/trait/quarkus.go:
##
@@ -308,7 +308,7 @@ func propagateKitTraits(e *Environment)
v1.IntegrationKitTraits {
propagate(fmt.Sprintf("integration profile %q",
e.IntegrationProfile.Name), e.IntegrationProfile.Status.Traits, , e)
}
- propagate(fmt.Sprintf("integration %q", e.Integration.Name),
e.Integration.Spec.Traits, , e)
+ propagate(fmt.Sprintf("integration %q", e.Integration.Name),
e.Integration.Status.Traits, , e)
Review Comment:
Pardon if this may be a totally wrong question but just looking at the code
and from some old memories, since the traits are persisted to the status after
they have been applied, what the `quarkus` trait sees in the status are the
traits for from the previous reconciliation, isn't it ?
--
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
[I] Misleading "Monitor: Integration needs a rebuild" message [camel-k]
lburgazzoli opened a new issue, #5219: URL: https://github.com/apache/camel-k/issues/5219 ### What happened? The `monitor::checkDigestAndRebuild` function, determine if an integration must be moved on its initial state and a full reconciliation be triggered: https://github.com/apache/camel-k/blob/e996a2bee25304f164898013e16fbaee7b4dc88b/pkg/controller/integration/monitor.go#L230-L251 Before re-initializing the integration the message `Monitor: Integration needs a rebuild` is logged, however, at least looking at the code, a rebuild wouldn't necessary happen. So I wonder if the message should be changed to something different. ### Steps to reproduce _No response_ ### Relevant log output _No response_ ### Camel K version _No response_ -- 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.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] fix(trait): watch for resource versions... [camel-k]
lburgazzoli commented on PR #5218: URL: https://github.com/apache/camel-k/pull/5218#issuecomment-1979333480 > > Note that `resourceVersion` changes also in case of any of the metadata changes > > Thanks. Not sure if there is any better way to deal with this, any idea? At least we remove the inspection of a secret, with the tradeoff to potentially reload an Integration when there is a metadata change as well. I don't think there is a better solution so is a matter of document the behavior. Maybe, should also honor the `mount.hot-reload` option ? In some cases, the user may not have full control of the configmap/secrets i.e. when those resources are generated by another controller. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] fix(trait): watch for resource versions... [camel-k]
squakez commented on PR #5218: URL: https://github.com/apache/camel-k/pull/5218#issuecomment-1979262042 > Note that `resourceVersion` changes also in case of any of the metadata changes Thanks. Not sure if there is any better way to deal with this, any idea. At least we remove the inspection of a secret, with the tradeoff to potentially reload an Integration when there is a metadata change as well. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] fix(trait): watch for resource versions... [camel-k]
lburgazzoli commented on PR #5218: URL: https://github.com/apache/camel-k/pull/5218#issuecomment-1979255412 Note that `resourceVersion` changes also in case of any of the metadata 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
[PR] fix(trait): watch for resource versions... [camel-k]
squakez opened a new pull request, #5218: URL: https://github.com/apache/camel-k/pull/5218 ...instead of for their content. With this PR we fix a potentially risky behavior, as we were inspecting Configmap/Secrets content to address any change. Instead of looking directly the content, we watch for the changing resource version, which should be the way provided by the platform to know when a resource has changed without inspecting its content. **Release Note** ```release-note fix(trait): watch for resource versions ``` -- 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
[I] Wrong documentation in Kamelet Catalog for sinks [camel-k]
Leo6Leo opened a new issue, #5217: URL: https://github.com/apache/camel-k/issues/5217 ### What happened? Hello maintainers at Camel-K, please see the issue description below. And let me know if there are any issues, thanks! **Title**: Wrong `kamel bind` Command Order in Documentation for Sink Kamelets **Description**: Found a mistake in the [Kamelet Catalog documentation](https://camel.apache.org/camel-kamelets/next/slack-sink.html#_procedure_for_using_the_kamel_cli) for the `slack-sink` and other sinks. The `kamel bind` command's order is incorrect. It should be `kamel bind [source] [sink] ... [flags]`. Same problem appears for other sinks too. - [Snowflake sink](https://camel.apache.org/camel-kamelets/next/snowflake-sink.html#_procedure_for_using_the_kamel_cli) - [AWS Lambda Sink](https://camel.apache.org/camel-kamelets/next/aws-lambda-sink.html#_procedure_for_using_the_kamel_cli) - ... **Current Wrong Example**: ``` kamel bind slack-sink -p "sink.channel=#myroom" -p "sink.webhookUrl=The Webhook URL" channel:mychannel ``` **Correct Command Should Be**: ``` kamel bind channel:mychannel -p "sink.channel=#mychannel" -p "sink.webhookUrl=The Webhook URL" slack-sink ``` **Solution**: Fix the command order in the documentation to match the correct format. ### Steps to reproduce See the documentation ### Relevant log output _No response_ ### Camel K version v2.2.0 -- 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.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-karavan) branch main updated: Ephemeral git
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 85bfa675 Ephemeral git
85bfa675 is described below
commit 85bfa675bbec15b2e046c6171081cc06b555d75a
Author: Marat Gubaidullin
AuthorDate: Tue Mar 5 11:09:13 2024 -0500
Ephemeral git
---
.../apache/camel/karavan/service/GitService.java | 78 ++
1 file changed, 50 insertions(+), 28 deletions(-)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
index 7a4ce07e..db176e71 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
@@ -19,10 +19,12 @@ package org.apache.camel.karavan.service;
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.JSchException;
import io.quarkus.oidc.UserInfo;
+import io.quarkus.runtime.StartupEvent;
import io.quarkus.security.identity.SecurityIdentity;
import io.smallrye.mutiny.tuples.Tuple2;
import io.vertx.core.Vertx;
import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
import jakarta.inject.Inject;
import org.apache.camel.karavan.model.*;
import org.eclipse.jgit.api.*;
@@ -71,6 +73,9 @@ public class GitService {
@ConfigProperty(name = "karavan.known-hosts-path")
Optional knownHostsPath;
+@ConfigProperty(name = "karavan.git.ephemeral", defaultValue = "false")
+boolean ephemeral;
+
@Inject
Vertx vertx;
@@ -95,6 +100,13 @@ public class GitService {
}
public GitConfig getGitConfig() {
+if (ephemeral) {
+repository = "http://karavan.git;;
+username = Optional.of("karavan");
+password = Optional.of("karavan");
+privateKeyPath = Optional.empty();
+knownHostsPath = Optional.empty();
+}
return new GitConfig(repository, username.orElse(null),
password.orElse(null), branch, privateKeyPath.orElse(null));
}
@@ -121,16 +133,16 @@ public class GitService {
String uuid = UUID.randomUUID().toString();
String folder = vertx.fileSystem().createTempDirectoryBlocking(uuid);
LOGGER.info("Temp folder created " + folder);
-Git git = null;
-try {
-git = clone(folder, gitConfig.getUri(), gitConfig.getBranch());
-checkout(git, false, null, null, gitConfig.getBranch());
-} catch (RefNotFoundException | InvalidRemoteException |
TransportException e) {
-LOGGER.error("New repository");
-git = init(folder, gitConfig.getUri(), gitConfig.getBranch());
-} catch (Exception e) {
-LOGGER.error("Error", e);
-}
+Git git = getGit(true, folder);
+//try {
+//git = clone(folder, gitConfig.getUri(), gitConfig.getBranch());
+//checkout(git, false, null, null, gitConfig.getBranch());
+//} catch (RefNotFoundException | InvalidRemoteException |
TransportException e) {
+//LOGGER.error("New repository");
+//git = init(folder, gitConfig.getUri(), gitConfig.getBranch());
+//} catch (Exception e) {
+//LOGGER.error("Error", e);
+//}
writeProjectToFolder(folder, project, files);
addDeletedFilesToIndex(git, folder, project, files);
return commitAddedAndPush(git, gitConfig.getBranch(), message);
@@ -183,16 +195,21 @@ public class GitService {
GitConfig gitConfig = getGitConfig();
LOGGER.info("Temp folder created " + folder);
Git git = null;
-try {
-git = clone(folder, gitConfig.getUri(), gitConfig.getBranch());
-if (checkout) {
-checkout(git, false, null, null, gitConfig.getBranch());
-}
-} catch (RefNotFoundException | InvalidRemoteException |
TransportException e) {
-LOGGER.error("New repository");
+if (ephemeral) {
+LOGGER.error("New ephemeral repository");
git = init(folder, gitConfig.getUri(), gitConfig.getBranch());
-} catch (Exception e) {
-LOGGER.error("Error", e);
+} else {
+try {
+git = clone(folder, gitConfig.getUri(), gitConfig.getBranch());
+if (checkout) {
+checkout(git, false, null, null, gitConfig.getBranch());
+}
+} catch (RefNotFoundException | InvalidRemoteException |
TransportException e) {
+LOGGER.error("New repository");
+git = init(folder, gitConfig.getUri(), gitConfig.getBranch());
+} catch (Exception e) {
+LOGGER.error("Error", e);
+}
}
Re: [PR] Migrate file watch tests to new harness #3584 [camel-quarkus]
aldettinger commented on PR #5840: URL: https://github.com/apache/camel-quarkus/pull/5840#issuecomment-1979096640 This one is just a move, it should not interfere with other tests. Let's see what happen in the platform on next release. -- 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] Migrate file watch tests to new harness #3584 [camel-quarkus]
aldettinger opened a new pull request, #5840: URL: https://github.com/apache/camel-quarkus/pull/5840 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] chore(traits): store executed traits [camel-k]
github-actions[bot] commented on PR #5216: URL: https://github.com/apache/camel-k/pull/5216#issuecomment-1979078990 :heavy_check_mark: Unit test coverage report - coverage increased from 36.8% to 37.2% (**+0.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
[PR] chore(traits): store executed traits [camel-k]
squakez opened a new pull request, #5216: URL: https://github.com/apache/camel-k/pull/5216 This PR addresses a wrong assumption I made in the development of #5153 where we were naively storing the spec after their execution. However, this is not necessarily true, as the trait execution may change certain parameters originally introduced by the user. With this PR we store correctly the executed traits and we make sure to use the `.status.trait` where it would be required for Integration comparisons. This PR also proves another wrong assumption I made during the development of #5180 where we introduced a check for a possible drift in the `.status.trait`. However, this should never be checked for a change as it's an internal status controlled by the operator and it would wrongly trigger a new rebuild when the operator stores the `.status.trait` value. The operator should normally monitor for changes in the `.spec` only in this case in order to trigger a rebuild if it is required. **Release Note** ```release-note chore(traits): store executed traits ``` -- 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] [3.8.x] Backports [camel-quarkus]
jamesnetherton opened a new pull request, #5839: URL: https://github.com/apache/camel-quarkus/pull/5839 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) 02/04: Support loadOnStartup, async, forceAwait & executorRef configuration options
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 commit 4877f4e36568d81fb050ce5618977de171b1fb83 Author: James Netherton AuthorDate: Mon Mar 4 15:50:48 2024 + Support loadOnStartup, async, forceAwait & executorRef configuration options Fixes #5834 --- .../ROOT/pages/reference/extensions/servlet.adoc | 48 .../servlet/deployment/ServletProcessor.java | 19 - .../servlet/runtime/CamelServletConfig.java| 27 +++ .../quarkus/component/servlet/CamelRoute.java | 34 +++-- .../component/servlet/ServletProducers.java| 71 + .../src/main/resources/application.properties | 50 .../component/servlet/CamelServletTest.java| 89 ++ 7 files changed, 304 insertions(+), 34 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/servlet.adoc b/docs/modules/ROOT/pages/reference/extensions/servlet.adoc index ac9303ed92..848ac1299c 100644 --- a/docs/modules/ROOT/pages/reference/extensions/servlet.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/servlet.adoc @@ -156,6 +156,30 @@ A servletName as it would be defined in a `web.xml` file or in the `jakarta.serv | `string` | `CamelServlet` +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.load-on-startup]]`link:#quarkus.camel.servlet.load-on-startup[quarkus.camel.servlet.load-on-startup]` + +Sets the loadOnStartup priority on the Servlet. A loadOnStartup is a value greater than or equal to zero, indicates to the container the initialization priority of the Servlet. If loadOnStartup is a negative integer, the Servlet is initialized lazily. +| `java.lang.Integer` +| `-1` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.async]]`link:#quarkus.camel.servlet.async[quarkus.camel.servlet.async]` + +Enables Camel to benefit from asynchronous Servlet support. +| `boolean` +| `false` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.force-await]]`link:#quarkus.camel.servlet.force-await[quarkus.camel.servlet.force-await]` + +When set to `true` used in conjunction with `quarkus.camel.servlet.async = true`, this will force route processing to run synchronously. +| `boolean` +| `false` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.executor-ref]]`link:#quarkus.camel.servlet.executor-ref[quarkus.camel.servlet.executor-ref]` + +The name of a bean to configure an optional custom thread pool for handling Camel Servlet processing. +| `string` +| + |icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.multipart.location]]`link:#quarkus.camel.servlet.multipart.location[quarkus.camel.servlet.multipart.location]` An absolute path to a directory on the file system to store files temporarily while the parts are processed or when the size of the file exceeds the specified file-size-threshold configuration value. @@ -198,6 +222,30 @@ A servletName as it would be defined in a `web.xml` file or in the `jakarta.serv | `string` | `CamelServlet` +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.-named-servlets-.load-on-startup]]`link:#quarkus.camel.servlet.-named-servlets-.load-on-startup[quarkus.camel.servlet."named-servlets".load-on-startup]` + +Sets the loadOnStartup priority on the Servlet. A loadOnStartup is a value greater than or equal to zero, indicates to the container the initialization priority of the Servlet. If loadOnStartup is a negative integer, the Servlet is initialized lazily. +| `java.lang.Integer` +| `-1` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.-named-servlets-.async]]`link:#quarkus.camel.servlet.-named-servlets-.async[quarkus.camel.servlet."named-servlets".async]` + +Enables Camel to benefit from asynchronous Servlet support. +| `boolean` +| `false` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.-named-servlets-.force-await]]`link:#quarkus.camel.servlet.-named-servlets-.force-await[quarkus.camel.servlet."named-servlets".force-await]` + +When set to `true` used in conjunction with `quarkus.camel.servlet.async = true`, this will force route processing to run synchronously. +| `boolean` +| `false` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.-named-servlets-.executor-ref]]`link:#quarkus.camel.servlet.-named-servlets-.executor-ref[quarkus.camel.servlet."named-servlets".executor-ref]` + +The name of a bean to configure an optional custom thread pool for handling Camel Servlet processing. +| `string` +| + |icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.-named-servlets-.multipart.location]]`link:#quarkus.camel.servlet.-named-servlets-.multipart.location[quarkus.camel.servlet."named-servlets".multipart.location]` An absolute path to a directory on the file system to store files temporarily while the parts are
(camel-quarkus) 01/04: Document basic servlet extension usage and configuration options
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
commit b71bca76be83132c80a82d30a08af7ef002a7ba4
Author: James Netherton
AuthorDate: Tue Mar 5 07:52:43 2024 +
Document basic servlet extension usage and configuration options
---
.../ROOT/pages/reference/extensions/servlet.adoc | 73 ++
extensions/servlet/runtime/src/main/doc/usage.adoc | 66 +++
2 files changed, 139 insertions(+)
diff --git a/docs/modules/ROOT/pages/reference/extensions/servlet.adoc
b/docs/modules/ROOT/pages/reference/extensions/servlet.adoc
index fd56d2364a..ac9303ed92 100644
--- a/docs/modules/ROOT/pages/reference/extensions/servlet.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/servlet.adoc
@@ -45,6 +45,79 @@ ifeval::[{doc-show-user-guide-link} == true]
Check the xref:user-guide/index.adoc[User guide] for more information about
writing Camel Quarkus applications.
endif::[]
+[id="extensions-servlet-usage"]
+== Usage
+[id="extensions-servlet-usage-configuring-camelhttptransportservlet"]
+=== Configuring CamelHttpTransportServlet
+
+[id="extensions-servlet-usage-minimal-configuration"]
+ Minimal configuration
+
+The simplest way to configure `CamelHttpTransportServlet` is with
configuration properties.
+The most minimal setup requires that you define one or more URL patterns for
the Servlet with `quarkus.camel.servlet.url-patterns`.
+
+For example with configuration like the following.
+
+[source,properties]
+
+quarkus.camel.servlet.url-patterns = /*
+
+
+And a Camel route.
+
+[source,java]
+
+from("servlet://greet")
+.setBody().constant("Hello World");
+
+
+Produces the message `Hello World`.
+
+[id="extensions-servlet-usage-advanced-configuration"]
+ Advanced configuration
+
+*Servlet name*
+
+To give a specific name to the Servlet you can use the
`quarkus.camel.servlet.servlet-name` configuration option.
+
+[source,properties]
+
+quarkus.camel.servlet.url-patterns = My Custom Name
+
+
+*Servlet class*
+
+You may use a custom Servlet class (E.g one that extends
`CamelHttpTransportServlet`) in your Camel routes.
+
+[source,properties]
+
+quarkus.camel.servlet.servlet-class = org.acme.MyCustomServlet
+
+
+*Multiple named Servlets*
+
+For more advanced use cases you can configure multiple 'named' Servlets.
+
+[source,properties]
+
+quarkus.camel.servlet.my-servlet-a.servlet-name = my-custom-a
+quarkus.camel.servlet.my-servlet-a.url-patterns = /custom/a/*
+
+quarkus.camel.servlet.my-servlet-b.servlet-name = my-custom-b
+quarkus.camel.servlet.my-servlet-b.servlet-class = org.acme.CustomServletB
+quarkus.camel.servlet.my-servlet-b.url-patterns = /custom/b/*
+
+
+[source,java]
+
+from("servlet://greet?servletName=my-custom-a")
+.setBody().constant("Hello World");
+
+from("servlet://goodbye?servletName=my-custom-b")
+.setBody().constant("Goodbye World");
+
+
+
[id="extensions-servlet-transferexception-option-in-native-mode"]
== transferException option in native mode
diff --git a/extensions/servlet/runtime/src/main/doc/usage.adoc
b/extensions/servlet/runtime/src/main/doc/usage.adoc
new file mode 100644
index 00..7ad44a268c
--- /dev/null
+++ b/extensions/servlet/runtime/src/main/doc/usage.adoc
@@ -0,0 +1,66 @@
+=== Configuring CamelHttpTransportServlet
+
+ Minimal configuration
+
+The simplest way to configure `CamelHttpTransportServlet` is with
configuration properties.
+The most minimal setup requires that you define one or more URL patterns for
the Servlet with `quarkus.camel.servlet.url-patterns`.
+
+For example with configuration like the following.
+
+[source,properties]
+
+quarkus.camel.servlet.url-patterns = /*
+
+
+And a Camel route.
+
+[source,java]
+
+from("servlet://greet")
+.setBody().constant("Hello World");
+
+
+Produces the message `Hello World`.
+
+ Advanced configuration
+
+*Servlet name*
+
+To give a specific name to the Servlet you can use the
`quarkus.camel.servlet.servlet-name` configuration option.
+
+[source,properties]
+
+quarkus.camel.servlet.url-patterns = My Custom Name
+
+
+*Servlet class*
+
+You may use a custom Servlet class (E.g one that extends
`CamelHttpTransportServlet`) in your Camel routes.
+
+[source,properties]
+
+quarkus.camel.servlet.servlet-class = org.acme.MyCustomServlet
+
+
+*Multiple named Servlets*
+
+For more advanced use cases you can configure multiple 'named' Servlets.
+
+[source,properties]
+
+quarkus.camel.servlet.my-servlet-a.servlet-name = my-custom-a
+quarkus.camel.servlet.my-servlet-a.url-patterns = /custom/a/*
+
+quarkus.camel.servlet.my-servlet-b.servlet-name = my-custom-b
+quarkus.camel.servlet.my-servlet-b.servlet-class = org.acme.CustomServletB
+quarkus.camel.servlet.my-servlet-b.url-patterns = /custom/b/*
+
+
+[source,java]
+
(camel-quarkus) branch main updated (3002b27ae0 -> f7abb3e982)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from 3002b27ae0 Bump quarkiverse-pooled-jms.version from 2.3.0 to 2.3.1
(#5836)
new b71bca76be Document basic servlet extension usage and configuration
options
new 4877f4e365 Support loadOnStartup, async, forceAwait & executorRef
configuration options
new d04332fed2 Enable web.xml to be used to configure
CamelHttpTransportServlet for the servlet extension
new f7abb3e982 Add additional Servlet test coverage
The 4 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:
.../ROOT/pages/reference/extensions/servlet.adoc | 158 +++
.../servlet/deployment/ServletProcessor.java | 33 +++-
...nimalConfigTest.java => WebXmlServletTest.java} | 55 +++
extensions/servlet/runtime/src/main/doc/usage.adoc | 103
.../servlet/runtime/CamelServletConfig.java| 27
.../quarkus/component/servlet/CamelRoute.java | 60 ++-
.../component/servlet}/CustomException.java| 11 +-
.../component/servlet/ServletProducers.java| 71 +
.../src/main/resources/application.properties | 56 +--
.../component/servlet/CamelServletTest.java| 172 +++--
10 files changed, 673 insertions(+), 73 deletions(-)
copy
extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/{MinimalConfigTest.java
=> WebXmlServletTest.java} (59%)
create mode 100644 extensions/servlet/runtime/src/main/doc/usage.adoc
copy integration-tests/{main-yaml/src/main/java/org/apache/camel/quarkus/main
=>
servlet/src/main/java/org/apache/camel/quarkus/component/servlet}/CustomException.java
(83%)
create mode 100644
integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/ServletProducers.java
(camel-quarkus) 04/04: Add additional Servlet test coverage
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
commit f7abb3e9827cd03da6f83bb403a0855ba494cd11
Author: James Netherton
AuthorDate: Tue Mar 5 09:48:35 2024 +
Add additional Servlet test coverage
---
.../quarkus/component/servlet/CamelRoute.java | 26 +-
.../quarkus/component/servlet/CustomException.java | 28 +++
.../src/main/resources/application.properties | 6 ++
.../component/servlet/CamelServletTest.java| 97 --
4 files changed, 148 insertions(+), 9 deletions(-)
diff --git
a/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CamelRoute.java
b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CamelRoute.java
index 6c8c117c35..2ca381f295 100644
---
a/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CamelRoute.java
+++
b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CamelRoute.java
@@ -44,10 +44,34 @@ public class CamelRoute extends RouteBuilder {
.to("direct:echoMethodPath")
.post("/rest-post")
+.to("direct:echoMethodPath")
+
+.put("/rest-put")
+.to("direct:echoMethodPath")
+
+.patch("/rest-patch")
+.to("direct:echoMethodPath")
+
+.delete("/rest-delete")
+.to("direct:echoMethodPath")
+
+.head("/rest-head")
.to("direct:echoMethodPath");
from("servlet://hello?matchOnUriPrefix=true")
-.setBody(constant("GET: /hello"));
+.to("direct:echoMethodPath");
+
+
from("servlet://options?servletName=options-method-servlet=true")
+.to("direct:echoMethodPath");
+
+
from("servlet://trace?servletName=trace-method-servlet=true")
+.to("direct:echoMethodPath");
+
+
from("servlet://transfer/exception?transferException=true=false")
+.throwException(new CustomException());
+
+from("servlet://params")
+.setBody().simple("${header.prefix} ${header.suffix}");
from("servlet://configuration")
.process(servletConfigInfoProcessor);
diff --git
a/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CustomException.java
b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CustomException.java
new file mode 100644
index 00..33fb3db78d
--- /dev/null
+++
b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CustomException.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.component.servlet;
+
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
+@RegisterForReflection(serialization = true)
+public class CustomException extends Exception {
+public static final String MESSAGE = "Something went wrong";
+
+public CustomException() {
+super(MESSAGE);
+}
+}
diff --git
a/integration-tests/servlet/src/main/resources/application.properties
b/integration-tests/servlet/src/main/resources/application.properties
index 06920af73f..76be5f65b3 100644
--- a/integration-tests/servlet/src/main/resources/application.properties
+++ b/integration-tests/servlet/src/main/resources/application.properties
@@ -15,6 +15,9 @@
## limitations under the License.
## ---
+# For transferException
+quarkus.camel.native.reflection.serialization-enabled=true
+
# Default servlet configuration
quarkus.camel.servlet.url-patterns=/folder-1/*,/folder-2/*,/debug/*
@@ -51,3 +54,6 @@
quarkus.camel.servlet.custom-executor-servlet.url-patterns=/custom-executor/*
quarkus.camel.servlet.custom-executor-servlet.async=true
quarkus.camel.servlet.custom-executor-servlet.executor-ref=customServletExecutor
+# Servlet to allow OPTIONS & TRACE
(camel-quarkus) 03/04: Enable web.xml to be used to configure CamelHttpTransportServlet for the servlet extension
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
commit d04332fed209b7b97c36beca0a0698b79093c93c
Author: James Netherton
AuthorDate: Mon Mar 4 15:54:57 2024 +
Enable web.xml to be used to configure CamelHttpTransportServlet for the
servlet extension
Fixes #5835
---
.../ROOT/pages/reference/extensions/servlet.adoc | 37
.../servlet/deployment/ServletProcessor.java | 14 -
.../component/servlet/test/WebXmlServletTest.java | 65 ++
extensions/servlet/runtime/src/main/doc/usage.adoc | 37
4 files changed, 152 insertions(+), 1 deletion(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/servlet.adoc
b/docs/modules/ROOT/pages/reference/extensions/servlet.adoc
index 848ac1299c..39fca43e78 100644
--- a/docs/modules/ROOT/pages/reference/extensions/servlet.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/servlet.adoc
@@ -117,6 +117,43 @@ from("servlet://goodbye?servletName=my-custom-b")
.setBody().constant("Goodbye World");
+*Finer control of Servlet configuration*
+
+If you need more control of the Servlet configuration, for example to
configure custom init parameters,
+then you can do this with a custom Servlet class through the
`jakarta.servlet.annotation.WebServlet` annotation options.
+
+[source,java]
+
+import jakarta.servlet.annotation.WebServlet;
+import org.apache.camel.component.servlet.CamelHttpTransportServlet;
+
+@WebServlet(
+urlPatterns = {"/*"},
+initParams = {
+@WebInitParam(name = "myParam", value = "myValue")
+}
+)
+public class MyCustomServlet extends CamelHttpTransportServlet {
+}
+
+
+Or you can configure the `CamelHttpTransportServlet` using a `web-app`
descriptor placed into `src/main/resources/META-INF/web.xml`.
+
+[source,xml]
+
+
+
+CamelServlet
+
org.apache.camel.component.servlet.CamelHttpTransportServlet
+
+
+
+CamelServlet
+/services/*
+
+
+
+
[id="extensions-servlet-transferexception-option-in-native-mode"]
== transferException option in native mode
diff --git
a/extensions/servlet/deployment/src/main/java/org/apache/camel/quarkus/component/servlet/deployment/ServletProcessor.java
b/extensions/servlet/deployment/src/main/java/org/apache/camel/quarkus/component/servlet/deployment/ServletProcessor.java
index 6afaf14202..a7ab69969f 100644
---
a/extensions/servlet/deployment/src/main/java/org/apache/camel/quarkus/component/servlet/deployment/ServletProcessor.java
+++
b/extensions/servlet/deployment/src/main/java/org/apache/camel/quarkus/component/servlet/deployment/ServletProcessor.java
@@ -25,10 +25,14 @@ import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.undertow.deployment.ServletBuildItem;
import io.quarkus.undertow.deployment.ServletBuildItem.Builder;
+import io.quarkus.undertow.deployment.WebMetadataBuildItem;
import jakarta.servlet.MultipartConfigElement;
import org.apache.camel.quarkus.servlet.runtime.CamelServletConfig;
import
org.apache.camel.quarkus.servlet.runtime.CamelServletConfig.ServletConfig;
import
org.apache.camel.quarkus.servlet.runtime.CamelServletConfig.ServletConfig.MultipartConfig;
+import org.jboss.metadata.web.spec.WebMetaData;
+
+import static
org.apache.camel.quarkus.servlet.runtime.CamelServletConfig.ServletConfig.DEFAULT_SERVLET_CLASS;
class ServletProcessor {
private static final String FEATURE = "camel-servlet";
@@ -41,8 +45,16 @@ class ServletProcessor {
}
@BuildStep
-void build(BuildProducer servlet) {
+void build(BuildProducer servlet, WebMetadataBuildItem
webMetadata) {
boolean servletCreated = false;
+
+WebMetaData metaData = webMetadata.getWebMetaData();
+if (metaData != null && metaData.getServlets() != null) {
+servletCreated = metaData.getServlets()
+.stream()
+.anyMatch(meta ->
meta.getServletClass().equals(DEFAULT_SERVLET_CLASS));
+}
+
if (camelServletConfig.defaultServlet.isValid()) {
servlet.produce(
newServlet(ServletConfig.DEFAULT_SERVLET_NAME,
camelServletConfig.defaultServlet));
diff --git
a/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/WebXmlServletTest.java
b/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/WebXmlServletTest.java
new file mode 100644
index 00..1c39eb7954
--- /dev/null
+++
b/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/WebXmlServletTest.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for
Re: [I] Add additional options to Servlet extension configuration [camel-quarkus]
jamesnetherton closed issue #5834: Add additional options to Servlet extension configuration URL: https://github.com/apache/camel-quarkus/issues/5834 -- 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] Enable web.xml to be used to configure CamelHttpTransportServlet for the servlet extension [camel-quarkus]
jamesnetherton closed issue #5835: Enable web.xml to be used to configure CamelHttpTransportServlet for the servlet extension URL: https://github.com/apache/camel-quarkus/issues/5835 -- 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] Servlet extension improvements [camel-quarkus]
jamesnetherton merged PR #5837: URL: https://github.com/apache/camel-quarkus/pull/5837 -- 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 cq-maven-plugin to 4.6.1 [camel-quarkus]
jamesnetherton opened a new pull request, #5838: URL: https://github.com/apache/camel-quarkus/pull/5838 (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] chore(deps): bump golang.org/x/term from 0.17.0 to 0.18.0 [camel-k]
dependabot[bot] closed pull request #5215: chore(deps): bump golang.org/x/term from 0.17.0 to 0.18.0 URL: https://github.com/apache/camel-k/pull/5215 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] chore(deps): bump golang.org/x/term from 0.17.0 to 0.18.0 [camel-k]
dependabot[bot] commented on PR #5215: URL: https://github.com/apache/camel-k/pull/5215#issuecomment-1978868657 Looks like golang.org/x/term is up-to-date now, so this is no longer needed. -- 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/golang.org/x/term-0.18.0 deleted (was c5d53c2d5)
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/term-0.18.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git was c5d53c2d5 chore(deps): bump golang.org/x/term from 0.17.0 to 0.18.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k) branch dependabot/go_modules/golang.org/x/oauth2-0.18.0 deleted (was f496ef4bc)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/go_modules/golang.org/x/oauth2-0.18.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git was f496ef4bc chore(deps): bump golang.org/x/oauth2 from 0.17.0 to 0.18.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k) branch main updated (70416dd4b -> e996a2bee)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from 70416dd4b fix(ci): add snapshot repo add e996a2bee chore(deps): bump golang.org/x/oauth2 from 0.17.0 to 0.18.0 No new revisions were added by this update. Summary of changes: go.mod | 10 +- go.sum | 20 ++-- 2 files changed, 15 insertions(+), 15 deletions(-)
Re: [PR] chore(deps): bump golang.org/x/oauth2 from 0.17.0 to 0.18.0 [camel-k]
squakez merged PR #5214: URL: https://github.com/apache/camel-k/pull/5214 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] fix(ci): add snapshot repo [camel-k]
squakez merged PR #5209: URL: https://github.com/apache/camel-k/pull/5209 -- 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 (8baab198d -> 70416dd4b)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from 8baab198d chore: nightly automatic updates add 70416dd4b fix(ci): add snapshot repo No new revisions were added by this update. Summary of changes: pkg/builder/quarkus_test.go| 35 ++ pkg/controller/integrationplatform/catalog_test.go | 2 +- pkg/util/camel/camel_runtime_test.go | 5 script/get_catalog.sh | 2 +- 4 files changed, 42 insertions(+), 2 deletions(-)
Re: [PR] CAMEL-20519: Servlet documentation improvements [camel]
github-actions[bot] commented on PR #13385: URL: https://github.com/apache/camel/pull/13385#issuecomment-1978859310 :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-20519: Servlet documentation improvements [camel]
jamesnetherton opened a new pull request, #13385: URL: https://github.com/apache/camel/pull/13385 (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] Servlet extension improvements [camel-quarkus]
jamesnetherton commented on code in PR #5837: URL: https://github.com/apache/camel-quarkus/pull/5837#discussion_r1512844013 ## docs/modules/ROOT/pages/reference/extensions/servlet.adoc: ## @@ -83,6 +193,30 @@ A servletName as it would be defined in a `web.xml` file or in the `jakarta.serv | `string` | `CamelServlet` +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.load-on-startup]]`link:#quarkus.camel.servlet.load-on-startup[quarkus.camel.servlet.load-on-startup]` + +Sets the loadOnStartup priority on the Servlet. A loadOnStartup is a value greater than or equal to zero, indicates to the container the initialization priority of the Servlet. If loadOnStartup is a negative integer, the Servlet is initialized lazily. +| `java.lang.Integer` +| `-1` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.async]]`link:#quarkus.camel.servlet.async[quarkus.camel.servlet.async]` + +Enables Camel to benefit from asynchronous Servlet support. +| `boolean` +| `false` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.force-await]]`link:#quarkus.camel.servlet.force-await[quarkus.camel.servlet.force-await]` + +When set to `true` used in conjunction with `quarkus.camel.servlet.async = true`, this will force route processing to run synchronously. +| `boolean` +| `false` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.executor-ref]]`link:#quarkus.camel.servlet.executor-ref[quarkus.camel.servlet.executor-ref]` + +The name of a bean of to configure an optional custom thread pool for handling Camel Servlet processing. Review Comment: I've updated it now. -- 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] ERROR Exchange delivery has failed! Azure Gen2 Data Lake Sink Connector [camel-kafka-connector]
oscerd commented on issue #1602: URL: https://github.com/apache/camel-kafka-connector/issues/1602#issuecomment-1978797879 No, you need to pick up this stuff from Azure Storage Datalake service -- 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) branch main updated: Fix various typos and case in readmes
This is an automated email from the ASF dual-hosted git repository.
apupier pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets-examples.git
The following commit(s) were added to refs/heads/main by this push:
new b807035 Fix various typos and case in readmes
b807035 is described below
commit b807035bf6ee2fefa581e0379d253680c68934a8
Author: Aurélien Pupier
AuthorDate: Tue Mar 5 14:30:16 2024 +0100
Fix various typos and case in readmes
Signed-off-by: Aurélien Pupier
---
camel-k/kafka-s3/README.adoc | 4 ++--
jbang/artemis/README.adoc| 2 +-
jbang/aws-database-admin-secrets-refresh/README.adoc | 2 +-
jbang/aws-s3-cdc/README.adoc | 20 ++--
jbang/aws-s3-large-object/README.adoc| 2 +-
.../README.md| 20 ++--
jbang/azure-eventhubs-kafka-ibm-mq/README.adoc | 2 +-
jbang/azure-key-vault-secrets-reloading/README.adoc | 2 +-
jbang/azure-servicebus/README.adoc | 4 ++--
jbang/azure-storage-blob-cdc/README.adoc | 12 ++--
jbang/bean-builder/README.adoc | 2 +-
jbang/bean-inlined-code/README.adoc | 2 +-
jbang/chaos-monkey/README.adoc | 6 +++---
jbang/circuit-breaker/README.adoc| 2 +-
jbang/custom-kamelet/README.adoc | 4 ++--
jbang/kafka-health/README.adoc | 2 +-
jbang/mqtt/README.adoc | 4 ++--
jbang/opensearch-search-log/README.adoc | 8
jbang/route-controller/README.adoc | 2 +-
jbang/snowflake-migration/README.adoc| 2 +-
jbang/timer-opensearch-index/README.adoc | 8
kamelet-main/slack-source/README.adoc| 2 +-
22 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/camel-k/kafka-s3/README.adoc b/camel-k/kafka-s3/README.adoc
index f443e49..d692c45 100644
--- a/camel-k/kafka-s3/README.adoc
+++ b/camel-k/kafka-s3/README.adoc
@@ -1,8 +1,8 @@
== Kafka to S3 KameletBinding example
-In this sample you'll use Strimzi Operator and Camel K Operator on Openshift
Cloud.
+In this sample you'll use Strimzi Operator and Camel K Operator on OpenShift
Cloud.
-So this example expects you have an Openshift instance running on Cloud.
+So this example expects you have an OpenShift instance running on Cloud.
=== Setup the Strimzi Operator
diff --git a/jbang/artemis/README.adoc b/jbang/artemis/README.adoc
index 2d86347..d2e5e6b 100644
--- a/jbang/artemis/README.adoc
+++ b/jbang/artemis/README.adoc
@@ -5,7 +5,7 @@ messaging broker.
=== Apache ActiveMQ Artemis
-You first need to have an ActiveMQ Artimis broker up and running.
+You first need to have an ActiveMQ Artemis broker up and running.
See more at: https://activemq.apache.org/components/artemis/
diff --git a/jbang/aws-database-admin-secrets-refresh/README.adoc
b/jbang/aws-database-admin-secrets-refresh/README.adoc
index 98e6a84..9463d28 100644
--- a/jbang/aws-database-admin-secrets-refresh/README.adoc
+++ b/jbang/aws-database-admin-secrets-refresh/README.adoc
@@ -48,7 +48,7 @@ aws_access_key_id = accessKey
aws_secret_access_key = secretKey
-=== Setup and populate the Postgresql Database
+=== Setup and populate the PostgreSQL Database
We create a PostgreSQL instance in a docker container
diff --git a/jbang/aws-s3-cdc/README.adoc b/jbang/aws-s3-cdc/README.adoc
index 450a85f..fb81418 100644
--- a/jbang/aws-s3-cdc/README.adoc
+++ b/jbang/aws-s3-cdc/README.adoc
@@ -2,7 +2,7 @@
In this sample you'll use the AWS S3 CDC Source Kamelet.
-Through the usage of Eventbridge and SQS Services you'll be able to consume
events from specific bucket.
+Through the usage of EventBridge and SQS Services you'll be able to consume
events from specific bucket.
=== Install JBang
@@ -26,7 +26,7 @@ $ jbang app install camel@apache/camel
Which allows to run CamelJBang with `camel` as shown below.
-=== Setup the AWS S3 bucket, SQS Queue and Eventbrige Rule
+=== Setup the AWS S3 bucket, SQS Queue and EventBridge Rule
You'll need a fully working AWS CLI locally.
@@ -37,14 +37,14 @@ Create a bucket on AWS on a particular region
aws s3api create-bucket --bucket cdc-s3-bucket --region eu-west-1
--create-bucket-configuration LocationConstraint=eu-west-1
-Enable Eventbridge notification on the bucket
+Enable EventBridge notification on the bucket
[source,sh]
aws s3api put-bucket-notification-configuration --bucket cdc-s3-bucket
--region eu-west-1 --notification-configuration '{ "EventBridgeConfiguration":
{} }'
-Add an Eventbridge rule on the bucket
+Add an EventBridge rule on the bucket
[source,sh]
@@ -65,16 +65,16 @@ Modify Access Policy for the queue just created.
Re: [PR] Fix various typos and case in readmes [camel-kamelets-examples]
apupier merged PR #73: URL: https://github.com/apache/camel-kamelets-examples/pull/73 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Fix various typos and case in readmes [camel-kamelets-examples]
apupier opened a new pull request, #73: URL: https://github.com/apache/camel-kamelets-examples/pull/73 (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
