Re: [PR] CAMEL-20606: Add Camel K bind command [camel]
davsclaus merged PR #13595: URL: https://github.com/apache/camel/pull/13595 -- 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-20606: Add Camel K bind command (#13595)
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 eb36ce03bf1 CAMEL-20606: Add Camel K bind command (#13595) eb36ce03bf1 is described below commit eb36ce03bf1d19b447133216d8d64eb33e16734e Author: Christoph Deppisch AuthorDate: Sat Mar 23 07:32:26 2024 +0100 CAMEL-20606: Add Camel K bind command (#13595) - Enhance Camel JBang bind command with Kubernetes and Camel K specifics such as traits, annotations, service bindings - Uses arbitrary bind command as a base - Makes sure to use a proper Camel K operator id --- .../apache/camel/dsl/jbang/core/commands/Bind.java | 90 +++-- .../camel/dsl/jbang/core/commands/k/Bind.java | 184 ++ .../dsl/jbang/core/commands/k/IntegrationRun.java | 17 +- .../dsl/jbang/core/commands/k/KubePlugin.java | 1 + .../templates/pipe-kamelet-kamelet.yaml.tmpl | 21 ++ .../resources/templates/pipe-kamelet-uri.yaml.tmpl | 18 ++ .../resources/templates/pipe-uri-kamelet.yaml.tmpl | 18 ++ .../resources/templates/pipe-uri-uri.yaml.tmpl | 15 ++ .../camel/dsl/jbang/core/commands/k/BindTest.java | 215 + .../jbang/core/commands/k/IntegrationRunTest.java | 14 ++ 10 files changed, 576 insertions(+), 17 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java index c5bc9e3809c..3a005645342 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java @@ -84,12 +84,50 @@ public class Bind extends CamelCommand { description = "Output format generated by this command (supports: file, yaml or json).") String output; +private final TemplateProvider templateProvider; + public Bind(CamelJBangMain main) { +this(main, new TemplateProvider() { +}); +} + +public Bind(CamelJBangMain main, TemplateProvider templateProvider) { super(main); +this.templateProvider = templateProvider; +} + +/** + * Helper class provides access to the templates that construct the Pipe resource. Subclasses may overwrite the + * provider to inject their own templates. + */ +public interface TemplateProvider { +default InputStream getPipeTemplate(String in, String out) { +return Bind.class.getClassLoader().getResourceAsStream("templates/pipe-" + in + "-" + out + ".yaml.tmpl"); +} + +default InputStream getStepTemplate(String stepType) { +return Bind.class.getClassLoader().getResourceAsStream("templates/step-%s.yaml.tmpl".formatted(stepType)); +} + +default InputStream getErrorHandlerTemplate(String type) { +return Bind.class.getClassLoader() + .getResourceAsStream("templates/error-handler-%s.yaml.tmpl".formatted(type)); +} } @Override public Integer doCall() throws Exception { +String pipe = constructPipe(); + +if (pipe.isEmpty()) { +printer().println("Failed to construct Pipe resource"); +return -1; +} + +return dumpPipe(pipe); +} + +public String constructPipe() throws Exception { // the pipe source and sink can either be a kamelet or an uri String in = "kamelet"; String out = "kamelet"; @@ -119,7 +157,7 @@ public class Bind extends CamelCommand { } } -InputStream is = Bind.class.getClassLoader().getResourceAsStream("templates/pipe-" + in + "-" + out + ".yaml.tmpl"); +InputStream is = templateProvider.getPipeTemplate(in, out); String context = IOHelper.loadText(is); IOHelper.close(is); @@ -146,7 +184,7 @@ public class Bind extends CamelCommand { stepProperties = kameletProperties(step, stepProperties); } -is = Bind.class.getClassLoader().getResourceAsStream("templates/step-%s.yaml.tmpl".formatted(stepType)); +is = templateProvider.getStepTemplate(stepType); text = IOHelper.loadText(is); IOHelper.close(is); text = text.replaceFirst("\\{\\{ \\.Name }}", step); @@ -176,7 +214,8 @@ public class Bind extends CamelCommand { if (errorHandlerTokens.length != 2) { printer().println( "Invalid error handler syntax. Type 'sink' needs an endpoint configuration (ie sink:endpointUri)"); -return -1; +//
(camel) annotated tag camel-4.5.0 created (now 87f18d7791c)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to annotated tag camel-4.5.0 in repository https://gitbox.apache.org/repos/asf/camel.git at 87f18d7791c (tag) tagging afc1eb789c7c0cb3488f8610afe2aa477b366500 (commit) replaces camel-4.0.0-RC2 by Gregor Zurowski on Sat Mar 23 08:33:00 2024 + - Log - [maven-release-plugin] copy for tag camel-4.5.0 --- No new revisions were added by this update.
Re: [PR] camel-cdi remove deprecated fireEvent method [camel]
davsclaus commented on PR #13596: URL: https://github.com/apache/camel/pull/13596#issuecomment-2016477258 Can you create a JIRA and send a PR for 3.22.x branch only. -- 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-cdi remove deprecated fireEvent method [camel]
mariucojocaru commented on PR #13596: URL: https://github.com/apache/camel/pull/13596#issuecomment-2016490820 > Can you create a JIRA and send a PR for 3.22.x branch only. Thanks for your feedback. I will do so. I do not have yet a jira account to create the ticket, so might take a while. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-spring-boot) branch camel-spring-boot-4.5.x created (now 19776b2dd1d)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch camel-spring-boot-4.5.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git at 19776b2dd1d Regen No new revisions were added by this update.
(camel-spring-boot) branch release/4.5.0 created (now 19776b2dd1d)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/4.5.0 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git at 19776b2dd1d Regen No new revisions were added by this update.
(camel-website) branch regen_bot updated (d498bd09 -> 75614476)
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-website.git from d498bd09 Adding eol to the release files of 3.2.x and 3.8.x add 75614476 Update schema to 4.4.1 LTS release No new revisions were added by this update. Summary of changes: .../camel-spring-4.4.1.xsd}| 0 static/schema/spring/camel-spring.xsd | 10 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename static/schema/{spring-xml/camel-spring-xml-4.4.1.xsd => spring/camel-spring-4.4.1.xsd} (100%)
(camel) 01/01: camel-jms - Using in/out should use single atomic operation with the timeout map for the correlation id. Could help with org.apache.camel.component.jms.JmsProducerConcurrentWithReplyTes
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch jms-inout in repository https://gitbox.apache.org/repos/asf/camel.git commit 63b317e7731510742a679f409449489656219da6 Author: Claus Ibsen AuthorDate: Sat Mar 23 17:41:45 2024 +0100 camel-jms - Using in/out should use single atomic operation with the timeout map for the correlation id. Could help with org.apache.camel.component.jms.JmsProducerConcurrentWithReplyTest.testConcurrentProducers --- .../java/org/apache/camel/component/jms/reply/QueueReplyManager.java | 3 +-- .../org/apache/camel/component/jms/reply/ReplyManagerSupport.java | 4 ++-- .../apache/camel/component/jms/reply/TemporaryQueueReplyManager.java | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java index c0697cf329d..000350941d2 100644 --- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java +++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java @@ -70,13 +70,12 @@ public class QueueReplyManager extends ReplyManagerSupport { @Override protected void handleReplyMessage(String correlationID, Message message, Session session) { -ReplyHandler handler = correlation.get(correlationID); +ReplyHandler handler = correlation.remove(correlationID); if (handler == null && endpoint.isUseMessageIDAsCorrelationID()) { handler = waitForProvisionCorrelationToBeUpdated(correlationID, message); } if (handler != null) { -correlation.remove(correlationID); handler.onReply(correlationID, message, session); } else { // we could not correlate the received reply message to a matching request and therefore diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java index 8118c78ce27..b8e12e72078 100644 --- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java +++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java @@ -17,6 +17,7 @@ package org.apache.camel.component.jms.reply; import java.time.Duration; +import java.util.Objects; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledExecutorService; @@ -250,12 +251,11 @@ public abstract class ReplyManagerSupport extends ServiceSupport implements Repl .build()) .build(); -return task.run(() -> getReplyHandler(correlationID), answer -> answer != null).orElse(null); +return task.run(() -> getReplyHandler(correlationID), Objects::nonNull).orElse(null); } private ReplyHandler getReplyHandler(String correlationID) { log.trace("Early reply not found handler. Waiting a bit longer."); - return correlation.get(correlationID); } diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java index fc715521c26..181463055d9 100644 --- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java +++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java @@ -88,13 +88,12 @@ public class TemporaryQueueReplyManager extends ReplyManagerSupport { @Override protected void handleReplyMessage(String correlationID, Message message, Session session) { -ReplyHandler handler = correlation.get(correlationID); +ReplyHandler handler = correlation.remove(correlationID); if (handler == null && endpoint.isUseMessageIDAsCorrelationID()) { handler = waitForProvisionCorrelationToBeUpdated(correlationID, message); } if (handler != null) { -correlation.remove(correlationID); handler.onReply(correlationID, message, session); } else { // we could not correlate the received reply message to a matching request and therefore
(camel-spring-boot) 01/02: Target Camel 4.5.0 for release
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch release/4.5.0 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit e28457a9974904531565cf4d780a10af2033d217 Author: Gregor Zurowski AuthorDate: Sat Mar 23 15:40:14 2024 + Target Camel 4.5.0 for release --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c2e4bda680b..6770ac568ef 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-dependencies -4.5.0-SNAPSHOT +4.5.0 org.apache.camel.springboot @@ -111,7 +111,7 @@ 3.2.4 -4.5.0-SNAPSHOT +4.5.0 1.0.2.v20150114 @@ -450,7 +450,7 @@ dev -4.5.0-SNAPSHOT +4.5.0
(camel-spring-boot) branch release/4.5.0 updated (19776b2dd1d -> 5008acbc72d)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/4.5.0 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git from 19776b2dd1d Regen new e28457a9974 Target Camel 4.5.0 for release new 5008acbc72d Fix dependency version The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: core-starter/camel-k-starter/pom.xml | 1 + pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-)
(camel-spring-boot) 02/02: Fix dependency version
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch release/4.5.0 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 5008acbc72d470961b84b006ecfa0a76eb57b760 Author: Gregor Zurowski AuthorDate: Sat Mar 23 17:06:09 2024 +0100 Fix dependency version --- core-starter/camel-k-starter/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/core-starter/camel-k-starter/pom.xml b/core-starter/camel-k-starter/pom.xml index d55d2c41fed..20fdd37cbd6 100644 --- a/core-starter/camel-k-starter/pom.xml +++ b/core-starter/camel-k-starter/pom.xml @@ -50,6 +50,7 @@ org.apache.camel camel-test-spring-junit5 + ${camel-version} org.apache.camel
(camel) branch main updated: Var fail (#13597)
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 41adc3a5988 Var fail (#13597) 41adc3a5988 is described below commit 41adc3a59889ef7f32715d4fc16b8dbfcc891ced Author: Claus Ibsen AuthorDate: Sat Mar 23 14:33:54 2024 +0100 Var fail (#13597) CAMEL-20607: camel-core - Using variableReceive should only set result if exchange was process succesfully --- .../java/org/apache/camel/processor/Enricher.java | 10 +- .../org/apache/camel/processor/PollEnricher.java | 9 +- .../camel/processor/SendDynamicProcessor.java | 8 +- .../org/apache/camel/processor/SendProcessor.java | 14 +- .../camel/processor/EnrichVariableErrorTest.java | 291 +++ .../processor/PollEnrichVariableErrorTest.java | 112 +++ .../processor/ToDynamicVariableErrorTest.java | 321 + .../camel/processor/ToVariableErrorTest.java | 291 +++ .../org/apache/camel/support/ExchangeHelper.java | 23 ++ .../ROOT/pages/camel-4x-upgrade-guide-4_6.adoc | 16 + .../modules/ROOT/pages/camel-4x-upgrade-guide.adoc | 1 + 11 files changed, 1075 insertions(+), 21 deletions(-) diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Enricher.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Enricher.java index 5dcabc96fac..9424fe89a61 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Enricher.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Enricher.java @@ -222,12 +222,12 @@ public class Enricher extends AsyncProcessorSupport implements IdAware, RouteIdA Exchange aggregatedExchange = aggregationStrategy.aggregate(exchange, resourceExchange); if (aggregatedExchange != null) { -if (variableReceive != null) { +if (ExchangeHelper.shouldSetVariableResult(aggregatedExchange, variableReceive)) { // result should be stored in variable instead of message body - ExchangeHelper.setVariableFromMessageBodyAndHeaders(exchange, variableReceive, -exchange.getMessage()); -exchange.getMessage().setBody(originalBody); - exchange.getMessage().setHeaders(originalHeaders); + ExchangeHelper.setVariableFromMessageBodyAndHeaders(aggregatedExchange, variableReceive, +aggregatedExchange.getMessage()); + aggregatedExchange.getMessage().setBody(originalBody); + aggregatedExchange.getMessage().setHeaders(originalHeaders); } // copy aggregation result onto original exchange (preserving pattern) copyResultsWithoutCorrelationId(exchange, aggregatedExchange); diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/PollEnricher.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/PollEnricher.java index d939963dd26..e13ec57ed88 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/PollEnricher.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/PollEnricher.java @@ -350,11 +350,12 @@ public class PollEnricher extends AsyncProcessorSupport implements IdAware, Rout // must catch any exception from aggregation Exchange aggregatedExchange = aggregationStrategy.aggregate(exchange, resourceExchange); if (aggregatedExchange != null) { -if (variableReceive != null) { +if (ExchangeHelper.shouldSetVariableResult(aggregatedExchange, variableReceive)) { // result should be stored in variable instead of message body - ExchangeHelper.setVariableFromMessageBodyAndHeaders(exchange, variableReceive, exchange.getMessage()); -exchange.getMessage().setBody(originalBody); -exchange.getMessage().setHeaders(originalHeaders); + ExchangeHelper.setVariableFromMessageBodyAndHeaders(aggregatedExchange, variableReceive, +aggregatedExchange.getMessage()); +aggregatedExchange.getMessage().setBody(originalBody); + aggregatedExchange.getMessage().setHeaders(originalHeaders); } // copy aggregation result onto original exchange (preserving pattern)
(camel) branch var-fail deleted (was 328d85c537d)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch var-fail in repository https://gitbox.apache.org/repos/asf/camel.git was 328d85c537d CAMEL-20607: camel-core - Using variableReceive should only set result if exchange was process succesfully 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] Var fail [camel]
davsclaus merged PR #13597: URL: https://github.com/apache/camel/pull/13597 -- 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 var-fail updated (87d35c17db6 -> 328d85c537d)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch var-fail in repository https://gitbox.apache.org/repos/asf/camel.git from 87d35c17db6 CAMEL-20607: camel-core - Using variableReceive should only set result if exchange was process succesfully add 328d85c537d CAMEL-20607: camel-core - Using variableReceive should only set result if exchange was process succesfully No new revisions were added by this update. Summary of changes: ...orTest.java => ToDynamicVariableErrorTest.java} | 72 +++--- 1 file changed, 51 insertions(+), 21 deletions(-) copy core/camel-core/src/test/java/org/apache/camel/processor/{ToVariableErrorTest.java => ToDynamicVariableErrorTest.java} (79%)
(camel-spring-boot) branch main updated: Fix dependency version
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/main by this push: new c26887a9e59 Fix dependency version c26887a9e59 is described below commit c26887a9e59857e1542c6c93e7e47c09ef3938ee Author: Gregor Zurowski AuthorDate: Sat Mar 23 17:06:09 2024 +0100 Fix dependency version --- core-starter/camel-k-starter/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/core-starter/camel-k-starter/pom.xml b/core-starter/camel-k-starter/pom.xml index d55d2c41fed..20fdd37cbd6 100644 --- a/core-starter/camel-k-starter/pom.xml +++ b/core-starter/camel-k-starter/pom.xml @@ -50,6 +50,7 @@ org.apache.camel camel-test-spring-junit5 + ${camel-version} org.apache.camel
(camel-website) branch main updated: Update schema to 4.4.1 LTS release
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-website.git The following commit(s) were added to refs/heads/main by this push: new 75614476 Update schema to 4.4.1 LTS release 75614476 is described below commit 75614476cbcf65649ef14f82911bb5444deb749f Author: Claus Ibsen AuthorDate: Sat Mar 23 17:18:42 2024 +0100 Update schema to 4.4.1 LTS release --- .../camel-spring-4.4.1.xsd}| 0 static/schema/spring/camel-spring.xsd | 10 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/static/schema/spring-xml/camel-spring-xml-4.4.1.xsd b/static/schema/spring/camel-spring-4.4.1.xsd similarity index 100% rename from static/schema/spring-xml/camel-spring-xml-4.4.1.xsd rename to static/schema/spring/camel-spring-4.4.1.xsd diff --git a/static/schema/spring/camel-spring.xsd b/static/schema/spring/camel-spring.xsd index bdf7a264..651eefc1 100644 --- a/static/schema/spring/camel-spring.xsd +++ b/static/schema/spring/camel-spring.xsd @@ -1215,7 +1215,7 @@ Evaluates a Python expression. @@ -1431,7 +1431,7 @@ Forces a rollback by stopping routing the message @@ -1720,7 +1720,7 @@ Sets the value of a message header @@ -3947,7 +3947,7 @@ Enables random backoff. Default value: false @@ -5714,7 +5714,7 @@ Sets the back off multiplier. Default value: 2.0
Re: [PR] jms inout concurrency issue [camel]
davsclaus commented on PR #13598: URL: https://github.com/apache/camel/pull/13598#issuecomment-2016547912 instead of using get and remove (2 ops) then use a single atomic remove (1 op) for the correlation id timeout map when doing request/reply with JMS and SJMS components. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-spring-boot) annotated tag camel-spring-boot-4.5.0 created (now 6735a61977f)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to annotated tag camel-spring-boot-4.5.0 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git at 6735a61977f (tag) tagging 387c914d4b6663b68ec1454c26e29503f2ae386c (commit) replaces camel-spring-boot-4.0.0-RC2 by Gregor Zurowski on Sat Mar 23 17:13:17 2024 + - Log - [maven-release-plugin] copy for tag camel-spring-boot-4.5.0 --- No new revisions were added by this update.
(camel) 05/05: CAMEL-20607: camel-core - Using variableReceive should only set result if exchange was process succesfully
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch var-fail in repository https://gitbox.apache.org/repos/asf/camel.git commit 87d35c17db647fc97e9e2d6b9637eaa3741c3c6f Author: Claus Ibsen AuthorDate: Sat Mar 23 13:26:05 2024 +0100 CAMEL-20607: camel-core - Using variableReceive should only set result if exchange was process succesfully --- .../java/org/apache/camel/processor/Enricher.java | 10 +- .../org/apache/camel/processor/PollEnricher.java | 9 +- .../camel/processor/EnrichVariableErrorTest.java | 291 + .../processor/PollEnrichVariableErrorTest.java | 112 4 files changed, 413 insertions(+), 9 deletions(-) diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Enricher.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Enricher.java index 97d757a5f99..9424fe89a61 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Enricher.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Enricher.java @@ -222,12 +222,12 @@ public class Enricher extends AsyncProcessorSupport implements IdAware, RouteIdA Exchange aggregatedExchange = aggregationStrategy.aggregate(exchange, resourceExchange); if (aggregatedExchange != null) { -if (ExchangeHelper.shouldSetVariableResult(exchange, variableReceive)) { +if (ExchangeHelper.shouldSetVariableResult(aggregatedExchange, variableReceive)) { // result should be stored in variable instead of message body - ExchangeHelper.setVariableFromMessageBodyAndHeaders(exchange, variableReceive, -exchange.getMessage()); -exchange.getMessage().setBody(originalBody); - exchange.getMessage().setHeaders(originalHeaders); + ExchangeHelper.setVariableFromMessageBodyAndHeaders(aggregatedExchange, variableReceive, +aggregatedExchange.getMessage()); + aggregatedExchange.getMessage().setBody(originalBody); + aggregatedExchange.getMessage().setHeaders(originalHeaders); } // copy aggregation result onto original exchange (preserving pattern) copyResultsWithoutCorrelationId(exchange, aggregatedExchange); diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/PollEnricher.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/PollEnricher.java index f6cac002f3d..e13ec57ed88 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/PollEnricher.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/PollEnricher.java @@ -350,11 +350,12 @@ public class PollEnricher extends AsyncProcessorSupport implements IdAware, Rout // must catch any exception from aggregation Exchange aggregatedExchange = aggregationStrategy.aggregate(exchange, resourceExchange); if (aggregatedExchange != null) { -if (ExchangeHelper.shouldSetVariableResult(exchange, variableReceive)) { +if (ExchangeHelper.shouldSetVariableResult(aggregatedExchange, variableReceive)) { // result should be stored in variable instead of message body - ExchangeHelper.setVariableFromMessageBodyAndHeaders(exchange, variableReceive, exchange.getMessage()); -exchange.getMessage().setBody(originalBody); -exchange.getMessage().setHeaders(originalHeaders); + ExchangeHelper.setVariableFromMessageBodyAndHeaders(aggregatedExchange, variableReceive, +aggregatedExchange.getMessage()); +aggregatedExchange.getMessage().setBody(originalBody); + aggregatedExchange.getMessage().setHeaders(originalHeaders); } // copy aggregation result onto original exchange (preserving pattern) copyResultsPreservePattern(exchange, aggregatedExchange); diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/EnrichVariableErrorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/EnrichVariableErrorTest.java new file mode 100644 index 000..3c199057eae --- /dev/null +++ b/core/camel-core/src/test/java/org/apache/camel/processor/EnrichVariableErrorTest.java @@ -0,0 +1,291 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the
(camel) 04/05: CAMEL-20607: camel-core - Using variableReceive should only set result if exchange was process succesfully
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch var-fail in repository https://gitbox.apache.org/repos/asf/camel.git commit b54b3ba73feb4d4cff183dcd4ed048788e7116d5 Author: Claus Ibsen AuthorDate: Sat Mar 23 10:26:55 2024 +0100 CAMEL-20607: camel-core - Using variableReceive should only set result if exchange was process succesfully --- .../org/apache/camel/processor/SendDynamicProcessor.java | 8 .../main/java/org/apache/camel/processor/SendProcessor.java | 12 +--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java index 94c41c1b107..decf336be57 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java @@ -237,10 +237,10 @@ public class SendDynamicProcessor extends AsyncProcessorSupport implements IdAwa ServiceHelper.stopAndShutdownService(endpoint); } // result should be stored in variable instead of message body -if (ExchangeHelper.shouldSetVariableResult(exchange, variableReceive)) { - ExchangeHelper.setVariableFromMessageBodyAndHeaders(exchange, variableReceive, exchange.getMessage()); -exchange.getMessage().setBody(originalBody); -exchange.getMessage().setHeaders(originalHeaders); +if (ExchangeHelper.shouldSetVariableResult(target, variableReceive)) { + ExchangeHelper.setVariableFromMessageBodyAndHeaders(target, variableReceive, target.getMessage()); +target.getMessage().setBody(originalBody); +target.getMessage().setHeaders(originalHeaders); } // signal we are done c.done(doneSync); diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendProcessor.java index 0f0bde0a265..37dd575fccd 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendProcessor.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendProcessor.java @@ -179,11 +179,11 @@ public class SendProcessor extends AsyncProcessorSupport implements Traceable, E ac = doneSync -> { try { // result should be stored in variable instead of message body/headers -if (ExchangeHelper.shouldSetVariableResult(exchange, variableReceive)) { - ExchangeHelper.setVariableFromMessageBodyAndHeaders(exchange, variableReceive, -exchange.getMessage()); -exchange.getMessage().setBody(originalBody); -exchange.getMessage().setHeaders(originalHeaders); +if (ExchangeHelper.shouldSetVariableResult(target, variableReceive)) { + ExchangeHelper.setVariableFromMessageBodyAndHeaders(target, variableReceive, +target.getMessage()); +target.getMessage().setBody(originalBody); +target.getMessage().setHeaders(originalHeaders); } // restore previous MEP target.setPattern(existingPattern); @@ -202,8 +202,6 @@ public class SendProcessor extends AsyncProcessorSupport implements Traceable, E if (variableSend != null) { Object value = ExchangeHelper.getVariable(exchange, variableSend); exchange.getMessage().setBody(value); -// TODO: empty headers or - } LOG.debug(" {} {}", destination, exchange);
(camel-spring-boot) 01/01: Add camel-k-starter to BOM
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch ck in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 496c47a31077fbe98f89e3ce26ed9fcbdd491049 Author: Claus Ibsen AuthorDate: Sat Mar 23 17:15:47 2024 +0100 Add camel-k-starter to BOM --- tooling/camel-spring-boot-bom/pom.xml| 5 + tooling/camel-spring-boot-dependencies/pom.xml | 5 + .../apache/camel/springboot/maven/BomDependenciesGeneratorMojo.java | 5 + .../java/org/apache/camel/springboot/maven/BomGeneratorMojo.java | 5 + 4 files changed, 20 insertions(+) diff --git a/tooling/camel-spring-boot-bom/pom.xml b/tooling/camel-spring-boot-bom/pom.xml index 4157f29a091..589ea4ecfb5 100644 --- a/tooling/camel-spring-boot-bom/pom.xml +++ b/tooling/camel-spring-boot-bom/pom.xml @@ -983,6 +983,11 @@ camel-jte-starter 4.5.0-SNAPSHOT + +org.apache.camel.springboot +camel-k-starter +4.5.0-SNAPSHOT + org.apache.camel.springboot camel-kafka-starter diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index ec991f73eca..5b687c605c1 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -1227,6 +1227,11 @@ camel-jte-starter ${project.version} + +org.apache.camel.springboot +camel-k-starter +${project.version} + org.apache.camel.springboot camel-kafka-starter diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomDependenciesGeneratorMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomDependenciesGeneratorMojo.java index ba32ccf4777..1940baabfff 100644 --- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomDependenciesGeneratorMojo.java +++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomDependenciesGeneratorMojo.java @@ -238,6 +238,11 @@ public class BomDependenciesGeneratorMojo extends AbstractMojo { dep.setArtifactId("camel-spring-boot-xml-starter"); dep.setVersion("${project.version}"); outDependencies.add(dep); +dep = new Dependency(); +dep.setGroupId("org.apache.camel.springboot"); +dep.setArtifactId("camel-k-starter"); +dep.setVersion("${project.version}"); +outDependencies.add(dep); // include dsl starters dep = new Dependency(); diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java index bc3775e8a11..e84319a1bc9 100644 --- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java +++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java @@ -124,6 +124,11 @@ public class BomGeneratorMojo extends AbstractMojo { dep.setArtifactId("camel-spring-boot-xml-starter"); dep.setVersion(project.getVersion()); outDependencies.add(dep); +dep = new Dependency(); +dep.setGroupId("org.apache.camel.springboot"); +dep.setArtifactId("camel-k-starter"); +dep.setVersion(project.getVersion()); +outDependencies.add(dep); // include base jars dep = new Dependency();
(camel-spring-boot) branch ck created (now 496c47a3107)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch ck in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git at 496c47a3107 Add camel-k-starter to BOM This branch includes the following new commits: new 496c47a3107 Add camel-k-starter to BOM 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.
[PR] Add camel-k-starter to BOM [camel-spring-boot]
davsclaus opened a new pull request, #1118: URL: https://github.com/apache/camel-spring-boot/pull/1118 (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) branch jms-inout updated: camel-jms - Using in/out should use single atomic operation with the timeout map for the correlation id. Could help with org.apache.camel.component.jms.JmsProducerCon
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch jms-inout in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/jms-inout by this push: new 5edc42ce7ef camel-jms - Using in/out should use single atomic operation with the timeout map for the correlation id. Could help with org.apache.camel.component.jms.JmsProducerConcurrentWithReplyTest.testConcurrentProducers 5edc42ce7ef is described below commit 5edc42ce7ef3e4e1b5a291be43922ad38ffd26fa Author: Claus Ibsen AuthorDate: Sat Mar 23 18:00:21 2024 +0100 camel-jms - Using in/out should use single atomic operation with the timeout map for the correlation id. Could help with org.apache.camel.component.jms.JmsProducerConcurrentWithReplyTest.testConcurrentProducers --- .../apache/camel/component/jms/reply/ReplyManagerSupport.java | 10 +- .../apache/camel/component/sjms/reply/QueueReplyManager.java | 5 + .../camel/component/sjms/reply/TemporaryQueueReplyManager.java | 3 +-- .../main/java/org/apache/camel/support/DefaultTimeoutMap.java | 5 + 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java index b8e12e72078..31234500eee 100644 --- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java +++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java @@ -231,13 +231,13 @@ public abstract class ReplyManagerSupport extends ServiceSupport implements Repl /** * IMPORTANT: This logic is only being used due to high performance in-memory only testing using InOut over - * JMS. Its unlikely to happen in a real life situation with communication to a remote broker, which always will be - * slower to send back reply, before Camel had a chance to update it's internal correlation map. + * JMS. It is unlikely to happen in a real life situation with communication to a remote broker, which always will + * be slower to send back reply, before Camel had a chance to update the internal correlation map. */ protected ReplyHandler waitForProvisionCorrelationToBeUpdated(String correlationID, Message message) { // race condition, when using messageID as correlationID then we store a provisional correlation id // at first, which gets updated with the JMSMessageID after the message has been sent. And in the unlikely -// event that the reply comes back really really fast, and the correlation map hasn't yet been updated +// event that the reply comes back really fast, and the correlation map hasn't yet been updated // from the provisional id to the JMSMessageID. If so we have to wait a bit and lookup again. if (log.isWarnEnabled()) { log.warn("Early reply received with correlationID [{}] -> {}", correlationID, message); @@ -255,8 +255,8 @@ public abstract class ReplyManagerSupport extends ServiceSupport implements Repl } private ReplyHandler getReplyHandler(String correlationID) { -log.trace("Early reply not found handler. Waiting a bit longer."); -return correlation.get(correlationID); +log.trace("Early reply not found. Waiting a bit longer."); +return correlation.remove(correlationID); // get and remove } @Override diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/QueueReplyManager.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/QueueReplyManager.java index fb67ba02739..662f40fa6cc 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/QueueReplyManager.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/QueueReplyManager.java @@ -45,16 +45,13 @@ public class QueueReplyManager extends ReplyManagerSupport { // should not happen that we can't find the handler return; } - correlation.put(newCorrelationId, handler, requestTimeout); } @Override protected void handleReplyMessage(String correlationID, Message message, Session session) { -ReplyHandler handler = correlation.get(correlationID); - +ReplyHandler handler = correlation.remove(correlationID); if (handler != null) { -correlation.remove(correlationID); handler.onReply(correlationID, message, session); } else { // we could not correlate the received reply message to a matching request and therefore diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueReplyManager.java
[PR] jms inout concurrency issue [camel]
davsclaus opened a new pull request, #13598: URL: https://github.com/apache/camel/pull/13598 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-spring-boot) branch main updated: Add camel-k-starter to BOM (#1118)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/main by this push: new a08a00b7ea2 Add camel-k-starter to BOM (#1118) a08a00b7ea2 is described below commit a08a00b7ea2ad886c1a512c15c59bbe2b87b6218 Author: Claus Ibsen AuthorDate: Sat Mar 23 18:39:15 2024 +0100 Add camel-k-starter to BOM (#1118) --- tooling/camel-spring-boot-bom/pom.xml| 5 + tooling/camel-spring-boot-dependencies/pom.xml | 5 + .../apache/camel/springboot/maven/BomDependenciesGeneratorMojo.java | 5 + .../java/org/apache/camel/springboot/maven/BomGeneratorMojo.java | 5 + 4 files changed, 20 insertions(+) diff --git a/tooling/camel-spring-boot-bom/pom.xml b/tooling/camel-spring-boot-bom/pom.xml index 4157f29a091..589ea4ecfb5 100644 --- a/tooling/camel-spring-boot-bom/pom.xml +++ b/tooling/camel-spring-boot-bom/pom.xml @@ -983,6 +983,11 @@ camel-jte-starter 4.5.0-SNAPSHOT + +org.apache.camel.springboot +camel-k-starter +4.5.0-SNAPSHOT + org.apache.camel.springboot camel-kafka-starter diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index ec991f73eca..5b687c605c1 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -1227,6 +1227,11 @@ camel-jte-starter ${project.version} + +org.apache.camel.springboot +camel-k-starter +${project.version} + org.apache.camel.springboot camel-kafka-starter diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomDependenciesGeneratorMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomDependenciesGeneratorMojo.java index ba32ccf4777..1940baabfff 100644 --- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomDependenciesGeneratorMojo.java +++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomDependenciesGeneratorMojo.java @@ -238,6 +238,11 @@ public class BomDependenciesGeneratorMojo extends AbstractMojo { dep.setArtifactId("camel-spring-boot-xml-starter"); dep.setVersion("${project.version}"); outDependencies.add(dep); +dep = new Dependency(); +dep.setGroupId("org.apache.camel.springboot"); +dep.setArtifactId("camel-k-starter"); +dep.setVersion("${project.version}"); +outDependencies.add(dep); // include dsl starters dep = new Dependency(); diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java index bc3775e8a11..e84319a1bc9 100644 --- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java +++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java @@ -124,6 +124,11 @@ public class BomGeneratorMojo extends AbstractMojo { dep.setArtifactId("camel-spring-boot-xml-starter"); dep.setVersion(project.getVersion()); outDependencies.add(dep); +dep = new Dependency(); +dep.setGroupId("org.apache.camel.springboot"); +dep.setArtifactId("camel-k-starter"); +dep.setVersion(project.getVersion()); +outDependencies.add(dep); // include base jars dep = new Dependency();
(camel-spring-boot) branch ck deleted (was 496c47a3107)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch ck in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git was 496c47a3107 Add camel-k-starter to BOM 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-website) 02/02: Camel 4.5 whats new blog. WIP.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch new45 in repository https://gitbox.apache.org/repos/asf/camel-website.git commit cedcfa50051459c06ca4b8c641e53f69470cb91f Author: Claus Ibsen AuthorDate: Sat Mar 23 18:38:45 2024 +0100 Camel 4.5 whats new blog. WIP. --- content/blog/2024/03/camel45-whatsnew/index.md | 44 +- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/content/blog/2024/03/camel45-whatsnew/index.md b/content/blog/2024/03/camel45-whatsnew/index.md index 5642eecc..ed32c235 100644 --- a/content/blog/2024/03/camel45-whatsnew/index.md +++ b/content/blog/2024/03/camel45-whatsnew/index.md @@ -12,11 +12,53 @@ This release introduces a set of new features and noticeable improvements that w ## Camel Core +When using Kamelets and/or Rest DSL then Camel will now hide their intermediate routes and only show user routes. +The number of routes that Camel logs on startup is thus only the number of _user_ routes. This avoid to clutter +up the list of routes in monitoring and management tools as well. +## Camel Main + +We added the concept of _profile_ to running Camel standalone or via camel-jbang. For example camel-jbang runs in `dev` profile +by default, and `camel-main` would run in `prod` profile by default. + +Using profiles allows you to have profile specific _application.properties_ files, such as `application-dev.properties` that +that can provide environment specific configuration, for example hostname, username and passwords for connecting to systems. +To make it quick and easy to have settings for development, and then avoid having to remove those when building for UAT or production. + +## Camel JBang + +We fixed some issues using Camel JBang with Windows. But we would like more feedback from Windows users. + +Added `/q/info` as HTTP console to show some basic information about the Camel application. + +## Camel Catalog + +We now generate more metadata for evert Camel release and have added the following information into `camel-catalog`, +that can be useful for Camel tooling such as Karavan and Kaoto: + +- `dev-consoles` - Provides a list of all available developer consoles +- `transformers` - Provides a list of all cloud event transformers (Camel K pipes) +- `beans` - Provides a list of all miscellaneous beans such as `AggregationRepository`, `IdempotentRepository` and all the options. (For example to know that Camel offers a Redis idempotent repository). + +## Camel Micrometer + +Added _context_ level metrics as well, so you have combined metrics for the entire Camel application. + +Adjusted the tags in the metrics to be shorter. See the upgrade guide for more details. + +## OpenAPI v2 + +Support for OpenAPI v2 (swagger) has been removed. Use OpenAPI v3 spec instead. ## Miscellaneous -TODO: +The `camel-spring-rabbitmq` can now automatic bind and create if setting `autoDeclareProducer=true` for the producers as well. + +The `camel-yaml-dsl` can now set error handler on the route level as well. Previously you must do this via route configuration. + +The `camel-kafka` has been upgraded to Kafka Client 3.7. + +The documentation has many grammar, typo and cosmetic changes. Upgraded many third-party dependencies to the latest release at the time of release.
(camel-website) 01/02: Camel 4.5 whats new blog. WIP.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch new45 in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 25309a1e43d273bdf6d4a3330ac67d3fb1688aae Author: Claus Ibsen AuthorDate: Sat Mar 23 18:09:53 2024 +0100 Camel 4.5 whats new blog. WIP. --- content/blog/2024/03/camel45-whatsnew/featured.png | Bin 0 -> 243818 bytes content/blog/2024/03/camel45-whatsnew/index.md | 53 + 2 files changed, 53 insertions(+) diff --git a/content/blog/2024/03/camel45-whatsnew/featured.png b/content/blog/2024/03/camel45-whatsnew/featured.png new file mode 100644 index ..a9a95d3b Binary files /dev/null and b/content/blog/2024/03/camel45-whatsnew/featured.png differ diff --git a/content/blog/2024/03/camel45-whatsnew/index.md b/content/blog/2024/03/camel45-whatsnew/index.md new file mode 100644 index ..5642eecc --- /dev/null +++ b/content/blog/2024/03/camel45-whatsnew/index.md @@ -0,0 +1,53 @@ +--- +title: "Apache Camel 4.5 What's New" +date: 2024-03-29 +authors: [davsclaus] +categories: ["Releases"] +preview: Details of what we have done in the Camel 4.5 release. +--- + +Apache Camel 4.5 has just been [released](/blog/2024/03/RELEASE-4.5.0/). + +This release introduces a set of new features and noticeable improvements that we will cover in this blog post. + +## Camel Core + + + +## Miscellaneous + +TODO: + +Upgraded many third-party dependencies to the latest release at the time of release. + +## New Components + +We have added some new AI based components and support for wasm and jolokia. + +- `camel-aws-bedrock` - Invoke Model of AWS Bedrock service. +- `camel-aws-bedrock-agent` - Operate on AWS Bedrock through its Agent. +- `camel-aws-bedrock-agent-runtime` - Invoke Model of AWS Bedrock Agent Runtime service. +- `camel-langchain-chat` - LangChain4j Chat component +- `camel-langchain-embeddings` - LangChain4j Embeddings +- `camel-milvus` - Perform operations on the Milvus Vector Database. +- `camel-qdrant` - Perform operations on the Qdrant Vector Database. +- `camel-wasm` - Call a wasm (web assembly) function. +- `camel-platform-http-jolokia` - Jolokia plugin for standalone Camel HTTP Platform + +## Upgrading + +Make sure to read the [upgrade guide](/manual/camel-4x-upgrade-guide-4_5.html) if you are upgrading from a previous Camel version. + +If you are upgrading from, for example, 4.0 to 4.4, then make sure to follow the upgrade guides for each release in-between, i.e. +4.0 -> 4.1, 4.1 -> 4.2, and so forth. + +## Release Notes + +You can find more information about this release in the list of JIRA tickets resolved in the release: + +- [Release notes 4.5](/releases/release-4.5.0/) + +## Roadmap + +The following 4.6 release (non LTS) is planned for May 2024. +
(camel-website) branch new45 created (now cedcfa50)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch new45 in repository https://gitbox.apache.org/repos/asf/camel-website.git at cedcfa50 Camel 4.5 whats new blog. WIP. This branch includes the following new commits: new 25309a1e Camel 4.5 whats new blog. WIP. new cedcfa50 Camel 4.5 whats new blog. WIP. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[PR] New45 [camel-website]
davsclaus opened a new pull request, #1163: URL: https://github.com/apache/camel-website/pull/1163 (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] Add camel-k-starter to BOM [camel-spring-boot]
davsclaus merged PR #1118: URL: https://github.com/apache/camel-spring-boot/pull/1118 -- 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] Var fail [camel]
github-actions[bot] commented on PR #13597: URL: https://github.com/apache/camel/pull/13597#issuecomment-2016480613 :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] Var fail [camel]
davsclaus opened a new pull request, #13597: URL: https://github.com/apache/camel/pull/13597 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] camel-cdi remove deprecated fireEvent method [camel]
mariucojocaru opened a new pull request, #13596: URL: https://github.com/apache/camel/pull/13596 - remove deprecated BeanManager.fireEvent - this will allow the library to be used in also with cdi api 4 after transforming it with eclipse transformer. # Description fireEvent method was removed in cdi api 4 version. This means the camel-cdi library cannot be used in jakarta app servers even after transforming it using eclipse transformer tool. # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] camel-cdi remove deprecated fireEvent method [camel]
github-actions[bot] commented on PR #13596: URL: https://github.com/apache/camel/pull/13596#issuecomment-2016461480 :star2: Thank you for your contribution to the Apache Camel project! :star2: :warning: Please note that the changes on this PR may be **tested automatically**. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Bump webpack-dev-middleware from 5.3.3 to 5.3.4 in /karavan-designer [camel-karavan]
dependabot[bot] opened a new pull request, #1193: URL: https://github.com/apache/camel-karavan/pull/1193 Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4. Release notes Sourced from https://github.com/webpack/webpack-dev-middleware/releases;>webpack-dev-middleware's releases. v5.3.4 https://github.com/webpack/webpack-dev-middleware/compare/v5.3.3...v5.3.4;>5.3.4 (2024-03-20) Bug Fixes security: do not allow to read files above (https://redirect.github.com/webpack/webpack-dev-middleware/issues/1779;>#1779) (https://github.com/webpack/webpack-dev-middleware/commit/189c4ac7d2344ec132a4689e74dc837ec5be0132;>189c4ac) Changelog Sourced from https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md;>webpack-dev-middleware's changelog. https://github.com/webpack/webpack-dev-middleware/compare/v5.3.3...v5.3.4;>5.3.4 (2024-03-20) Bug Fixes security: do not allow to read files above (https://redirect.github.com/webpack/webpack-dev-middleware/issues/1779;>#1779) (https://github.com/webpack/webpack-dev-middleware/commit/189c4ac7d2344ec132a4689e74dc837ec5be0132;>189c4ac) Commits https://github.com/webpack/webpack-dev-middleware/commit/86071ead69e946ada25497d3e281923e885229a4;>86071ea chore(release): 5.3.4 https://github.com/webpack/webpack-dev-middleware/commit/189c4ac7d2344ec132a4689e74dc837ec5be0132;>189c4ac fix(security): do not allow to read files above (https://redirect.github.com/webpack/webpack-dev-middleware/issues/1779;>#1779) See full diff in https://github.com/webpack/webpack-dev-middleware/compare/v5.3.3...v5.3.4;>compare view [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=webpack-dev-middleware=npm_and_yarn=5.3.3=5.3.4)](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) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/apache/camel-karavan/network/alerts). -- 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 dependabot/npm_and_yarn/karavan-designer/webpack-dev-middleware-5.3.4 created (now 8e5235f9)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/karavan-designer/webpack-dev-middleware-5.3.4 in repository https://gitbox.apache.org/repos/asf/camel-karavan.git at 8e5235f9 Bump webpack-dev-middleware from 5.3.3 to 5.3.4 in /karavan-designer No new revisions were added by this update.
(camel-website-pub) branch asf-site updated (f061771e7 -> f5c8f603f)
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website-pub.git discard f061771e7 Website updated to d498bd09655cd068f6f75812de91282a1455903f discard 02c76dadf Website updated to 325e929157412b27394080f4d4dba3d821476ddf new 63f6c94c5 Website updated to 325e929157412b27394080f4d4dba3d821476ddf new f5c8f603f Website updated to 75614476cbcf65649ef14f82911bb5444deb749f 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 (f061771e7) \ N -- N -- N refs/heads/asf-site (f5c8f603f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .htaccess | 156 +- .well-known/security.txt |2 +- camel-k/next/apis/camel-k.html |2 +- .../installation/advanced/multi-architecture.html |8 +- camel-k/next/running/camel-runtimes.html |2 +- camel-k/next/traits/builder.html |2 +- camel-kamelets/4.4.x/aws-ddb-sink.html |2 +- camel-kamelets/4.4.x/aws-kinesis-source.html |2 +- camel-kamelets/4.4.x/aws-s3-source.html|2 +- camel-kamelets/4.4.x/aws-sqs-source.html |2 +- .../4.4.x/azure-storage-blob-source.html |2 +- .../4.4.x/azure-storage-datalake-sink.html |2 +- .../4.4.x/azure-storage-datalake-source.html |2 +- .../4.4.x/azure-storage-queue-source.html |2 +- camel-kamelets/4.4.x/drop-field-action.html|2 +- camel-kamelets/4.4.x/extract-field-action.html |2 +- camel-kamelets/4.4.x/google-sheets-sink.html |2 +- camel-kamelets/4.4.x/hoist-field-action.html |2 +- camel-kamelets/4.4.x/insert-field-action.html |2 +- camel-kamelets/4.4.x/json-deserialize-action.html |2 +- camel-kamelets/4.4.x/json-serialize-action.html|2 +- ...kafka-apicurio-registry-not-secured-source.html |2 +- .../4.4.x/kafka-azure-schema-registry-sink.html|2 +- .../4.4.x/kafka-azure-schema-registry-source.html |2 +- ...batch-apicurio-registry-not-secured-source.html |2 +- .../kafka-batch-azure-schema-registry-source.html |2 +- .../4.4.x/kafka-batch-manual-commit-action.html|2 +- .../4.4.x/kafka-batch-not-secured-source.html |2 +- camel-kamelets/4.4.x/kafka-batch-scram-source.html |2 +- camel-kamelets/4.4.x/kafka-batch-source.html |2 +- camel-kamelets/4.4.x/kafka-batch-ssl-source.html |2 +- .../4.4.x/kafka-manual-commit-action.html |2 +- camel-kamelets/4.4.x/kafka-not-secured-sink.html |2 +- camel-kamelets/4.4.x/kafka-not-secured-source.html |2 +- camel-kamelets/4.4.x/kafka-scram-source.html |2 +- camel-kamelets/4.4.x/kafka-source.html |2 +- camel-kamelets/4.4.x/kafka-ssl-source.html |2 +- camel-kamelets/4.4.x/mask-field-action.html|2 +- .../4.4.x/message-timestamp-router-action.html |2 +- .../4.4.x/mongodb-changes-stream-source.html |2 +- camel-kamelets/4.4.x/mongodb-sink.html |2 +- camel-kamelets/4.4.x/mongodb-source.html |2 +- .../4.4.x/openai-classification-action.html|2 +- .../4.4.x/protobuf-deserialize-action.html |2 +- .../4.4.x/protobuf-serialize-action.html |2 +- camel-kamelets/4.4.x/regex-router-action.html |2 +- camel-kamelets/4.4.x/replace-field-action.html |2 +- .../4.4.x/resolve-pojo-schema-action.html |2 +- camel-kamelets/4.4.x/timestamp-router-action.html |2 +- camel-kamelets/4.4.x/value-to-key-action.html |2 +- camel-quarkus/3.2.x/index.html |2 +- camel-quarkus/3.8.x/index.html |2 +- camel-quarkus/next/index.html |2 +- .../next/user-guide/dependency-management.html |6 +- camel-quarkus/next/user-guide/first-steps.html |2 +- camel-spring-boot/next/list.html |2 +- components/4.4.x/azure-servicebus-component.html |2 +-
Error while running github feature from .asf.yaml in camel-website-pub!
An error occurred while running github feature in .asf.yaml!: 422 {"message": "Validation Failed", "errors": [{"message": "Sorry, you need to allow at least one merge strategy. (no_merge_method)", "resource": "Repository", "field": "merge_commit_allowed", "code": "invalid"}], "documentation_url": "https://docs.github.com/rest/repos/repos#update-a-repository"}
Re: [I] Provide full description for trait in CRD [camel-k]
github-actions[bot] closed issue #4727: Provide full description for trait in CRD URL: https://github.com/apache/camel-k/issues/4727 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Bump webpack-dev-middleware from 5.3.3 to 5.3.4 in /karavan-app/src/main/webui [camel-karavan]
dependabot[bot] opened a new pull request, #1194: URL: https://github.com/apache/camel-karavan/pull/1194 Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4. Release notes Sourced from https://github.com/webpack/webpack-dev-middleware/releases;>webpack-dev-middleware's releases. v5.3.4 https://github.com/webpack/webpack-dev-middleware/compare/v5.3.3...v5.3.4;>5.3.4 (2024-03-20) Bug Fixes security: do not allow to read files above (https://redirect.github.com/webpack/webpack-dev-middleware/issues/1779;>#1779) (https://github.com/webpack/webpack-dev-middleware/commit/189c4ac7d2344ec132a4689e74dc837ec5be0132;>189c4ac) Changelog Sourced from https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md;>webpack-dev-middleware's changelog. https://github.com/webpack/webpack-dev-middleware/compare/v5.3.3...v5.3.4;>5.3.4 (2024-03-20) Bug Fixes security: do not allow to read files above (https://redirect.github.com/webpack/webpack-dev-middleware/issues/1779;>#1779) (https://github.com/webpack/webpack-dev-middleware/commit/189c4ac7d2344ec132a4689e74dc837ec5be0132;>189c4ac) Commits https://github.com/webpack/webpack-dev-middleware/commit/86071ead69e946ada25497d3e281923e885229a4;>86071ea chore(release): 5.3.4 https://github.com/webpack/webpack-dev-middleware/commit/189c4ac7d2344ec132a4689e74dc837ec5be0132;>189c4ac fix(security): do not allow to read files above (https://redirect.github.com/webpack/webpack-dev-middleware/issues/1779;>#1779) See full diff in https://github.com/webpack/webpack-dev-middleware/compare/v5.3.3...v5.3.4;>compare view [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=webpack-dev-middleware=npm_and_yarn=5.3.3=5.3.4)](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) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/apache/camel-karavan/network/alerts). -- 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 dependabot/npm_and_yarn/karavan-app/src/main/webui/webpack-dev-middleware-5.3.4 created (now 28f5557e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/karavan-app/src/main/webui/webpack-dev-middleware-5.3.4 in repository https://gitbox.apache.org/repos/asf/camel-karavan.git at 28f5557e Bump webpack-dev-middleware in /karavan-app/src/main/webui No new revisions were added by this update.
Re: [I] [CI] - Camel Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-2016654346 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 8405433741-1327-222d9939-517b-490d-a3a8-5435c1c9d77f * Camel Quarkus Commit: 7fccd9d0e6991bbb59abb557e6a336e144971dad * Camel Main Commit: 8817f06a9914a6bc9275325d28a52aab8ec2b4d1 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/8405433741 -- 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] Feature: helm chart [camel-karavan]
spoletum commented on issue #1172: URL: https://github.com/apache/camel-karavan/issues/1172#issuecomment-2016420353 > @spoletum if you need help with something there, let me know as well! Happy to contribute on this one as well. More than happily. I forked the project [here](https://github.com/spoletum/camel-karavan), changes are in the `charts` folder. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Bump webpack-dev-middleware from 5.3.3 to 5.3.4 in /karavan-space [camel-karavan]
dependabot[bot] opened a new pull request, #1192: URL: https://github.com/apache/camel-karavan/pull/1192 Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4. Release notes Sourced from https://github.com/webpack/webpack-dev-middleware/releases;>webpack-dev-middleware's releases. v5.3.4 https://github.com/webpack/webpack-dev-middleware/compare/v5.3.3...v5.3.4;>5.3.4 (2024-03-20) Bug Fixes security: do not allow to read files above (https://redirect.github.com/webpack/webpack-dev-middleware/issues/1779;>#1779) (https://github.com/webpack/webpack-dev-middleware/commit/189c4ac7d2344ec132a4689e74dc837ec5be0132;>189c4ac) Changelog Sourced from https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md;>webpack-dev-middleware's changelog. https://github.com/webpack/webpack-dev-middleware/compare/v5.3.3...v5.3.4;>5.3.4 (2024-03-20) Bug Fixes security: do not allow to read files above (https://redirect.github.com/webpack/webpack-dev-middleware/issues/1779;>#1779) (https://github.com/webpack/webpack-dev-middleware/commit/189c4ac7d2344ec132a4689e74dc837ec5be0132;>189c4ac) Commits https://github.com/webpack/webpack-dev-middleware/commit/86071ead69e946ada25497d3e281923e885229a4;>86071ea chore(release): 5.3.4 https://github.com/webpack/webpack-dev-middleware/commit/189c4ac7d2344ec132a4689e74dc837ec5be0132;>189c4ac fix(security): do not allow to read files above (https://redirect.github.com/webpack/webpack-dev-middleware/issues/1779;>#1779) See full diff in https://github.com/webpack/webpack-dev-middleware/compare/v5.3.3...v5.3.4;>compare view [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=webpack-dev-middleware=npm_and_yarn=5.3.3=5.3.4)](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) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/apache/camel-karavan/network/alerts). -- 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 dependabot/npm_and_yarn/karavan-space/webpack-dev-middleware-5.3.4 created (now f66238bc)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/karavan-space/webpack-dev-middleware-5.3.4 in repository https://gitbox.apache.org/repos/asf/camel-karavan.git at f66238bc Bump webpack-dev-middleware from 5.3.3 to 5.3.4 in /karavan-space No new revisions were added by this update.
(camel) 01/05: CAMEL-20607: camel-core - Using variableReceive should only set result if exchange was process succesfully
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch var-fail in repository https://gitbox.apache.org/repos/asf/camel.git commit 951c77f1364285230abd1ba36413f345906b48f6 Author: Claus Ibsen AuthorDate: Sat Mar 23 09:21:21 2024 +0100 CAMEL-20607: camel-core - Using variableReceive should only set result if exchange was process succesfully --- .../java/org/apache/camel/processor/Enricher.java | 2 +- .../org/apache/camel/processor/PollEnricher.java | 2 +- .../camel/processor/SendDynamicProcessor.java | 2 +- .../org/apache/camel/processor/SendProcessor.java | 4 ++-- .../org/apache/camel/support/ExchangeHelper.java | 22 ++ 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Enricher.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Enricher.java index 5dcabc96fac..97d757a5f99 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Enricher.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Enricher.java @@ -222,7 +222,7 @@ public class Enricher extends AsyncProcessorSupport implements IdAware, RouteIdA Exchange aggregatedExchange = aggregationStrategy.aggregate(exchange, resourceExchange); if (aggregatedExchange != null) { -if (variableReceive != null) { +if (ExchangeHelper.shouldSetVariableResult(exchange, variableReceive)) { // result should be stored in variable instead of message body ExchangeHelper.setVariableFromMessageBodyAndHeaders(exchange, variableReceive, exchange.getMessage()); diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/PollEnricher.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/PollEnricher.java index d939963dd26..f6cac002f3d 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/PollEnricher.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/PollEnricher.java @@ -350,7 +350,7 @@ public class PollEnricher extends AsyncProcessorSupport implements IdAware, Rout // must catch any exception from aggregation Exchange aggregatedExchange = aggregationStrategy.aggregate(exchange, resourceExchange); if (aggregatedExchange != null) { -if (variableReceive != null) { +if (ExchangeHelper.shouldSetVariableResult(exchange, variableReceive)) { // result should be stored in variable instead of message body ExchangeHelper.setVariableFromMessageBodyAndHeaders(exchange, variableReceive, exchange.getMessage()); exchange.getMessage().setBody(originalBody); diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java index d877f180684..94c41c1b107 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java @@ -237,7 +237,7 @@ public class SendDynamicProcessor extends AsyncProcessorSupport implements IdAwa ServiceHelper.stopAndShutdownService(endpoint); } // result should be stored in variable instead of message body -if (variableReceive != null) { +if (ExchangeHelper.shouldSetVariableResult(exchange, variableReceive)) { ExchangeHelper.setVariableFromMessageBodyAndHeaders(exchange, variableReceive, exchange.getMessage()); exchange.getMessage().setBody(originalBody); exchange.getMessage().setHeaders(originalHeaders); diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendProcessor.java index 04840285980..0f0bde0a265 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendProcessor.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendProcessor.java @@ -179,7 +179,7 @@ public class SendProcessor extends AsyncProcessorSupport implements Traceable, E ac = doneSync -> { try { // result should be stored in variable instead of message body/headers -if (variableReceive != null) { +if (ExchangeHelper.shouldSetVariableResult(exchange,
(camel) branch var-fail created (now 87d35c17db6)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch var-fail in repository https://gitbox.apache.org/repos/asf/camel.git at 87d35c17db6 CAMEL-20607: camel-core - Using variableReceive should only set result if exchange was process succesfully This branch includes the following new commits: new 951c77f1364 CAMEL-20607: camel-core - Using variableReceive should only set result if exchange was process succesfully new c170879018b CAMEL-20607: camel-core - Using variableReceive should only set result if exchange was process succesfully new 055632ddc17 CAMEL-20607: camel-core - Using variableReceive should only set result if exchange was process succesfully new b54b3ba73fe CAMEL-20607: camel-core - Using variableReceive should only set result if exchange was process succesfully new 87d35c17db6 CAMEL-20607: camel-core - Using variableReceive should only set result if exchange was process succesfully The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) 02/05: CAMEL-20607: camel-core - Using variableReceive should only set result if exchange was process succesfully
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch var-fail in repository https://gitbox.apache.org/repos/asf/camel.git commit c170879018b2eba9c6eb88ff3692fa799fd59e9d Author: Claus Ibsen AuthorDate: Sat Mar 23 09:25:22 2024 +0100 CAMEL-20607: camel-core - Using variableReceive should only set result if exchange was process succesfully --- .../modules/ROOT/pages/camel-4x-upgrade-guide-4_6.adoc | 16 .../modules/ROOT/pages/camel-4x-upgrade-guide.adoc | 1 + 2 files changed, 17 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_6.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_6.adoc new file mode 100644 index 000..d297df9c99e --- /dev/null +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_6.adoc @@ -0,0 +1,16 @@ += Apache Camel 4.x Upgrade Guide + +This document is for helping you upgrade your Apache Camel application +from Camel 4.x to 4.y. For example, if you are upgrading Camel 4.0 to 4.2, then you should follow the guides +from both 4.0 to 4.1 and 4.1 to 4.2. + +== Upgrading Camel 4.5 to 4.6 + +=== variables + +When using `variableReceive` then the variable is only set if processing the `Exchange` was completely successfully. + +For example calling a route that fails due to an exception being thrown (even if `onException` or `errorHandler` are in use) +then the variable is no longer set. Also, if the route is marked for rollback, or to stop continue routing with `.stop()`. + +This is the same logic that the routing engine uses, whether to continue routing the `Exchange` or not. diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide.adoc index d82ec3704e4..903ec6b126e 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide.adoc @@ -14,4 +14,5 @@ You can find upgrade guide for each release in the following pages: - xref:camel-4x-upgrade-guide-4_3.adoc[Upgrade guide 4.2 -> 4.3] - xref:camel-4x-upgrade-guide-4_4.adoc[Upgrade guide 4.3 -> 4.4] - xref:camel-4x-upgrade-guide-4_5.adoc[Upgrade guide 4.4 -> 4.5] +- xref:camel-4x-upgrade-guide-4_5.adoc[Upgrade guide 4.5 -> 4.6]
(camel) 03/05: CAMEL-20607: camel-core - Using variableReceive should only set result if exchange was process succesfully
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch var-fail in repository https://gitbox.apache.org/repos/asf/camel.git commit 055632ddc171ad9fcf3f8fe9a128bbdfd9bf22c2 Author: Claus Ibsen AuthorDate: Sat Mar 23 09:57:53 2024 +0100 CAMEL-20607: camel-core - Using variableReceive should only set result if exchange was process succesfully --- .../camel/processor/ToVariableErrorTest.java | 291 + .../org/apache/camel/support/ExchangeHelper.java | 7 +- 2 files changed, 295 insertions(+), 3 deletions(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/ToVariableErrorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/ToVariableErrorTest.java new file mode 100644 index 000..f3351a2941d --- /dev/null +++ b/core/camel-core/src/test/java/org/apache/camel/processor/ToVariableErrorTest.java @@ -0,0 +1,291 @@ +/* + * 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.processor; + +import org.apache.camel.ContextTestSupport; +import org.apache.camel.Exchange; +import org.apache.camel.builder.RouteBuilder; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class ToVariableErrorTest extends ContextTestSupport { + +@Override +public boolean isUseRouteBuilder() { +return false; +} + +@Test +public void testThrowException() throws Exception { +context.addRoutes(new RouteBuilder() { +@Override +public void configure() throws Exception { +from("direct:receive") +.toV("direct:foo", null, "bye") +.to("mock:result"); + +from("direct:foo") +.transform().simple("Bye ${body}") +.throwException(new IllegalArgumentException("Forced")); +} +}); +context.start(); + +getMockEndpoint("mock:result").expectedMessageCount(0); +Exchange out = template.request("direct:receive", e -> e.getMessage().setBody("World")); +Assertions.assertTrue(out.isFailed()); +Assertions.assertFalse(out.hasVariables()); +// TODO: should this be World or Bye World? +Assertions.assertEquals("Bye World", out.getMessage().getBody()); +assertMockEndpointsSatisfied(); +} + +@Test +public void testTryCatch() throws Exception { +context.addRoutes(new RouteBuilder() { +@Override +public void configure() throws Exception { +from("direct:receive") +.toV("direct:foo", null, "bye") +.to("mock:result"); + +from("direct:foo") +.transform().simple("Bye ${body}") +.doTry() +.throwException(new IllegalArgumentException("Forced")) +.doCatch(Exception.class) +.setBody(simple("Catch: ${body}")) +.end(); +} +}); +context.start(); + +getMockEndpoint("mock:result").expectedMessageCount(1); +Exchange out = template.request("direct:receive", e -> e.getMessage().setBody("World")); +Assertions.assertFalse(out.isFailed()); +Assertions.assertTrue(out.hasVariables()); +Assertions.assertEquals("World", out.getMessage().getBody()); +Assertions.assertEquals("Catch: Bye World", out.getVariable("bye")); +assertMockEndpointsSatisfied(); +} + +@Test +public void testOnExceptionHandled() throws Exception { +context.addRoutes(new RouteBuilder() { +@Override +public void configure() throws Exception { +onException(Exception.class) +.handled(true) +.setBody(simple("Error: ${body}")); + +from("direct:receive") +.toV("direct:foo", null, "bye") +.to("mock:result"); + +from("direct:foo") +.transform().simple("Bye ${body}") +
(camel) branch jms-inout created (now 63b317e7731)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch jms-inout in repository https://gitbox.apache.org/repos/asf/camel.git at 63b317e7731 camel-jms - Using in/out should use single atomic operation with the timeout map for the correlation id. Could help with org.apache.camel.component.jms.JmsProducerConcurrentWithReplyTest.testConcurrentProducers This branch includes the following new commits: new 63b317e7731 camel-jms - Using in/out should use single atomic operation with the timeout map for the correlation id. Could help with org.apache.camel.component.jms.JmsProducerConcurrentWithReplyTest.testConcurrentProducers 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] jms inout concurrency issue [camel]
github-actions[bot] commented on PR #13598: URL: https://github.com/apache/camel/pull/13598#issuecomment-2016547691 :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
Re: [PR] jms inout concurrency issue [camel]
davsclaus commented on PR #13598: URL: https://github.com/apache/camel/pull/13598#issuecomment-2016547963 Can potentially help with https://ci-builds.apache.org/job/Camel/job/Camel%20JDK17/job/main/1713/testReport/junit/org.apache.camel.component.jms/JmsProducerConcurrentWithReplyTest/testConcurrentProducers/ -- 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 release-2.2.x updated: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.2.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.2.x by this push: new 324f006f6 chore: changelog automatic update 324f006f6 is described below commit 324f006f67ac6e2be93a5df0b1f4a2ff7143fc70 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sun Mar 24 01:05:41 2024 + chore: changelog automatic update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1906ffbd..aa74ff810 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,7 @@ - Nightly check against latest runtime failure [\#5042](https://github.com/apache/camel-k/issues/5042) - Provide a page linking to Camel DSLs [\#5037](https://github.com/apache/camel-k/issues/5037) - Nightly SBOM procedure should not run if there are no changes [\#5033](https://github.com/apache/camel-k/issues/5033) +- Polish trait conditions [\#5027](https://github.com/apache/camel-k/issues/5027) - Nightly release soft failure [\#5023](https://github.com/apache/camel-k/issues/5023) - \[Discussion\] Camel K 2024 roadmap [\#5019](https://github.com/apache/camel-k/issues/5019) - Unable to authenticate with Docker Hub API v2 [\#5017](https://github.com/apache/camel-k/issues/5017) @@ -63,6 +64,7 @@ - Pipe using simple language expressions causing failure [\#4777](https://github.com/apache/camel-k/issues/4777) - 1st Integration after Camel K runtime version update failing [\#4776](https://github.com/apache/camel-k/issues/4776) - Provide alternative publishing strategy via pipeline [\#4747](https://github.com/apache/camel-k/issues/4747) +- Provide full description for trait in CRD [\#4727](https://github.com/apache/camel-k/issues/4727) - Quarkus native checks failure [\#4723](https://github.com/apache/camel-k/issues/4723) - Build waiting condition [\#4542](https://github.com/apache/camel-k/issues/4542) - Add DataTypeRegistry as bean in Camel context [\#3845](https://github.com/apache/camel-k/issues/3845)
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-2016670865 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 8406195226-1431-af56f88b-12af-4f98-8adf-5b52eeccb1d0 * Camel Quarkus Commit: ac5b88a8c8644a69945622efefa400349a70a27c * Quarkus Main Commit: 8817f06a9914a6bc9275325d28a52aab8ec2b4d1 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/8406195226 -- 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