[GitHub] [camel-k] bouskaJ commented on pull request #2974: [TEST] Fix route test on Knative enabled clusters
bouskaJ commented on pull request #2974: URL: https://github.com/apache/camel-k/pull/2974#issuecomment-1028698999 @astefanutti can you check this one and rerun the `upgrade`? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch quarkus-main updated (a2ca762 -> 1e1ad70)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. discard a2ca762 Upgrade to Quarkus 2.8.0.CR1 add 2254061 Updated CHANGELOG.md add 3230702 fix update script add 13aa251 Updated CHANGELOG.md add 35b68bd Fix deprecation warnings and typos in csimple extension add 48af67f Upgrade formatter-maven-plugin to 2.17.1 add bb95384 Clean up usage of deprecated Quarkus APIs add 906632c Fix nitrate collection tests on slow machines add 33ba6b7 Updated CHANGELOG.md new 1e1ad70 Upgrade to Quarkus 2.8.0.CR1 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 (a2ca762) \ N -- N -- N refs/heads/quarkus-main (1e1ad70) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGELOG.md | 11 docs/pom.xml | 1 + .../core/deployment/CamelNativeImageProcessor.java | 7 +-- .../quarkus/core/deployment/CamelProcessor.java| 6 ++- .../quarkus/core/deployment/util/CamelSupport.java | 2 +- .../csimple/deployment/CSimpleProcessor.java | 29 +-- .../csimple/deployment/CSimpleXmlProcessor.java| 11 +--- .../component/hl7/deployment/Hl7Processor.java | 9 ++-- .../component/shiro/deployment/ShiroProcessor.java | 6 --- .../xchange/deployment/XchangeProcessor.java | 17 +++ .../component/nitrite/it/NitriteResource.java | 4 +- pom.xml| 4 +- poms/build-parent/pom.xml | 1 + tooling/eclipse-formatter-config.xml | 1 + tooling/scripts/update-antora-config.groovy| 8 --- tooling/scripts/update-antora-yaml.groovy | 58 -- 16 files changed, 97 insertions(+), 78 deletions(-)
[camel-quarkus] 01/01: Upgrade to Quarkus 2.8.0.CR1
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 1e1ad7027a07571e152fe50f5ecc89074cbba1ef
Author: James Netherton
AuthorDate: Thu Jan 20 07:52:37 2022 +
Upgrade to Quarkus 2.8.0.CR1
---
docs/antora.yml | 2 +-
integration-tests/http/pom.xml| 2 +-
integration-tests/vertx-websocket/pom.xml | 2 +-
pom.xml | 7 ---
poms/build-parent/pom.xml | 9 +
5 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index ce03b9d..488a8a9 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,7 +31,7 @@ asciidoc:
target-maven-version: 3.8.4 # replace ${target-maven-version}
camel-version: 3.14.1 # replace ${camel.version}
camel-docs-version: 3.14.x # replace ${camel.docs.components.version}
-quarkus-version: 2.7.0.Final # replace ${quarkus.version}
+quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
graalvm-version: 21.3.0 # replace ${graalvm.version}
graalvm-docs-version: 21.3
# attributes used in xrefs to other Antora components
diff --git a/integration-tests/http/pom.xml b/integration-tests/http/pom.xml
index 68daa40..8994b61 100644
--- a/integration-tests/http/pom.xml
+++ b/integration-tests/http/pom.xml
@@ -61,7 +61,7 @@
io.quarkus
-quarkus-undertow-websockets
+quarkus-websockets
io.quarkus
diff --git a/integration-tests/vertx-websocket/pom.xml
b/integration-tests/vertx-websocket/pom.xml
index 7947fe5..abd5e2a 100644
--- a/integration-tests/vertx-websocket/pom.xml
+++ b/integration-tests/vertx-websocket/pom.xml
@@ -39,7 +39,7 @@
io.quarkus
-quarkus-undertow-websockets
+quarkus-websockets
test
diff --git a/pom.xml b/pom.xml
index 2f3027c..0f5fb2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
1.0.0
2.3.0
1.0.3
-2.7.0.Final
+999-SNAPSHOT
2.0.0
0.32.0
@@ -65,6 +65,7 @@
1.18
3.5.2
1.11.0
+3.22.0
2.17.103
1.11.714
1.0.5
@@ -85,8 +86,8 @@
1.111
0.8.0
0.22.2
-21.3.0
-1.43.2
+22.0.0.2
+1.44.0
4.0
${hadoop3-version}
${hapi-version}
diff --git a/poms/build-parent/pom.xml b/poms/build-parent/pom.xml
index 223aaa3..b90f131 100644
--- a/poms/build-parent/pom.xml
+++ b/poms/build-parent/pom.xml
@@ -37,6 +37,15 @@
false
+
+
+
+org.assertj
+assertj-core
+${assertj.version}
+
+
+
[camel] branch regen_bot updated (a47ee24 -> 60b0f61)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from a47ee24 CAMEL-17580: CamelConfiguration to camel-api to make it generic for all Camel runtimes. add 60b0f61 CAMEL-17580: CamelConfiguration to camel-api to make it generic for all Camel runtimes. No new revisions were added by this update. Summary of changes: .../archetype-resources/src/main/java/MyConfiguration.java | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-)
[camel] 01/02: Upgrade Minio to version 8.3.6
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 196db39c083c055ca470085c58b73f55e930d0ea Author: Andrea Cosentino AuthorDate: Thu Feb 3 07:55:48 2022 +0100 Upgrade Minio to version 8.3.6 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 97d1dcf..6238900 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -403,7 +403,7 @@ 2.1.4 0.3.4 0.9.5 -8.3.4 +8.3.6 1.9 0.1.8 3.12.4
[camel] 02/02: Sync deps
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 098d81724a391f2b432cc7ba665d082cc5c12b04 Author: Andrea Cosentino AuthorDate: Thu Feb 3 08:14:32 2022 +0100 Sync deps --- camel-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index e1f1c73..705d4cc 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -417,7 +417,7 @@ 2.1.4 0.3.4 0.9.5 -8.3.4 +8.3.6 1.9 3.12.4 0.1.8
[camel] branch main updated (b5aa053 -> 098d817)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from b5aa053 CAMEL-17551 pause pulsar consumers on suspend (#6881) new 196db39 Upgrade Minio to version 8.3.6 new 098d817 Sync deps The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] branch regen_bot updated (80eaa5b -> a47ee24)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 80eaa5b [CAMEL-17589]Enable ITests of camel-infinispan on MacOSX (#6880) add a47ee24 CAMEL-17580: CamelConfiguration to camel-api to make it generic for all Camel runtimes. No new revisions were added by this update. Summary of changes: .../resources/archetype-resources/src/main/java/MyConfiguration.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
[GitHub] [camel] davsclaus commented on pull request #6872: CAMEL-17586: Throw exception in case of duplicate attachment names
davsclaus commented on pull request #6872: URL: https://github.com/apache/camel/pull/6872#issuecomment-1028664608 I think its better to add an option you can configure to select what should happen onDuplicateAttachment=warn|error Then it can be warn as default which is what is today. And you can configure it to fail to have it throw the exception -- 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
[GitHub] [camel] oscerd commented on a change in pull request #6872: CAMEL-17586: Throw exception in case of duplicate attachment names
oscerd commented on a change in pull request #6872: URL: https://github.com/apache/camel/pull/6872#discussion_r798270518 ## File path: components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java ## @@ -368,13 +368,18 @@ protected void extractAttachmentsFromMultipart(Multipart mp, Map
[GitHub] [camel] davsclaus commented on a change in pull request #6872: CAMEL-17586: Throw exception in case of duplicate attachment names
davsclaus commented on a change in pull request #6872: URL: https://github.com/apache/camel/pull/6872#discussion_r798270174 ## File path: components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java ## @@ -368,13 +368,18 @@ protected void extractAttachmentsFromMultipart(Multipart mp, Map
[camel] branch main updated: CAMEL-17551 pause pulsar consumers on suspend (#6881)
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 b5aa053 CAMEL-17551 pause pulsar consumers on suspend (#6881)
b5aa053 is described below
commit b5aa05313c6997b457fdc4c6e8375b4279161133
Author: Suzanne Becker <80281769+suzannebecker-to...@users.noreply.github.com>
AuthorDate: Thu Feb 3 01:52:01 2022 -0500
CAMEL-17551 pause pulsar consumers on suspend (#6881)
* CAMEL-17551 Make Pulsar routes suspendable by pausing consumers; tests
* fix format
* CAMEL-17551 Increase maven-failsafe-plugin process timeout for itests
* fix format
* unit test consumer pause/resume
* CAMEL-17551 remove some unnecessary interfaces
* remove extraneous test
* CAMEL-17551 set maven-failsafe test timeout at camel-pulsar level
* CAMEL-17551 Document suspended/paused consumer behavior
---
components/camel-pulsar/pom.xml| 7 +
.../camel/component/pulsar/PulsarConsumer.java | 18 +-
.../camel/component/pulsar/utils/PulsarUtils.java | 14 ++
.../pulsar/integration/PulsarSuspendRouteIT.java | 248 +
.../component/pulsar/utils/PulsarUtilsTest.java| 24 ++
5 files changed, 306 insertions(+), 5 deletions(-)
diff --git a/components/camel-pulsar/pom.xml b/components/camel-pulsar/pom.xml
index 29d7636..2d2eb39 100644
--- a/components/camel-pulsar/pom.xml
+++ b/components/camel-pulsar/pom.xml
@@ -97,6 +97,13 @@
+
+org.apache.maven.plugins
+maven-failsafe-plugin
+
+
600
+
+
diff --git
a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarConsumer.java
b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarConsumer.java
index 23d4d53..0c3ff9c 100644
---
a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarConsumer.java
+++
b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarConsumer.java
@@ -23,6 +23,7 @@ import java.util.concurrent.ExecutorService;
import java.util.stream.Collectors;
import org.apache.camel.Processor;
+import org.apache.camel.Suspendable;
import
org.apache.camel.component.pulsar.utils.consumers.ConsumerCreationStrategy;
import
org.apache.camel.component.pulsar.utils.consumers.ConsumerCreationStrategyFactory;
import org.apache.camel.support.DefaultConsumer;
@@ -32,10 +33,12 @@ import org.apache.pulsar.client.api.PulsarClientException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static
org.apache.camel.component.pulsar.utils.PulsarUtils.pauseConsumers;
+import static
org.apache.camel.component.pulsar.utils.PulsarUtils.resumeConsumers;
import static
org.apache.camel.component.pulsar.utils.PulsarUtils.stopConsumers;
import static
org.apache.camel.component.pulsar.utils.PulsarUtils.stopExecutors;
-public class PulsarConsumer extends DefaultConsumer {
+public class PulsarConsumer extends DefaultConsumer implements Suspendable {
private static final Logger LOGGER =
LoggerFactory.getLogger(PulsarConsumer.class);
private final PulsarEndpoint pulsarEndpoint;
@@ -69,15 +72,20 @@ public class PulsarConsumer extends DefaultConsumer {
pulsarConsumers = stopConsumers(pulsarConsumers);
}
+/**
+ * Pauses the Pulsar consumers.
+ *
+ * Once paused, a Pulsar consumer does not request any more messages from
the broker. However, it will still receive
+ * as many messages as it had already requested, which is equal to at most
`consumerQueueSize`.
+ */
@Override
-protected void doSuspend() throws PulsarClientException {
-executors =
stopExecutors(pulsarEndpoint.getCamelContext().getExecutorServiceManager(),
executors);
-pulsarConsumers = stopConsumers(pulsarConsumers);
+protected void doSuspend() {
+pauseConsumers(pulsarConsumers);
}
@Override
protected void doResume() throws Exception {
-doStart();
+resumeConsumers(pulsarConsumers);
}
private Collection> createConsumers(
diff --git
a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/PulsarUtils.java
b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/PulsarUtils.java
index 2bcad6c..2030d94 100644
---
a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/PulsarUtils.java
+++
b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/PulsarUtils.java
@@ -58,4 +58,18 @@ public final class PulsarUtils {
return new ConcurrentLinkedQueue<>();
}
+
+/**
+ * Pauses the Pulsar
[camel] 02/02: Sync deps
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 38e77a9f036d54d147cc817a6b79bc53ecfbbe24 Author: Andrea Cosentino AuthorDate: Thu Feb 3 07:51:14 2022 +0100 Sync deps --- camel-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index d4d57a9..e1f1c73 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -65,7 +65,7 @@ 1.11.0 1.11.0 4.1.1 -2.17.121 +2.17.122 2.6.1 1.2.14 4.20.0
[camel] 01/02: Upgrade AWS SDK v2 to version 2.17.122
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 5003914c4df4c797601f2b3cbdca9344877acd6a Author: Andrea Cosentino AuthorDate: Thu Feb 3 06:58:36 2022 +0100 Upgrade AWS SDK v2 to version 2.17.122 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9b883b5..97d1dcf 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -81,7 +81,7 @@ 1.11.0 1.11.0 4.1.1 -2.17.121 +2.17.122 2.6.1 1.2.14 2.13.1
[camel] branch main updated (60b0f61 -> 38e77a9)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from 60b0f61 CAMEL-17580: CamelConfiguration to camel-api to make it generic for all Camel runtimes. new 5003914 Upgrade AWS SDK v2 to version 2.17.122 new 38e77a9 Sync deps The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] branch regen_bot updated (24ab568 -> 80eaa5b)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 24ab568 Fix flaky test
add 80eaa5b [CAMEL-17589]Enable ITests of camel-infinispan on MacOSX
(#6880)
No new revisions were added by this update.
Summary of changes:
.../InfinispanRemoteAggregationRepositoryIT.java | 3 --
...panRemoteAggregationRepositoryOperationsIT.java | 3 --
.../remote/InfinispanRemoteConfigurationIT.java| 14 +--
.../remote/InfinispanRemoteConsumerIT.java | 3 --
.../remote/InfinispanRemoteCustomListenerIT.java | 3 --
.../InfinispanRemoteIdempotentRepositoryIT.java| 3 --
.../remote/InfinispanRemoteProducerIT.java | 3 --
.../remote/InfinispanRemoteQueryConsumerIT.java| 3 --
.../remote/InfinispanRemoteQueryProducerIT.java| 3 --
.../remote/InfinispanRemoteQueryTestSupport.java | 3 --
.../remote/InfinispanRemoteTestSupport.java| 8
.../AbstractInfinispanRemoteClusteredIT.java | 6 ---
.../InfinispanRemoteClusteredTestSupport.java | 45 --
.../cluster/InfinispanRemoteClusteredViewIT.java | 3 --
.../{client.properties => client-mac.properties} | 4 ++
15 files changed, 55 insertions(+), 52 deletions(-)
copy
components/camel-infinispan/camel-infinispan/src/test/resources/infinispan/{client.properties
=> client-mac.properties} (92%)
[GitHub] [camel] davsclaus merged pull request #6881: CAMEL-17551 pause pulsar consumers on suspend
davsclaus merged pull request #6881: URL: https://github.com/apache/camel/pull/6881 -- 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-17580: CamelConfiguration to camel-api to make it generic for all Camel runtimes.
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 60b0f61 CAMEL-17580: CamelConfiguration to camel-api to make it
generic for all Camel runtimes.
60b0f61 is described below
commit 60b0f6179f7fa4ed4e57827c5f857eab58cda3e4
Author: Claus Ibsen
AuthorDate: Thu Feb 3 07:11:59 2022 +0100
CAMEL-17580: CamelConfiguration to camel-api to make it generic for all
Camel runtimes.
---
.../archetype-resources/src/main/java/MyConfiguration.java | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git
a/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/java/MyConfiguration.java
b/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/java/MyConfiguration.java
index a604afd..2c025bf 100644
---
a/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/java/MyConfiguration.java
+++
b/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/java/MyConfiguration.java
@@ -17,14 +17,15 @@
package ${package};
import org.apache.camel.BindToRegistry;
-import org.apache.camel.CamelConfiguration;
+import org.apache.camel.Configuration;
import org.apache.camel.CamelContext;
import org.apache.camel.PropertyInject;
/**
* Class to configure the Camel application.
*/
-public class MyConfiguration implements CamelConfiguration {
+@Configuration
+public class MyConfiguration {
@BindToRegistry
public MyBean myBean(@PropertyInject("hi") String hi,
@PropertyInject("bye") String bye) {
@@ -32,9 +33,4 @@ public class MyConfiguration implements CamelConfiguration {
return new MyBean(hi, bye);
}
-@Override
-public void configure(CamelContext camelContext) throws Exception {
-// this method is optional and can be removed if no additional
configuration is needed.
-}
-
}
[camel] branch main updated: CAMEL-17580: CamelConfiguration to camel-api to make it generic for all Camel runtimes.
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 a47ee24 CAMEL-17580: CamelConfiguration to camel-api to make it
generic for all Camel runtimes.
a47ee24 is described below
commit a47ee245e2d7817ea8cc3024295019927943377e
Author: Claus Ibsen
AuthorDate: Thu Feb 3 07:10:26 2022 +0100
CAMEL-17580: CamelConfiguration to camel-api to make it generic for all
Camel runtimes.
---
.../resources/archetype-resources/src/main/java/MyConfiguration.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/java/MyConfiguration.java
b/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/java/MyConfiguration.java
index f50e3db..a604afd 100644
---
a/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/java/MyConfiguration.java
+++
b/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/java/MyConfiguration.java
@@ -17,9 +17,9 @@
package ${package};
import org.apache.camel.BindToRegistry;
+import org.apache.camel.CamelConfiguration;
import org.apache.camel.CamelContext;
import org.apache.camel.PropertyInject;
-import org.apache.camel.main.CamelConfiguration;
/**
* Class to configure the Camel application.
@@ -32,7 +32,8 @@ public class MyConfiguration implements CamelConfiguration {
return new MyBean(hi, bye);
}
-public void configure(CamelContext camelContext) {
+@Override
+public void configure(CamelContext camelContext) throws Exception {
// this method is optional and can be removed if no additional
configuration is needed.
}
[camel] branch main updated (24ab568 -> 80eaa5b)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 24ab568 Fix flaky test
add 80eaa5b [CAMEL-17589]Enable ITests of camel-infinispan on MacOSX
(#6880)
No new revisions were added by this update.
Summary of changes:
.../InfinispanRemoteAggregationRepositoryIT.java | 3 --
...panRemoteAggregationRepositoryOperationsIT.java | 3 --
.../remote/InfinispanRemoteConfigurationIT.java| 14 +--
.../remote/InfinispanRemoteConsumerIT.java | 3 --
.../remote/InfinispanRemoteCustomListenerIT.java | 3 --
.../InfinispanRemoteIdempotentRepositoryIT.java| 3 --
.../remote/InfinispanRemoteProducerIT.java | 3 --
.../remote/InfinispanRemoteQueryConsumerIT.java| 3 --
.../remote/InfinispanRemoteQueryProducerIT.java| 3 --
.../remote/InfinispanRemoteQueryTestSupport.java | 3 --
.../remote/InfinispanRemoteTestSupport.java| 8
.../AbstractInfinispanRemoteClusteredIT.java | 6 ---
.../InfinispanRemoteClusteredTestSupport.java | 45 --
.../cluster/InfinispanRemoteClusteredViewIT.java | 3 --
.../{client.properties => client-mac.properties} | 4 ++
15 files changed, 55 insertions(+), 52 deletions(-)
copy
components/camel-infinispan/camel-infinispan/src/test/resources/infinispan/{client.properties
=> client-mac.properties} (92%)
[GitHub] [camel] davsclaus merged pull request #6880: [CAMEL-17589]Enable ITests of camel-infinispan on MacOSX
davsclaus merged pull request #6880: URL: https://github.com/apache/camel/pull/6880 -- 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
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1028605843 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 1787285184-651-0a6722d8-4ebc-48b5-9d99-3a85a4efc708 * Camel Quarkus Commit: 66bbf49c8e3d040b5a827bde481904c539cdc144 * Quarkus Main Commit: 906632ccbf13fa2afbf957098fb803bdebfacbf2 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/1787285184 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] 03/03: Disable ConsulIT due to #3509
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 0ba5c9a6ce4a408e667542c1116aa47a9991a673
Author: James Netherton
AuthorDate: Tue Feb 1 08:17:51 2022 +
Disable ConsulIT due to #3509
---
.../java/org/apache/camel/quarkus/component/consul/it/ConsulIT.java | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/integration-tests/consul/src/test/java/org/apache/camel/quarkus/component/consul/it/ConsulIT.java
b/integration-tests/consul/src/test/java/org/apache/camel/quarkus/component/consul/it/ConsulIT.java
index 38208f2..78ec13f 100644
---
a/integration-tests/consul/src/test/java/org/apache/camel/quarkus/component/consul/it/ConsulIT.java
+++
b/integration-tests/consul/src/test/java/org/apache/camel/quarkus/component/consul/it/ConsulIT.java
@@ -17,7 +17,9 @@
package org.apache.camel.quarkus.component.consul.it;
import io.quarkus.test.junit.NativeImageTest;
+import org.junit.jupiter.api.Disabled;
@NativeImageTest
+@Disabled("https://github.com/apache/camel-quarkus/issues/3509;)
class ConsulIT extends ConsulTest {
}
[camel-quarkus] 02/03: deadLetterChannel does not work in BaseRouteBuilder configure method #3436
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 2cb239f132c7ffa1d951e3d1dbe5ff8122ac52e8
Author: JiriOndrusek
AuthorDate: Mon Jan 10 13:26:13 2022 +0100
deadLetterChannel does not work in BaseRouteBuilder configure method #3436
---
.../it/Aws2SqsQuarkusClientTestEnvCustomizer.java | 3 ++
.../component/aws2/sqs/it/DeadLetterBuilder.java | 41 ++
.../quarkus/component/aws2/sqs/it/Aws2SqsTest.java | 20 +++
.../aws2/sqs/it/Aws2SqsTestEnvCustomizer.java | 23 +++-
4 files changed, 86 insertions(+), 1 deletion(-)
diff --git
a/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsQuarkusClientTestEnvCustomizer.java
b/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsQuarkusClientTestEnvCustomizer.java
index 361459f..64e290d 100644
---
a/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsQuarkusClientTestEnvCustomizer.java
+++
b/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsQuarkusClientTestEnvCustomizer.java
@@ -34,6 +34,9 @@ public class Aws2SqsQuarkusClientTestEnvCustomizer extends
Aws2SqsTestEnvCustomi
super.customize(envContext);
+//remove camel properties for client creation to ensure that client is
not created by camel component
+envContext.removeClient(localstackServices());
+
Map envContextProperties = envContext.getProperies();
envContext.property("quarkus.sqs.aws.credentials.static-provider.access-key-id",
envContext.getAccessKey());
diff --git
a/integration-test-groups/aws2/aws2-sqs/src/main/java/org/apache/camel/quarkus/component/aws2/sqs/it/DeadLetterBuilder.java
b/integration-test-groups/aws2/aws2-sqs/src/main/java/org/apache/camel/quarkus/component/aws2/sqs/it/DeadLetterBuilder.java
new file mode 100644
index 000..6d611ef
--- /dev/null
+++
b/integration-test-groups/aws2/aws2-sqs/src/main/java/org/apache/camel/quarkus/component/aws2/sqs/it/DeadLetterBuilder.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.component.aws2.sqs.it;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.eclipse.microprofile.config.ConfigProvider;
+
+@ApplicationScoped
+public class DeadLetterBuilder extends RouteBuilder {
+
+@Override
+public void configure() {
+String name =
ConfigProvider.getConfig().getValue("aws-sqs.failing-name", String.class);
+String deadLetterName =
ConfigProvider.getConfig().getValue("aws-sqs.deadletter-name", String.class);
+errorHandler(deadLetterChannel("aws2-sqs://" + deadLetterName)
+.log("Error processing message and sending to the Dead Letter
Queue: Body: " + body())
+.useOriginalMessage());
+
+from("aws2-sqs://" + name)
+.process(e -> {
+throw new IllegalArgumentException();
+});
+
+}
+}
diff --git
a/integration-test-groups/aws2/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsTest.java
b/integration-test-groups/aws2/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsTest.java
index b0a928b..87d924e 100644
---
a/integration-test-groups/aws2/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsTest.java
+++
b/integration-test-groups/aws2/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsTest.java
@@ -55,6 +55,14 @@ class Aws2SqsTest {
return ConfigProvider.getConfig().getValue("aws-sqs.queue-name",
String.class);
}
+private String getPredefinedFailingQueueName() {
+return ConfigProvider.getConfig().getValue("aws-sqs.failing-name",
String.class);
+}
+
+private String getPredefinedDeadletterQueueName() {
+
[camel-quarkus] branch camel-main updated (6c5498e -> 0ba5c9a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. discard 6c5498e Disable ConsulIT due to #3509 discard 69c4d3a deadLetterChannel does not work in BaseRouteBuilder configure method #3436 discard 4cdd0be Upgrade to Camel 3.15.0 add 3230702 fix update script add 13aa251 Updated CHANGELOG.md add 35b68bd Fix deprecation warnings and typos in csimple extension add 48af67f Upgrade formatter-maven-plugin to 2.17.1 add bb95384 Clean up usage of deprecated Quarkus APIs add 906632c Fix nitrate collection tests on slow machines new d616aa1 Upgrade to Camel 3.15.0 new 2cb239f deadLetterChannel does not work in BaseRouteBuilder configure method #3436 new 0ba5c9a Disable ConsulIT due to #3509 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 (6c5498e) \ N -- N -- N refs/heads/camel-main (0ba5c9a) 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 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGELOG.md | 2 + docs/pom.xml | 1 + .../core/deployment/CamelNativeImageProcessor.java | 7 +-- .../quarkus/core/deployment/CamelProcessor.java| 6 ++- .../quarkus/core/deployment/util/CamelSupport.java | 2 +- .../csimple/deployment/CSimpleProcessor.java | 29 +-- .../csimple/deployment/CSimpleXmlProcessor.java| 11 +--- .../component/hl7/deployment/Hl7Processor.java | 9 ++-- .../component/shiro/deployment/ShiroProcessor.java | 6 --- .../xchange/deployment/XchangeProcessor.java | 17 +++ .../component/nitrite/it/NitriteResource.java | 4 +- pom.xml| 2 +- poms/build-parent/pom.xml | 1 + tooling/eclipse-formatter-config.xml | 1 + tooling/scripts/update-antora-config.groovy| 8 --- tooling/scripts/update-antora-yaml.groovy | 58 -- 16 files changed, 87 insertions(+), 77 deletions(-)
[GitHub] [camel-quarkus] github-actions[bot] closed issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] closed issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927 -- 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
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1028600394 Build fixed with: * Camel Quarkus Commit: 0ba5c9a6ce4a408e667542c1116aa47a9991a673 * Camel Main Commit: 906632ccbf13fa2afbf957098fb803bdebfacbf2 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/1786875671 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 33ba6b7 Updated CHANGELOG.md 33ba6b7 is described below commit 33ba6b7cfb37f4c6c7525654dc2beae60a1e5872 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Feb 3 03:10:29 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 4 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86921e6..e5fa93a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ **Merged pull requests:** +- Fix nitrate collection tests on slow machines [\#3515](https://github.com/apache/camel-quarkus/pull/3515) ([jamesnetherton](https://github.com/jamesnetherton)) +- Clean up usage of deprecated Quarkus APIs [\#3513](https://github.com/apache/camel-quarkus/pull/3513) ([jamesnetherton](https://github.com/jamesnetherton)) +- Upgrade formatter-maven-plugin to 2.17.1 [\#3512](https://github.com/apache/camel-quarkus/pull/3512) ([jamesnetherton](https://github.com/jamesnetherton)) +- Fix deprecation warnings and typos in csimple extension [\#3510](https://github.com/apache/camel-quarkus/pull/3510) ([jamesnetherton](https://github.com/jamesnetherton)) - fix update script [\#3508](https://github.com/apache/camel-quarkus/pull/3508) ([djencks](https://github.com/djencks)) - Fix \#3496 Ban javax.servlet:javax.servlet-api in favor of jakarta.ser… [\#3506](https://github.com/apache/camel-quarkus/pull/3506) ([zhfeng](https://github.com/zhfeng)) - Next is 2.8.0 [\#3502](https://github.com/apache/camel-quarkus/pull/3502) ([jamesnetherton](https://github.com/jamesnetherton))
[camel-k] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 4966e99 Updated CHANGELOG.md 4966e99 is described below commit 4966e9902b161077809b4283f9da84b8b0e0d94a Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Feb 3 03:09:58 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e26b76f..1cf0da2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ **Merged pull requests:** +- fix\(e2e\): Decode OpenShift ProjectRequest into a Project struct [\#2971](https://github.com/apache/camel-k/pull/2971) ([astefanutti](https://github.com/astefanutti)) - chore: Upgrade sub-modules to Kubernetes API v0.22.5 [\#2968](https://github.com/apache/camel-k/pull/2968) ([astefanutti](https://github.com/astefanutti)) - fix\(cli\): Kamel CLI zero-code exists when trait properties validation fails [\#2964](https://github.com/apache/camel-k/pull/2964) ([astefanutti](https://github.com/astefanutti)) - Generate crd API docs as AsciiDoc \(main\) \(Update\) [\#2963](https://github.com/apache/camel-k/pull/2963) ([djencks](https://github.com/djencks))
[camel-kafka-connector] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git The following commit(s) were added to refs/heads/main by this push: new 0180bc9 Updated CHANGELOG.md 0180bc9 is described below commit 0180bc9b847b8956687dba5b6b82b3af1e3773d1 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Feb 3 03:04:22 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b052b9..e272d17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - UNAUTHENTICATED: Credentials require channel with PRIVACY\_AND\_INTEGRITY security level. Observed security level: NONE [\#1337](https://github.com/apache/camel-kafka-connector/issues/1337) - Use SNS Aws2 connector with AWS Default Credential Provider [\#1335](https://github.com/apache/camel-kafka-connector/issues/1335) - `camel-kafka-connector-catalog` version 1.0.0 is missing `descriptor/` direcotry [\#1333](https://github.com/apache/camel-kafka-connector/issues/1333) +- UNAUTHENTICATED: Credentials require channel with PRIVACY\_AND\_INTEGRITY security level. Observed security level: NONE [\#1330](https://github.com/apache/camel-kafka-connector/issues/1330) - Connectors Webpage Links to Older Version [\#1326](https://github.com/apache/camel-kafka-connector/issues/1326) - Do Camel Kafka Connectors support "Dead Letter Queue" and "Connect Reporter" features of Kafka Connect? [\#1323](https://github.com/apache/camel-kafka-connector/issues/1323) - Pubsub kafka connector error: java.net.UnknownHostException: pubsub.googleapis.com: Name or service not known [\#1319](https://github.com/apache/camel-kafka-connector/issues/1319)
[GitHub] [camel] suzannebecker-toast opened a new pull request #6881: Camel 17551 pause pulsar consumers on suspend
suzannebecker-toast opened a new pull request #6881: URL: https://github.com/apache/camel/pull/6881 **What/How** Support suspension on routes that consume from Pulsar endpoints by [pausing](https://pulsar.apache.org/api/client/org/apache/pulsar/client/api/Consumer.html#pause--)/resuming the route's Pulsar consumer(s) when the route is suspended or resumed. Paused consumers stop* requesting messages from the broker (*after exhausting their receiver queue), but are still able to communicate with the broker, for example to ack messages already received. **Why** Previously, suspending a Pulsar route was the same as stopping it. When a route was suspended or stopped, all its Pulsar consumers would be closed immediately. As a result, in-flight exchanges on that route could not complete, because the Pulsar consumers could not ack messages when in a closed state. -- Also increase `maven-failsafe-plugin`'s test process timeout (`forkedProcessTimeoutInSeconds`) to 600s from 300s to allow enough time for camel-pulsar integration tests to complete. Current build duration: ~6 minutes - [x] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [x] Each commit in the pull request should have a meaningful subject line and body. - [x] If you're unsure, you can format the pull request title like `[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` with the appropriate JIRA issue. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Run `mvn clean install -Psourcecheck` in your module with source check enabled to make sure basic checks pass and there are no checkstyle violations. A more thorough check will be performed on your pull request automatically. Below are the contribution guidelines: https://github.com/apache/camel/blob/main/CONTRIBUTING.md -- 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
[GitHub] [camel-karavan] mgubaidullin merged pull request #170: Delete confirmation
mgubaidullin merged pull request #170: URL: https://github.com/apache/camel-karavan/pull/170 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karavan] branch main updated: Delete confirmation (#170)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 93360d1 Delete confirmation (#170)
93360d1 is described below
commit 93360d1479e3dab14a699f76e0f04cf012dbd1ab
Author: Marat Gubaidullin
AuthorDate: Wed Feb 2 17:34:43 2022 -0500
Delete confirmation (#170)
---
karavan-designer/src/designer/KaravanDesigner.tsx | 84 ---
karavan-designer/src/designer/karavan.css | 4 ++
karavan-designer/src/index.css| 2 +-
karavan-vscode/webview/index.css | 14
4 files changed, 77 insertions(+), 27 deletions(-)
diff --git a/karavan-designer/src/designer/KaravanDesigner.tsx
b/karavan-designer/src/designer/KaravanDesigner.tsx
index 0b2d0fc..60ce721 100644
--- a/karavan-designer/src/designer/KaravanDesigner.tsx
+++ b/karavan-designer/src/designer/KaravanDesigner.tsx
@@ -16,7 +16,7 @@
*/
import React from 'react';
import {
-Button, Gallery, Modal,
+Button, Gallery, Modal, ModalVariant,
PageSection, Tab, Tabs, TabTitleText,
} from '@patternfly/react-core';
import './karavan.css';
@@ -47,6 +47,7 @@ interface State {
integration: Integration
selectedStep?: CamelElement
showSelector: boolean
+showDeleteConfirmation: boolean
parentId: string
parentDsl?: string
showSteps: boolean
@@ -64,6 +65,7 @@ export class KaravanDesigner extends React.Component {
? CamelDefinitionYaml.yamlToIntegration(this.props.filename,
this.props.yaml)
: Integration.createNew(this.props.filename),
showSelector: false,
+showDeleteConfirmation: false,
parentId: '',
showSteps: true,
selectedUuid: '',
@@ -81,7 +83,7 @@ export class KaravanDesigner extends React.Component {
window.removeEventListener('resize', this.handleResize);
}
-handleResize = ()=>{
+handleResize = () => {
this.setState({key: Math.random().toString()});
}
@@ -109,18 +111,24 @@ export class KaravanDesigner extends
React.Component {
this.setState({integration: i, key: Math.random().toString()});
}
-deleteElement = (id: string) => {
+showDeleteConfirmation = (id: string) => {
+this.setState({selectedUuid:id, showSelector: false,
showDeleteConfirmation: true});
+}
+
+deleteElement = () => {
+const id = this.state.selectedUuid;
const i =
CamelDefinitionApiExt.deleteStepFromIntegration(this.state.integration, id);
this.setState({
integration: i,
showSelector: false,
+showDeleteConfirmation: false,
key: Math.random().toString(),
selectedStep: undefined,
selectedUuid: ''
});
const el = new CamelElement("");
el.uuid = id;
-EventBus.sendPosition("delete", el,undefined, new DOMRect(), new
DOMRect(), 0);
+EventBus.sendPosition("delete", el, undefined, new DOMRect(), new
DOMRect(), 0);
}
selectElement = (element: CamelElement) => {
@@ -142,7 +150,7 @@ export class KaravanDesigner extends React.Component {
this.addStep(from, parentId)
break;
case 'ToDefinition' :
-const to = CamelDefinitionApi.createStep(dsl.dsl, {uri:
dsl.uri});
+const to = CamelDefinitionApi.createStep(dsl.dsl, {uri:
dsl.uri});
this.addStep(to, parentId)
break;
case 'ToDynamicDefinition' :
@@ -150,7 +158,7 @@ export class KaravanDesigner extends React.Component {
this.addStep(toD, parentId)
break;
case 'KameletDefinition' :
-const kamelet = CamelDefinitionApi.createStep(dsl.dsl,{name:
dsl.name});
+const kamelet = CamelDefinitionApi.createStep(dsl.dsl, {name:
dsl.name});
this.addStep(kamelet, parentId)
break;
default:
@@ -189,25 +197,61 @@ export class KaravanDesigner extends
React.Component {
});
}
-onResizePage(el: HTMLDivElement | null){
+onResizePage(el: HTMLDivElement | null) {
const rect = el?.getBoundingClientRect();
-if (el && rect && (rect?.width !== this.state.width || rect.height !==
this.state.height || rect.top !== this.state.top)){
+if (el && rect && (rect?.width !== this.state.width || rect.height !==
this.state.height || rect.top !== this.state.top)) {
this.setState({width: rect.width, height: rect.height, top:
rect.top});
}
}
+getSelectorModal() {
+return (
+ this.closeDslSelector()}
+actions={{}}>
+
+)
+}
+
+getDeleteConfirmation() {
+return (
[GitHub] [camel] ffang opened a new pull request #6880: [CAMEL-17589]Enable ITests of camel-infinispan on MacOSX
ffang opened a new pull request #6880: URL: https://github.com/apache/camel/pull/6880 -- 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
[GitHub] [camel-quarkus] mayeqc commented on issue #819: Saga native support
mayeqc commented on issue #819: URL: https://github.com/apache/camel-quarkus/issues/819#issuecomment-1028371938 When using LRA on Camel Quarkus, when the saga is about to end, an error occurs when communicating with the participant. An embedded coordinator is used. Does anyone know why this can happen? This is the error 022-02-02 16:24:35,702 INFO [io.nar.lra] (Periodic Recovery) LRARecord.doEnd put http://localhost:8080/lra-participant/complete?Camel-Saga-Compensate=direct://refundCredit failed 2022-02-02 16:24:35,708 INFO [io.nar.lra] (Periodic Recovery) LRARecord.doEnd put http://localhost:8080/lra-participant/complete?Camel-Saga-Compensate=direct://cancelOrder=direct://complete failed 2022-02-02 16:24:35,712 INFO [io.nar.lra] (Periodic Recovery) LRARecord.doEnd put http://localhost:8080/lra-participant/complete failed 2022-02-02 16:24:35,738 INFO [io.nar.lra] (Periodic Recovery) RecoveringLRA.replayPhase2 for http://localhost:8080/lra-coordinator/0_ac1a8001_e0af_61faf689_2 ended with status: Closing -- 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
[GitHub] [camel-quarkus] ppalaga opened a new pull request #3518: Prevent various plugins from resolving commons-logging:commons-logging
ppalaga opened a new pull request #3518: URL: https://github.com/apache/camel-quarkus/pull/3518 Fix #3517 -- 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
[GitHub] [camel-karavan] mgubaidullin merged pull request #169: Prepare for preview 0.0.10
mgubaidullin merged pull request #169: URL: https://github.com/apache/camel-karavan/pull/169 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karavan] branch main updated: Prepare for preview 0.0.10 (#169)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new f828c37 Prepare for preview 0.0.10 (#169)
f828c37 is described below
commit f828c3722a51adca9461c17bd728bd409d6d1208
Author: Marat Gubaidullin
AuthorDate: Wed Feb 2 14:50:44 2022 -0500
Prepare for preview 0.0.10 (#169)
---
README.md | 14 +--
karavan-designer/src/App.tsx | 2 +-
karavan-designer/src/designer/DslProperties.tsx| 2 +-
.../src/designer/field/DataFormatField.tsx | 3 +-
karavan-designer/src/designer/karavan.css | 19 +
karavan-vscode/CHANGELOG.md| 6 +++
karavan-vscode/README.md | 44 ++---
karavan-vscode/screenshots/karavan-vscode.png | Bin 471981 -> 319708 bytes
karavan-vscode/screenshots/run.png | Bin 0 -> 5893 bytes
karavan-vscode/webview/index.css | 9 ++---
screenshots/karavan-vscode.png | Bin 234850 -> 319708 bytes
screenshots/karavan.png| Bin 464789 -> 401512 bytes
12 files changed, 63 insertions(+), 36 deletions(-)
diff --git a/README.md b/README.md
index 615d4cd..49e9186 100644
--- a/README.md
+++ b/README.md
@@ -9,13 +9,21 @@
# Apache Camel Karavan
Karavan, an Integration Designer for Apache Camel makes integration easy and
fun through visualization of integration pipeline.
-### VS Code extension
+## Features
+
+* Read/Write Integration CRD (*.yaml with kind:Integration) and plain yaml
routes
+* Kamelets source/sink/action
+* Enterprise Integration Patterns DSL
+* Components consumer/producer
+* Integration with [JBang](https://www.jbang.dev)
+
+## VS Code extension
Install Karavan VS Code extension from the
[Marketplace](https://marketplace.visualstudio.com/items?itemName=camel-karavan.karavan)
-### Standalone application
+## Standalone application
Install Karavan Standalone command line: `docker pull
ghcr.io/apache/camel-karavan:latest`
@@ -64,7 +72,7 @@ You can run your application in dev mode that enables live
coding using:
- Backend
```shell script
cd karavan-app
-mvn compile quarkus:dev
+mvn quarkus:dev
```
- Frontend
```shell script
diff --git a/karavan-designer/src/App.tsx b/karavan-designer/src/App.tsx
index bd74361..a659d91 100644
--- a/karavan-designer/src/App.tsx
+++ b/karavan-designer/src/App.tsx
@@ -139,7 +139,7 @@ class App extends React.Component {
this.save(filename, yaml)}
borderColor="#fb8824"
- borderColorSelected="black"
+ borderColorSelected="#303284"
dark={document.body.className.includes('vscode-dark')}
/>
diff --git a/karavan-designer/src/designer/DslProperties.tsx
b/karavan-designer/src/designer/DslProperties.tsx
index 53a65b5..e67305a 100644
--- a/karavan-designer/src/designer/DslProperties.tsx
+++ b/karavan-designer/src/designer/DslProperties.tsx
@@ -157,7 +157,7 @@ export class DslProperties extends React.Component {
event.preventDefault()}>
{this.state.step === undefined &&
this.getIntegrationHeader()}
{this.state.step && this.getComponentHeader()}
-{this.state.step && this.getProps().map((property:
PropertyMeta) =>
+{this.state.step && !['MarshalDefinition',
'UnmarshalDefinition'].includes(this.state.step.dslName) &&
this.getProps().map((property: PropertyMeta) =>
{
const s = ;
selectOptions.push(s);
})
+console.log(properties)
return (
@@ -117,7 +118,7 @@ export class DataFormatField extends React.Component {
{selectOptions}
-
+
diff --git a/karavan-designer/src/designer/karavan.css
b/karavan-designer/src/designer/karavan.css
index 3ebe2ea..410f883 100644
--- a/karavan-designer/src/designer/karavan.css
+++ b/karavan-designer/src/designer/karavan.css
@@ -327,15 +327,8 @@
.karavan .dsl-page .properties .parameters {
padding-top: 6px;
padding-left: 16px;
-grid-row-gap: 10px;
row-gap: 6px;
display: grid;
-border-width: var(--pf-global--BorderWidth--sm);
-border-top-color: transparent;
-border-right-color: transparent;
-border-bottom-color: var(--pf-global--BorderColor--200);
-border-left-color: var(--pf-global--BorderColor--300);
-border-style: solid;
}
.karavan .dsl-page .properties .expression
[camel] branch regen_bot updated (a5bdbf0 -> 24ab568)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from a5bdbf0 CAMEL-17580: CamelConfiguration to camel-api to make it generic for all Camel runtimes. add b3da2f2 CAMEL-17588: Reactive executor should clean thread local on shutdown. add 24ab568 Fix flaky test No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java | 6 ++ .../test/java/org/apache/camel/support/DefaultTimeoutMapTest.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)
[camel] branch regen_bot_3.14.x updated (f7caf8d -> f2feeee)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git. from f7caf8d CAMEL-17579: Add the missing config needed for SpringTransformerRouteTest add 001697f CAMEL-17543 - Camel Azure Eventhubs: Support adding properties to the Event mapped from Camel Header add f2f CAMEL-17588: Reactive executor should clean thread local on shutdown. No new revisions were added by this update. Summary of changes: .../component/azure/eventhubs/EventHubsConstants.java | 1 + .../component/azure/eventhubs/EventHubsConsumer.java | 1 + .../operations/EventHubsProducerOperations.java | 19 +-- .../camel/impl/engine/DefaultReactiveExecutor.java| 6 ++ 4 files changed, 21 insertions(+), 6 deletions(-)
[camel-website] branch asf-site updated (7e6f57e -> c52e9f7)
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.git.
discard 7e6f57e Website updated to ce8d5debf73574f402ea93a3e63f068eaeb1a9f3
discard 72268f5 Website updated to 325e929157412b27394080f4d4dba3d821476ddf
new ee8137d Website updated to 325e929157412b27394080f4d4dba3d821476ddf
new c52e9f7 Website updated to 3a6359bc4ebddc5683ef9508919f8798cfa55aaf
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 (7e6f57e)
\
N -- N -- N refs/heads/asf-site (c52e9f7)
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 | 30 +-
blog/2022/01/RELEASE-3.14.1/index.html |2 +-
.../camel-featured.jpeg| Bin
...c68bd9be1_625206_800x0_resize_q95_gaussian.jpeg | Bin
.../2022/02/camel-quarkus-release-2.7.0/index.html |1 +
blog/index.html|2 +-
blog/index.xml | 11 +-
blog/page/10/index.html|2 +-
blog/page/11/index.html|2 +-
blog/page/12/index.html|2 +-
blog/page/13/index.html|2 +-
blog/page/14/index.html|2 +-
blog/page/15/index.html|2 +-
blog/page/16/index.html|2 +-
blog/page/17/index.html|2 +-
blog/page/18/index.html|2 +-
blog/page/19/index.html|2 +-
blog/page/2/index.html |2 +-
blog/page/20/index.html|2 +-
blog/page/21/index.html|2 +-
blog/page/22/index.html|2 +-
blog/page/23/index.html|2 +-
blog/page/24/index.html|2 +-
blog/page/25/index.html|2 +-
blog/page/26/index.html|2 +-
blog/page/27/index.html|2 +-
blog/page/28/index.html|2 +-
blog/page/29/index.html|2 +-
blog/page/3/index.html |2 +-
blog/page/30/index.html|2 +-
blog/page/31/index.html|2 +-
blog/page/32/index.html|2 +-
blog/page/33/index.html|2 +-
blog/page/34/index.html|2 +-
blog/page/35/index.html|2 +-
blog/page/36/index.html|2 +-
blog/page/37/index.html|2 +-
blog/page/38/index.html|2 +-
blog/page/39/index.html|2 +-
blog/page/4/index.html |2 +-
blog/page/40/index.html|2 +-
blog/page/41/index.html|2 +-
blog/page/42/index.html|2 +-
blog/page/43/index.html|2 +-
blog/page/44/index.html|2 +-
blog/page/45/index.html|2 +-
blog/page/46/index.html|2 +-
blog/page/47/index.html|2 +-
blog/page/48/index.html|2 +-
blog/page/49/index.html|2 +-
blog/page/5/index.html |2 +-
blog/page/50/index.html|2 +-
blog/page/51/index.html|2 +-
blog/page/52/index.html|2 +-
blog/page/53/index.html|2 +-
blog/page/{35 => 54}/index.html|2 +-
blog/page/6/index.html |2 +-
[camel] branch camel-3.11.x updated: CAMEL-17588: Reactive executor should clean thread local on shutdown.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.11.x by this push:
new b6672bc CAMEL-17588: Reactive executor should clean thread local on
shutdown.
b6672bc is described below
commit b6672bc3df87df4a38d49a3a59547585dbcd8ada
Author: Claus Ibsen
AuthorDate: Wed Feb 2 18:57:18 2022 +0100
CAMEL-17588: Reactive executor should clean thread local on shutdown.
---
.../java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java | 6 ++
1 file changed, 6 insertions(+)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
index 343254d..cc95470 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
@@ -114,6 +114,12 @@ public class DefaultReactiveExecutor extends
ServiceSupport implements ReactiveE
}
}
+@Override
+protected void doShutdown() throws Exception {
+// cleanup workers
+workers.remove();
+}
+
private static class Worker {
private final int number;
[camel] branch camel-3.14.x updated: CAMEL-17588: Reactive executor should clean thread local on shutdown.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.14.x by this push:
new f2f CAMEL-17588: Reactive executor should clean thread local on
shutdown.
f2f is described below
commit f2fda98c45d53a02b746a07447eb93fd1a15
Author: Claus Ibsen
AuthorDate: Wed Feb 2 18:57:18 2022 +0100
CAMEL-17588: Reactive executor should clean thread local on shutdown.
---
.../java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java | 6 ++
1 file changed, 6 insertions(+)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
index 6ac6e2f..b9ef7e3 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
@@ -122,6 +122,12 @@ public class DefaultReactiveExecutor extends
ServiceSupport implements ReactiveE
}
}
+@Override
+protected void doShutdown() throws Exception {
+// cleanup workers
+workers.remove();
+}
+
private static class Worker {
private final int number;
[camel] 02/02: Fix flaky test
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 24ab5689f0a82ea5e1ff0b208b5b21a235bc2ac0
Author: Claus Ibsen
AuthorDate: Wed Feb 2 18:57:44 2022 +0100
Fix flaky test
---
.../src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java
index dfd53ea..d152f71 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java
@@ -148,7 +148,7 @@ public class DefaultTimeoutMapTest {
// is not expired
map.put("F", 6, 800);
-await().atMost(Duration.ofSeconds(1))
+await().atMost(Duration.ofSeconds(2))
.untilAsserted(() -> assertEquals("D", keys.get(0)));
assertEquals(4, values.get(0).intValue());
[camel] 01/02: CAMEL-17588: Reactive executor should clean thread local on shutdown.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b3da2f2425b36b79eb753dcacf3b3e89a8703a9e
Author: Claus Ibsen
AuthorDate: Wed Feb 2 18:57:18 2022 +0100
CAMEL-17588: Reactive executor should clean thread local on shutdown.
---
.../java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java | 6 ++
1 file changed, 6 insertions(+)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
index 6ac6e2f..b9ef7e3 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
@@ -122,6 +122,12 @@ public class DefaultReactiveExecutor extends
ServiceSupport implements ReactiveE
}
}
+@Override
+protected void doShutdown() throws Exception {
+// cleanup workers
+workers.remove();
+}
+
private static class Worker {
private final int number;
[camel] branch main updated (a5bdbf0 -> 24ab568)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from a5bdbf0 CAMEL-17580: CamelConfiguration to camel-api to make it generic for all Camel runtimes. new b3da2f2 CAMEL-17588: Reactive executor should clean thread local on shutdown. new 24ab568 Fix flaky test 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: .../java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java | 6 ++ .../test/java/org/apache/camel/support/DefaultTimeoutMapTest.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)
[GitHub] [camel-kafka-connector] oscerd commented on issue #1324: KC with Event Hubs Sink 1.0.0
oscerd commented on issue #1324: URL: https://github.com/apache/camel-kafka-connector/issues/1324#issuecomment-1028193171 The component has been fixed by the way. -- 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
[GitHub] [camel-kafka-connector] valdar commented on issue #1324: KC with Event Hubs Sink 1.0.0
valdar commented on issue #1324:
URL:
https://github.com/apache/camel-kafka-connector/issues/1324#issuecomment-1028191387
> Here is an example of a message + headers, formatted with kcat:
>
> ```
> Key (-1 bytes):
> Value (141 bytes):
{"CorrelationId":"a529A3D7-e15f-3d21e-315t6r5-e54csda23dbadQwfh3a1","Message":"Example","Timestamp":"2022-01-22T17:19:43.459939+00:00"}
> Headers:
> Digest=U0hBLTUxMi8yNTY9dTkAocasnkjzvASOfuqnfsoiuds87101jsmNiTGQ2YUdFWT0=,
>
Signature-Input=bW9uZXNNcaiuhasfhASIUWqosidfachsuczkjxvnduaW5nLWtleS0xIg==,
>
Signature=bW9uZAkjanscavbchjzxbchbauysfwqoaicocxjaoDRvRFFyeXhURDJJklghyu6==
> ```
@Doug-North @johnnyreilly so if the above is an example of message sent to
the sink connector those headers should be called: `CamelHeader.Digest`,
`CamelHeader.Signature-Input` and `CamelHeader.Signature`.
Would be nice if you could try with those names and see what happens.
--
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
[GitHub] [camel-website] davsclaus merged pull request #771: Announce Camel Quarkus 2.7.0
davsclaus merged pull request #771: URL: https://github.com/apache/camel-website/pull/771 -- 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-website] branch main updated: Announce Camel Quarkus 2.7.0 (#771)
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 3a6359b Announce Camel Quarkus 2.7.0 (#771) 3a6359b is described below commit 3a6359bc4ebddc5683ef9508919f8798cfa55aaf Author: James Netherton AuthorDate: Wed Feb 2 17:30:04 2022 + Announce Camel Quarkus 2.7.0 (#771) --- .../camel-featured.jpeg| Bin 0 -> 625206 bytes .../2022/02/camel-quarkus-release-2.7.0/index.md | 36 + content/releases/q/release-2.7.0.md| 12 +++ 3 files changed, 48 insertions(+) diff --git a/content/blog/2022/02/camel-quarkus-release-2.7.0/camel-featured.jpeg b/content/blog/2022/02/camel-quarkus-release-2.7.0/camel-featured.jpeg new file mode 100644 index 000..36c23a0 Binary files /dev/null and b/content/blog/2022/02/camel-quarkus-release-2.7.0/camel-featured.jpeg differ diff --git a/content/blog/2022/02/camel-quarkus-release-2.7.0/index.md b/content/blog/2022/02/camel-quarkus-release-2.7.0/index.md new file mode 100644 index 000..3a9aebb --- /dev/null +++ b/content/blog/2022/02/camel-quarkus-release-2.7.0/index.md @@ -0,0 +1,36 @@ +--- +title: "Camel Quarkus 2.7.0 Released" +date: 2022-02-02 +authors: ["jamesnetherton"] +categories: ["Releases", "Camel Quarkus"] +preview: "Camel Quarkus 2.7.0 Released" +summary: "Camel Quarkus 2.7.0 brings Quarkus 2.7.0.Final, Camel 3.14.1" +--- + +Image by https://www.flickr.com/photos/lanzen/5984113332;>Anders Lanzen https://creativecommons.org/licenses/by-nc-sa/2.0;>CC BY-NC-SA 2.0 + +We are pleased to announce the 2.7.0 release of Camel Quarkus. +It brings Camel 3.14.1 and Quarkus 2.7.0.Final. +Many thanks to all contributors and issue reporters! + +## Camel 3.14.1 + +Please follow the [Camel 3.14.1 announcement](/blog/2022/01/RELEASE-3.14.1/) and the [Camel 3.14 What's new](/blog/2021/12/camel314-whatsnew/) post for more details about the 3.14 release. + +## Quarkus 2.7.0.Final + +Please refer to [Quarkus 2.7.0.Final announcement](https://quarkus.io/blog/quarkus-2-7-0-final-released/) for more details. + +## Release notes + +Fixed issues: + +* [Milestone 2.7.0](https://github.com/apache/camel-quarkus/milestone/23?closed=1) + +All commits: + +* [2.6.0..2.7.0](https://github.com/apache/camel-quarkus/compare/2.6.0...2.7.0) + +Upgrading from Camel Quarkus 2.6.0: + +Some deprecated extensions and features were removed in the 2.7.0 release. For further details see the [migration guide](/camel-quarkus/2.7.x/migration-guide/2.7.0.html). diff --git a/content/releases/q/release-2.7.0.md b/content/releases/q/release-2.7.0.md new file mode 100644 index 000..4189f14 --- /dev/null +++ b/content/releases/q/release-2.7.0.md @@ -0,0 +1,12 @@ +--- +url: "/releases/q-2.7.0/" +date: 2022-02-02T10:00:00+01:00 +type: release-note +version: "2.7.0" +title: "Camel Quarkus release 2.7.0" +preview: "" +changelog: "" +category: "camel-quarkus" +milestone: 23 +jdk: [11] +--- \ No newline at end of file
[GitHub] [camel-quarkus] ppalaga opened a new issue #3517: Prevent various plugins from resolving commons-logging:commons-logging
ppalaga opened a new issue #3517: URL: https://github.com/apache/camel-quarkus/issues/3517 Although we ban `commons-logging:commons-logging` quarkus-bootstrap-plugin and enforcer plugin still download commons-logging:commons-logging when run in some of our modules. It looks like some additional exclusions are needed to eliminate that. -- 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
[GitHub] [camel-karavan] mgubaidullin merged pull request #168: VSCode dark mode
mgubaidullin merged pull request #168: URL: https://github.com/apache/camel-karavan/pull/168 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karavan] branch main updated: VSCode dark mode (#168)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new deacc45 VSCode dark mode (#168)
deacc45 is described below
commit deacc45a1212a72b7df5021ec9a910eea15abbc7
Author: Marat Gubaidullin
AuthorDate: Wed Feb 2 12:23:08 2022 -0500
VSCode dark mode (#168)
---
karavan-core/src/core/api/CamelDefinitionApiExt.ts | 12 +--
karavan-designer/src/designer/DslElement.tsx | 2 +-
karavan-vscode/icons/run.png | Bin 16012 -> 17180 bytes
karavan-vscode/icons/run.svg | 15 +++-
karavan-vscode/webview/App.tsx | 4 +-
karavan-vscode/webview/index.css | 87 -
6 files changed, 74 insertions(+), 46 deletions(-)
diff --git a/karavan-core/src/core/api/CamelDefinitionApiExt.ts
b/karavan-core/src/core/api/CamelDefinitionApiExt.ts
index f13645e..f064424 100644
--- a/karavan-core/src/core/api/CamelDefinitionApiExt.ts
+++ b/karavan-core/src/core/api/CamelDefinitionApiExt.ts
@@ -87,11 +87,11 @@ export class CamelDefinitionApiExt {
}
static findElementInIntegration = (integration: Integration, uuid:
string): CamelElement | undefined => {
-const meta = CamelDefinitionApiExt.findElement(integration.spec.flows,
uuid);
+const meta = CamelDefinitionApiExt.findStep(integration.spec.flows,
uuid);
return meta.step;
}
-static findElement = (steps: CamelElement[] | undefined, uuid: string,
result: CamelElementMeta = new CamelElementMeta(undefined, undefined,
undefined, []), parentUuid?: string): CamelElementMeta => {
+static findStep = (steps: CamelElement[] | undefined, uuid: string,
result: CamelElementMeta = new CamelElementMeta(undefined, undefined,
undefined, []), parentUuid?: string): CamelElementMeta => {
if (result?.step !== undefined) return result;
if (steps !== undefined){
for (let index = 0, step: CamelElement; step = steps[index];
index++) {
@@ -105,12 +105,12 @@ export class CamelDefinitionApiExt {
ce.forEach(e => {
const cel =
CamelDefinitionApiExt.getElementChildren(step, e);
if (e.multiple) {
-result = CamelDefinitionApiExt.findElement(cel,
uuid, result, step.uuid);
+result = CamelDefinitionApiExt.findStep(cel, uuid,
result, step.uuid);
result.pathUuids.push(step.uuid);
} else {
const prop = (step as any)[e.name];
if (prop && prop.hasOwnProperty("uuid")) {
-result =
CamelDefinitionApiExt.findElement([prop], uuid, result, prop.uuid);
+result =
CamelDefinitionApiExt.findStep([prop], uuid, result, prop.uuid);
result.pathUuids.push(prop.uuid);
}
}
@@ -122,10 +122,10 @@ export class CamelDefinitionApiExt {
}
static moveElement = (integration: Integration, source: string, target:
string): Integration => {
-const sourceFindStep =
CamelDefinitionApiExt.findElement(integration.spec.flows, source);
+const sourceFindStep =
CamelDefinitionApiExt.findStep(integration.spec.flows, source);
const sourceStep = sourceFindStep.step;
const sourceUuid = sourceStep?.uuid;
-const targetFindStep =
CamelDefinitionApiExt.findElement(integration.spec.flows, target);
+const targetFindStep =
CamelDefinitionApiExt.findStep(integration.spec.flows, target);
const parentUuid = targetFindStep.parentUuid;
if (sourceUuid && parentUuid && sourceStep &&
!targetFindStep.pathUuids.includes(source)) {
CamelDefinitionApiExt.deleteStepFromIntegration(integration,
sourceUuid);
diff --git a/karavan-designer/src/designer/DslElement.tsx
b/karavan-designer/src/designer/DslElement.tsx
index 227d34c..2e2375c 100644
--- a/karavan-designer/src/designer/DslElement.tsx
+++ b/karavan-designer/src/designer/DslElement.tsx
@@ -326,7 +326,7 @@ export class DslElement extends React.Component {
render() {
const element: CamelElement = this.state.step;
return (
- this.sendPosition(el)}
style={{
borderStyle: this.hasBorder() ? "dotted" : "none",
diff --git a/karavan-vscode/icons/run.png b/karavan-vscode/icons/run.png
index 647d31e..f5f9039 100644
Binary files a/karavan-vscode/icons/run.png and b/karavan-vscode/icons/run.png
differ
diff --git a/karavan-vscode/icons/run.svg b/karavan-vscode/icons/run.svg
index 271f6b5..d898891 100644
--- a/karavan-vscode/icons/run.svg
+++ b/karavan-vscode/icons/run.svg
@@ -1,2 +1,13 @@
-
[camel-k] branch main updated: fix(e2e): Decode OpenShift ProjectRequest into a Project struct
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new c4e41e5 fix(e2e): Decode OpenShift ProjectRequest into a Project
struct
c4e41e5 is described below
commit c4e41e5015b4ae29f9101ead990e8bffde6ee736
Author: Antonin Stefanutti
AuthorDate: Tue Feb 1 15:50:44 2022 +0100
fix(e2e): Decode OpenShift ProjectRequest into a Project struct
---
e2e/support/test_support.go | 91 +++--
1 file changed, 54 insertions(+), 37 deletions(-)
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index 25aab57..4c856b1 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -28,7 +28,6 @@ import (
"context"
"encoding/json"
"fmt"
- "github.com/stretchr/testify/assert"
"io"
"io/ioutil"
"os"
@@ -38,12 +37,12 @@ import (
"testing"
"time"
- "github.com/apache/camel-k/pkg/platform"
"github.com/google/uuid"
"github.com/onsi/gomega"
"github.com/onsi/gomega/format"
"github.com/pkg/errors"
"github.com/spf13/cobra"
+ "github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
"k8s.io/api/batch/v1beta1"
@@ -53,10 +52,13 @@ import (
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
+ "k8s.io/apimachinery/pkg/runtime/schema"
+ "k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/pointer"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
+ "sigs.k8s.io/controller-runtime/pkg/client/apiutil"
eventing "knative.dev/eventing/pkg/apis/eventing/v1"
messaging "knative.dev/eventing/pkg/apis/messaging/v1"
@@ -72,6 +74,7 @@ import (
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/cmd"
"github.com/apache/camel-k/pkg/install"
+ "github.com/apache/camel-k/pkg/platform"
"github.com/apache/camel-k/pkg/util/defaults"
"github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/apache/camel-k/pkg/util/log"
@@ -1649,7 +1652,7 @@ func WithGlobalOperatorNamespace(t *testing.T, test
func(string)) {
if ocp {
// global operators are always installed in the
openshift-operators namespace
InvokeUserTestCode(t, "openshift-operators", test)
- }else {
+ } else {
// create new namespace for the global operator
WithNewTestNamespace(t, test)
}
@@ -1769,17 +1772,20 @@ func DeleteTestNamespace(t *testing.T, ns ctrl.Object) {
}
func NewTestNamespace(injectKnativeBroker bool) ctrl.Object {
- var err error
- var oc bool
- var obj ctrl.Object
-
brokerLabel := "eventing.knative.dev/injection"
name := "test-" + uuid.New().String()
+ c := TestClient()
- if oc, err = openshift.IsOpenShift(TestClient()); err != nil {
+ if oc, err := openshift.IsOpenShift(TestClient()); err != nil {
panic(err)
} else if oc {
- obj = {
+ rest, err := apiutil.RESTClientForGVK(
+ schema.GroupVersionKind{Group: projectv1.GroupName,
Version: projectv1.GroupVersion.Version}, false,
+ c.GetConfig(),
serializer.NewCodecFactory(c.GetScheme()))
+ if err != nil {
+ panic(err)
+ }
+ request := {
TypeMeta: metav1.TypeMeta{
APIVersion: projectv1.GroupVersion.String(),
Kind: "ProjectRequest",
@@ -1788,8 +1794,39 @@ func NewTestNamespace(injectKnativeBroker bool)
ctrl.Object {
Name: name,
},
}
+ project := {
+ TypeMeta: metav1.TypeMeta{
+ APIVersion: projectv1.GroupVersion.String(),
+ Kind: "Project",
+ },
+ }
+ err = rest.Post().
+ Resource("projectrequests").
+ Body(request).
+ Do(TestContext).
+ Into(project)
+ if err != nil {
+ panic(err)
+ }
+ // workaround https://github.com/openshift/origin/issues/3819
+ if injectKnativeBroker {
+ // use Kubernetes API -
https://access.redhat.com/solutions/2677921
+ if namespace, err :=
TestClient().CoreV1().Namespaces().Get(TestContext, name,
[GitHub] [camel-k] astefanutti merged pull request #2971: fix(e2e): Decode OpenShift ProjectRequest into a Project struct
astefanutti merged pull request #2971: URL: https://github.com/apache/camel-k/pull/2971 -- 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
[GitHub] [camel-k] astefanutti commented on pull request #2971: fix(e2e): Decode OpenShift ProjectRequest into a Project struct
astefanutti commented on pull request #2971: URL: https://github.com/apache/camel-k/pull/2971#issuecomment-1028166456 The upgrade workflow will be fixed with #2972. -- 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
[GitHub] [camel-website] github-actions[bot] commented on pull request #771: Announce Camel Quarkus 2.7.0
github-actions[bot] commented on pull request #771: URL: https://github.com/apache/camel-website/pull/771#issuecomment-1028129646 Preview is available at https://pr-771--camel.netlify.app -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (fc7df19 -> a5bdbf0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from fc7df19 CAMEL-17569: camel-jbang and java-dsl: Support loading camel configuration classes, and servicies (BindToRegistry). add a5bdbf0 CAMEL-17580: CamelConfiguration to camel-api to make it generic for all Camel runtimes. No new revisions were added by this update. Summary of changes: core/camel-main/src/main/docs/main.adoc | 35 + 1 file changed, 27 insertions(+), 8 deletions(-)
[camel] branch regen_bot updated (03fbe30 -> fc7df19)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 03fbe30 CAMEL-17543 - Camel Azure Eventhubs: Support adding
properties to the Event mapped from Camel Header
add 96c3ed7 CAMEL-17580: CamelConfiguration to camel-api to make it
generic for all Camel runtimes.
add fc7df19 CAMEL-17569: camel-jbang and java-dsl: Support loading camel
configuration classes, and servicies (BindToRegistry).
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/camel}/CamelConfiguration.java | 14 +++--
.../main/java/org/apache/camel/Configuration.java} | 23 +---
.../camel/impl/engine/AbstractCamelContext.java| 1 -
.../MainConfigurationPropertiesConfigurer.java | 2 +-
.../org/apache/camel/main/BaseMainSupport.java | 61 +++---
.../src/main/java/org/apache/camel/main/Main.java | 1 +
.../apache/camel/main/MainCommandLineSupport.java | 2 +
.../camel/main/MainConfigurationProperties.java| 1 +
.../java/org/apache/camel/main/MainSupport.java| 1 +
.../org/apache/camel/main/ContextEventsTest.java | 1 +
.../org/apache/camel/main/MainCustomizerTest.java | 1 +
.../camel/main/MainIoCNewRouteBuilderTest.java | 4 +-
.../java/org/apache/camel/main/MainIoCTest.java| 4 +-
.../main/MainRoutesCollectorPackageScanTest.java | 3 ++
.../camel/main/scan/MyScanConfiguration.java | 2 +-
.../main/scan/MyScanConfigurationAnnotation.java} | 16 +++---
.../dsl/java/joor/JavaRoutesBuilderLoader.java | 20 +--
.../dsl/java/joor/JavaMainConfigurationTest.java | 28 +++---
.../src/test/resources/routes/MyConfiguration.java | 21
.../resources/routes/MyConfigurationRoute.java | 17 +++---
20 files changed, 139 insertions(+), 84 deletions(-)
copy core/{camel-main/src/main/java/org/apache/camel/main =>
camel-api/src/main/java/org/apache/camel}/CamelConfiguration.java (72%)
copy
core/{camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java =>
camel-api/src/main/java/org/apache/camel/Configuration.java} (57%)
copy
core/camel-main/src/{main/java/org/apache/camel/main/CamelConfiguration.java =>
test/java/org/apache/camel/main/scan/MyScanConfigurationAnnotation.java} (71%)
copy
core/camel-main/src/test/java/org/apache/camel/main/scan/MyScanConfiguration.java
=>
dsl/camel-java-joor-dsl/src/test/java/org/apache/camel/dsl/java/joor/JavaMainConfigurationTest.java
(52%)
copy
core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java =>
dsl/camel-java-joor-dsl/src/test/resources/routes/MyConfiguration.java (70%)
rename
core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java =>
dsl/camel-java-joor-dsl/src/test/resources/routes/MyConfigurationRoute.java
(75%)
[GitHub] [camel-quarkus] jamesnetherton merged pull request #3515: Fix nitrate collection tests on slow machines
jamesnetherton merged pull request #3515: URL: https://github.com/apache/camel-quarkus/pull/3515 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch main updated: Fix nitrate collection tests on slow machines
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 906632c Fix nitrate collection tests on slow machines
906632c is described below
commit 906632ccbf13fa2afbf957098fb803bdebfacbf2
Author: James Netherton
AuthorDate: Wed Feb 2 13:18:03 2022 +
Fix nitrate collection tests on slow machines
---
.../apache/camel/quarkus/component/nitrite/it/NitriteResource.java| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/integration-tests/nitrite/src/main/java/org/apache/camel/quarkus/component/nitrite/it/NitriteResource.java
b/integration-tests/nitrite/src/main/java/org/apache/camel/quarkus/component/nitrite/it/NitriteResource.java
index cfb9b9d..ac6c8c4 100644
---
a/integration-tests/nitrite/src/main/java/org/apache/camel/quarkus/component/nitrite/it/NitriteResource.java
+++
b/integration-tests/nitrite/src/main/java/org/apache/camel/quarkus/component/nitrite/it/NitriteResource.java
@@ -106,8 +106,8 @@ public class NitriteResource {
@GET
@Produces(MediaType.APPLICATION_JSON)
public Object collection() throws Exception {
-final Exchange exchange =
consumerTemplate.receiveNoWait(String.format("nitrite://%s?collection=collection",
-dbFile));
+final Exchange exchange =
consumerTemplate.receive(String.format("nitrite://%s?collection=collection",
+dbFile), 5000);
LOG.debugf("Received from nitrite: %s", exchange == null ? null :
exchange.getIn().getBody());
if (exchange == null) {
return Response.noContent().build();
[camel-quarkus] branch main updated (48af67f -> bb95384)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. from 48af67f Upgrade formatter-maven-plugin to 2.17.1 add bb95384 Clean up usage of deprecated Quarkus APIs No new revisions were added by this update. Summary of changes: .../core/deployment/CamelNativeImageProcessor.java | 7 --- .../camel/quarkus/core/deployment/CamelProcessor.java | 6 -- .../quarkus/core/deployment/util/CamelSupport.java | 2 +- .../quarkus/component/hl7/deployment/Hl7Processor.java | 9 +++-- .../component/shiro/deployment/ShiroProcessor.java | 6 -- .../component/xchange/deployment/XchangeProcessor.java | 17 +++-- 6 files changed, 19 insertions(+), 28 deletions(-)
[GitHub] [camel-quarkus] jamesnetherton merged pull request #3513: Clean up usage of deprecated Quarkus APIs
jamesnetherton merged pull request #3513: URL: https://github.com/apache/camel-quarkus/pull/3513 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch main updated (35b68bd -> 48af67f)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. from 35b68bd Fix deprecation warnings and typos in csimple extension add 48af67f Upgrade formatter-maven-plugin to 2.17.1 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- poms/build-parent/pom.xml| 1 + tooling/eclipse-formatter-config.xml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-)
[GitHub] [camel-quarkus] jamesnetherton merged pull request #3512: Upgrade formatter-maven-plugin to 2.17.1
jamesnetherton merged pull request #3512: URL: https://github.com/apache/camel-quarkus/pull/3512 -- 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
[GitHub] [camel-quarkus] jamesnetherton merged pull request #3510: Fix deprecation warnings and typos in csimple extension
jamesnetherton merged pull request #3510: URL: https://github.com/apache/camel-quarkus/pull/3510 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch main updated: Fix deprecation warnings and typos in csimple extension
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 35b68bd Fix deprecation warnings and typos in csimple extension
35b68bd is described below
commit 35b68bde25551e020837a5e7cf9ab7c6a033548b
Author: James Netherton
AuthorDate: Tue Feb 1 15:21:26 2022 +
Fix deprecation warnings and typos in csimple extension
---
.../csimple/deployment/CSimpleProcessor.java | 29 +++---
.../csimple/deployment/CSimpleXmlProcessor.java| 11 +---
2 files changed, 16 insertions(+), 24 deletions(-)
diff --git
a/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java
b/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java
index c5266fd..9e5f0bd 100644
---
a/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java
+++
b/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java
@@ -20,7 +20,7 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.net.URISyntaxException;
+import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
@@ -49,6 +49,7 @@ import io.quarkus.bootstrap.classloading.ClassPathElement;
import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.Consume;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
@@ -93,11 +94,11 @@ class CSimpleProcessor {
}
@BuildStep
-void collectCSimpleExpresions(
+void collectCSimpleExpressions(
CamelConfig config,
List routesBuilderClasses,
BuildProducer csimpleExpressions)
-throws IOException, ClassNotFoundException, URISyntaxException,
JAXBException {
+throws ClassNotFoundException {
if (!routesBuilderClasses.isEmpty()) {
final ClassLoader loader =
Thread.currentThread().getContextClassLoader();
@@ -114,11 +115,11 @@ class CSimpleProcessor {
final Class cl = loader.loadClass(className);
if (!RouteBuilder.class.isAssignableFrom(cl)) {
-LOG.warnf("CSimple language expressions ocurring in %s
won't be compiled at build time", cl);
+LOG.warnf("CSimple language expressions occurring in %s
won't be compiled at build time", cl);
} else {
try {
-final RouteBuilder rb = (RouteBuilder)
cl.newInstance();
-rb.setContext(ctx);
+final RouteBuilder rb = (RouteBuilder)
cl.getDeclaredConstructor().newInstance();
+rb.setCamelContext(ctx);
try {
rb.configure();
collector.collect(
@@ -154,7 +155,8 @@ class CSimpleProcessor {
}
}
-} catch (InstantiationException | IllegalAccessException
e) {
+} catch (InstantiationException | IllegalAccessException |
NoSuchMethodException
+| InvocationTargetException e) {
throw new RuntimeException("Could not instantiate " +
className, e);
}
}
@@ -163,7 +165,7 @@ class CSimpleProcessor {
}
@BuildStep
-void compileCSimpleExpresions(
+void compileCSimpleExpressions(
List expressionSources,
BuildProducer
compiledCSimpleExpression,
BuildProducer generatedClasses) throws
IOException {
@@ -247,10 +249,10 @@ class CSimpleProcessor {
@Record(ExecutionTime.STATIC_INIT)
@BuildStep
+@Consume(CamelContextBuildItem.class)
CamelBeanBuildItem configureCSimpleLanguage(
RecorderContext recorderContext,
CSimpleLanguageRecorder recorder,
-CamelContextBuildItem camelContext,
List
compiledCSimpleExpressions) {
final RuntimeValue builder =
recorder.csimpleLanguageBuilder();
@@ -267,7 +269,7 @@ class CSimpleProcessor {
while (confiUrls.hasMoreElements()) {
final URL configUrl = confiUrls.nextElement();
try (BufferedReader r = new BufferedReader(new
InputStreamReader(configUrl.openStream(),
[camel-examples] tag camel-examples-3.15.0 created (now cf9756f)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to tag camel-examples-3.15.0 in repository https://gitbox.apache.org/repos/asf/camel-examples.git. at cf9756f (commit) This tag includes the following new commits: new cf9756f Upgrade to Camel 3.15.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel-examples] 01/01: Upgrade to Camel 3.15.0
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to tag camel-examples-3.15.0 in repository https://gitbox.apache.org/repos/asf/camel-examples.git commit cf9756fbdafdaee397bb44bfeaa9f972d024acdb Author: Claus Ibsen AuthorDate: Wed Feb 2 16:31:14 2022 +0100 Upgrade to Camel 3.15.0 --- examples/activemq-tomcat/pom.xml| 2 +- examples/aggregate-dist/pom.xml | 2 +- examples/aggregate/pom.xml | 2 +- examples/any23/pom.xml | 2 +- examples/artemis-large-messages/pom.xml | 2 +- examples/artemis/pom.xml| 2 +- examples/as2/pom.xml| 2 +- examples/aws/aws-secrets-manager/README.adoc| 2 +- examples/aws/aws-secrets-manager/pom.xml| 2 +- examples/aws/main-endpointdsl-aws2-s3-kafka/pom.xml | 2 +- examples/aws/main-endpointdsl-aws2-s3/pom.xml | 2 +- examples/aws/main-endpointdsl-aws2/aws2-eventbridge-creator/pom.xml | 2 +- examples/aws/main-endpointdsl-aws2/aws2-s3-events-inject/pom.xml| 2 +- examples/aws/main-endpointdsl-aws2/aws2-sqs-consumer/pom.xml| 2 +- examples/aws/main-endpointdsl-aws2/pom.xml | 2 +- .../aws/main-endpointdsl-kafka-aws2-s3-restarting-policy/pom.xml| 2 +- examples/aws/main-endpointdsl-kafka-aws2-s3/pom.xml | 2 +- examples/aws/pom.xml| 2 +- examples/azure/azure-eventhubs/pom.xml | 2 +- examples/azure/azure-storage-blob/pom.xml | 2 +- examples/azure/kafka-azure/pom.xml | 2 +- examples/azure/pom.xml | 2 +- examples/basic/pom.xml | 2 +- examples/bigxml-split/pom.xml | 2 +- examples/billboard-aggregate/pom.xml| 2 +- examples/cafe-endpointdsl/pom.xml | 2 +- examples/cafe/pom.xml | 2 +- examples/cassandra-kubernetes/pom.xml | 2 +- examples/cdi-test/pom.xml | 2 +- examples/cdi/pom.xml| 2 +- examples/console/pom.xml| 2 +- examples/couchbase-log/pom.xml | 2 +- examples/csimple-joor/pom.xml | 2 +- examples/csimple/pom.xml| 2 +- examples/cxf-proxy/pom.xml | 2 +- examples/cxf-tomcat/pom.xml | 2 +- examples/cxf/pom.xml| 2 +- examples/debezium-eventhubs-blob/pom.xml| 2 +- examples/debezium/pom.xml | 2 +- examples/fhir/pom.xml | 2 +- examples/flight-recorder/pom.xml| 2 +- examples/ftp/pom.xml| 2 +- examples/hazelcast-kubernetes/pom.xml | 2 +- examples/java8/pom.xml | 2 +- examples/jdbc/pom.xml | 2 +- examples/jms-file/pom.xml | 2 +- examples/jmx/pom.xml| 2 +- examples/jooq/pom.xml | 2 +- examples/kafka/pom.xml | 2 +- examples/kamelet-chucknorris/pom.xml| 2 +- examples/kamelet-main/pom.xml | 2 +- examples/kamelet/pom.xml| 2 +- examples/kotlin/pom.xml | 2 +- examples/loadbalancing/pom.xml | 2 +- examples/loan-broker-cxf/pom.xml| 2 +- examples/loan-broker-jms/pom.xml| 2 +- examples/main-artemis/pom.xml | 2 +- examples/main-endpointdsl-google-pubsub/pom.xml | 2 +- examples/main-endpointdsl/pom.xml | 2 +- examples/main-health/pom.xml| 2 +- examples/main-joor/pom.xml | 2 +-
[camel] branch main updated: CAMEL-17580: CamelConfiguration to camel-api to make it generic for all Camel runtimes.
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 a5bdbf0 CAMEL-17580: CamelConfiguration to camel-api to make it
generic for all Camel runtimes.
a5bdbf0 is described below
commit a5bdbf03227f1a9e5055833f2b0b6d1fc5cb59df
Author: Claus Ibsen
AuthorDate: Wed Feb 2 16:16:52 2022 +0100
CAMEL-17580: CamelConfiguration to camel-api to make it generic for all
Camel runtimes.
---
core/camel-main/src/main/docs/main.adoc | 35 +
1 file changed, 27 insertions(+), 8 deletions(-)
diff --git a/core/camel-main/src/main/docs/main.adoc
b/core/camel-main/src/main/docs/main.adoc
index 8774ae8..7d726e7 100644
--- a/core/camel-main/src/main/docs/main.adoc
+++ b/core/camel-main/src/main/docs/main.adoc
@@ -306,7 +306,7 @@ The camel.lra supports 4 options, which are listed below.
When running Camel standalone via `camel-main` JAR, then Camel will use
package scanning to discover:
- Camel routes by discovering `RouteBuilder` classes
-- Camel configuration classes by discovering `CamelConfiguration` classes
+- Camel configuration classes by discovering `CamelConfiguration` classes or
classes annotated with `@Configuration`.
- Camel type converters by discovering classes annotated with `@Converter`
To use package scanning then Camel needs to know the base package to use as
_offset_. This
@@ -341,8 +341,8 @@ There is a little overhead when using package scanning as
Camel performs this sc
You can use _configuration_ classes to configure Camel Main applications from
Java.
-IMPORTANT: In *Camel 3.16* onwards the configuration classes must implement
the interface `org.apache.camel.main.CamelConfiguration`.
-In previous versions this was not required.
+IMPORTANT: In *Camel 3.16* onwards the configuration classes must either
implement the interface `org.apache.camel.CamelConfiguration`,
+or be annotated with `@Configuration` (or both). In previous versions this was
not required.
For example to configure a Camel application by creating custom beans you can
do:
@@ -350,17 +350,18 @@ For example to configure a Camel application by creating
custom beans you can do
public class MyConfiguration implements CamelConfiguration {
-public void configure(CamelContext camelContext) throws Exception {
-// this method is optional and can be omitted
-// do any kind of configuration here if needed
-}
-
@BindToRegistry
public MyBean myAwesomeBean() {
MyBean bean = new MyBean();
// do something on bean
return bean;
}
+
+public void configure(CamelContext camelContext) throws Exception {
+// this method is optional and can be omitted
+// do any kind of configuration here if needed
+}
+
}
@@ -370,6 +371,24 @@ that creates the `MyBean` and registers it with the name
`myAwesomeBean` (defaul
This is similar to Spring Boot where you can also do this with the Spring Boot
`@Bean` annotations,
or in Quarkus/CDI with the `@Produces` annotation.
+=== Using annotation based configuration classes
+
+Instead of configuration classes that implements `CamelConfiguration`, you can
annotate the class with `org.apache.camel.@Configuration` as shown:
+
+[source,java]
+
+@Configuration
+public class MyConfiguration {
+
+@BindToRegistry
+public MyBean myAwesomeBean() {
+MyBean bean = new MyBean();
+// do something on bean
+return bean;
+}
+}
+
+
== Specifying custom beans
Custom beans can be configured in `camel-main` via properties (such as in the
`application.properties` file).
[camel] 02/02: CAMEL-17569: camel-jbang and java-dsl: Support loading camel configuration classes, and servicies (BindToRegistry).
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fc7df19986fe63de7d04f9d92d8036c8c8967984
Author: Claus Ibsen
AuthorDate: Wed Feb 2 16:12:14 2022 +0100
CAMEL-17569: camel-jbang and java-dsl: Support loading camel configuration
classes, and servicies (BindToRegistry).
---
.../dsl/java/joor/JavaRoutesBuilderLoader.java | 26 +++---
1 file changed, 8 insertions(+), 18 deletions(-)
diff --git
a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java
b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java
index 3ec8e0a..dd149db 100644
---
a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java
+++
b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java
@@ -22,6 +22,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.CamelConfiguration;
import org.apache.camel.Configuration;
import org.apache.camel.Converter;
import org.apache.camel.ExtendedCamelContext;
@@ -84,12 +85,14 @@ public class JavaRoutesBuilderLoader extends
RouteBuilderLoaderSupport {
return (RouteBuilder) obj;
} else if (obj != null) {
BindToRegistry bir =
obj.getClass().getAnnotation(BindToRegistry.class);
-if (bir != null) {
+Configuration cfg =
obj.getClass().getAnnotation(Configuration.class);
+if (bir != null || cfg != null || obj instanceof
CamelConfiguration) {
CamelBeanPostProcessor bpp =
getCamelContext().adapt(ExtendedCamelContext.class).getBeanPostProcessor();
-if (ObjectHelper.isNotEmpty(bir.value())) {
+if (bir != null && ObjectHelper.isNotEmpty(bir.value())) {
name = bir.value();
+} else if (cfg != null &&
ObjectHelper.isNotEmpty(cfg.value())) {
+name = cfg.value();
}
-
// to support hot reloading of beans then we need to
enable unbind mode in bean post processor
bpp.setUnbindEnabled(true);
try {
@@ -100,21 +103,8 @@ public class JavaRoutesBuilderLoader extends
RouteBuilderLoaderSupport {
} finally {
bpp.setUnbindEnabled(false);
}
-return null;
-}
-Configuration cfg =
obj.getClass().getAnnotation(Configuration.class);
-if (cfg != null) {
-CamelBeanPostProcessor bpp =
getCamelContext().adapt(ExtendedCamelContext.class).getBeanPostProcessor();
-
-// to support hot reloading of beans then we need to
enable unbind mode in bean post processor
-bpp.setUnbindEnabled(true);
-try {
-// this class is a bean service which needs to be post
processed and registered which happens
-// automatic by the bean post processor
-bpp.postProcessBeforeInitialization(obj, name);
-bpp.postProcessAfterInitialization(obj, name);
-} finally {
-bpp.setUnbindEnabled(false);
+if (obj instanceof CamelConfiguration) {
+((CamelConfiguration)
obj).configure(getCamelContext());
}
return null;
}
[camel] 01/02: CAMEL-17580: CamelConfiguration to camel-api to make it generic for all Camel runtimes.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 96c3ed7228f36ed3602bed37d4e1db215641118c
Author: Claus Ibsen
AuthorDate: Wed Feb 2 16:01:54 2022 +0100
CAMEL-17580: CamelConfiguration to camel-api to make it generic for all
Camel runtimes.
---
.../java/org/apache/camel}/CamelConfiguration.java | 14 +++--
.../main/java/org/apache/camel/Configuration.java} | 23 +---
.../camel/impl/engine/AbstractCamelContext.java| 1 -
.../MainConfigurationPropertiesConfigurer.java | 2 +-
.../org/apache/camel/main/BaseMainSupport.java | 61 +++---
.../src/main/java/org/apache/camel/main/Main.java | 1 +
.../apache/camel/main/MainCommandLineSupport.java | 2 +
.../camel/main/MainConfigurationProperties.java| 1 +
.../java/org/apache/camel/main/MainSupport.java| 1 +
.../org/apache/camel/main/ContextEventsTest.java | 1 +
.../org/apache/camel/main/MainCustomizerTest.java | 1 +
.../camel/main/MainIoCNewRouteBuilderTest.java | 4 +-
.../java/org/apache/camel/main/MainIoCTest.java| 4 +-
.../main/MainRoutesCollectorPackageScanTest.java | 3 ++
.../camel/main/scan/MyScanConfiguration.java | 2 +-
.../main/scan/MyScanConfigurationAnnotation.java} | 16 +++---
.../dsl/java/joor/JavaRoutesBuilderLoader.java | 26 +++--
.../dsl/java/joor/JavaMainConfigurationTest.java | 28 +++---
.../src/test/resources/routes/MyConfiguration.java | 21
.../resources/routes/MyConfigurationRoute.java | 17 +++---
20 files changed, 147 insertions(+), 82 deletions(-)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java
b/core/camel-api/src/main/java/org/apache/camel/CamelConfiguration.java
similarity index 72%
copy from
core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java
copy to core/camel-api/src/main/java/org/apache/camel/CamelConfiguration.java
index 0c871bb..85d2b6e 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java
+++ b/core/camel-api/src/main/java/org/apache/camel/CamelConfiguration.java
@@ -14,15 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.main;
-
-import org.apache.camel.CamelContext;
+package org.apache.camel;
/**
- * Configuration class for Camel Main applications.
+ * Configuration class for Camel applications.
+ *
+ * This class allows doing custom configuration during Camel startup such as
setting up custom beans using the
+ * {@link BindToRegistry} annotation.
*/
public interface CamelConfiguration {
+/**
+ * Method that allows to do custom configuration during Camel startup.
+ *
+ * @param camelContext the context
+ */
default void configure(CamelContext camelContext) throws Exception {
}
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java
b/core/camel-api/src/main/java/org/apache/camel/Configuration.java
similarity index 57%
copy from
core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java
copy to core/camel-api/src/main/java/org/apache/camel/Configuration.java
index 0c871bb..c12dbef 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Configuration.java
@@ -14,16 +14,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.main;
+package org.apache.camel;
-import org.apache.camel.CamelContext;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
- * Configuration class for Camel Main applications.
+ * Marks the class as a {@link CamelConfiguration} class.
+ *
+ * This allows runtimes such as Camel Main to do package scan and automatic
discover Camel configuration classes.
*/
-public interface CamelConfiguration {
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Target({ ElementType.TYPE })
+public @interface Configuration {
-default void configure(CamelContext camelContext) throws Exception {
-}
+/**
+ * The name of the configuration bean
+ */
+String value() default "";
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index d6522f6..468ef34 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -248,7 +248,6 @@ public abstract
[camel] branch main updated (03fbe30 -> fc7df19)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 03fbe30 CAMEL-17543 - Camel Azure Eventhubs: Support adding
properties to the Event mapped from Camel Header
new 96c3ed7 CAMEL-17580: CamelConfiguration to camel-api to make it
generic for all Camel runtimes.
new fc7df19 CAMEL-17569: camel-jbang and java-dsl: Support loading camel
configuration classes, and servicies (BindToRegistry).
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:
.../java/org/apache/camel}/CamelConfiguration.java | 14 +++--
.../main/java/org/apache/camel/Configuration.java} | 23 +---
.../camel/impl/engine/AbstractCamelContext.java| 1 -
.../MainConfigurationPropertiesConfigurer.java | 2 +-
.../org/apache/camel/main/BaseMainSupport.java | 61 +++---
.../src/main/java/org/apache/camel/main/Main.java | 1 +
.../apache/camel/main/MainCommandLineSupport.java | 2 +
.../camel/main/MainConfigurationProperties.java| 1 +
.../java/org/apache/camel/main/MainSupport.java| 1 +
.../org/apache/camel/main/ContextEventsTest.java | 1 +
.../org/apache/camel/main/MainCustomizerTest.java | 1 +
.../camel/main/MainIoCNewRouteBuilderTest.java | 4 +-
.../java/org/apache/camel/main/MainIoCTest.java| 4 +-
.../main/MainRoutesCollectorPackageScanTest.java | 3 ++
.../camel/main/scan/MyScanConfiguration.java | 2 +-
.../main/scan/MyScanConfigurationAnnotation.java} | 16 +++---
.../dsl/java/joor/JavaRoutesBuilderLoader.java | 20 +--
.../dsl/java/joor/JavaMainConfigurationTest.java | 28 +++---
.../src/test/resources/routes/MyConfiguration.java | 21
.../resources/routes/MyConfigurationRoute.java | 17 +++---
20 files changed, 139 insertions(+), 84 deletions(-)
copy core/{camel-main/src/main/java/org/apache/camel/main =>
camel-api/src/main/java/org/apache/camel}/CamelConfiguration.java (72%)
copy
core/{camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java =>
camel-api/src/main/java/org/apache/camel/Configuration.java} (57%)
copy
core/camel-main/src/{main/java/org/apache/camel/main/CamelConfiguration.java =>
test/java/org/apache/camel/main/scan/MyScanConfigurationAnnotation.java} (71%)
copy
core/camel-main/src/test/java/org/apache/camel/main/scan/MyScanConfiguration.java
=>
dsl/camel-java-joor-dsl/src/test/java/org/apache/camel/dsl/java/joor/JavaMainConfigurationTest.java
(52%)
copy
core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java =>
dsl/camel-java-joor-dsl/src/test/resources/routes/MyConfiguration.java (70%)
rename
core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java =>
dsl/camel-java-joor-dsl/src/test/resources/routes/MyConfigurationRoute.java
(75%)
[GitHub] [camel-k] bouskaJ opened a new pull request #2974: [TEST] Fix route test on Knative enabled clusters
bouskaJ opened a new pull request #2974: URL: https://github.com/apache/camel-k/pull/2974 **Release Note** ```release-note NONE ``` -- 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
[GitHub] [camel-quarkus] jamesnetherton commented on pull request #3506: Fix #3496 Ban javax.servlet:javax.servlet-api in favor of jakarta.ser…
jamesnetherton commented on pull request #3506: URL: https://github.com/apache/camel-quarkus/pull/3506#issuecomment-1028013757 > Any chance to backport to 2.7.x @zhfeng? He's currently on PTO I believe. -- 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
[GitHub] [camel-quarkus] ppalaga commented on pull request #3506: Fix #3496 Ban javax.servlet:javax.servlet-api in favor of jakarta.ser…
ppalaga commented on pull request #3506: URL: https://github.com/apache/camel-quarkus/pull/3506#issuecomment-1028000198 Any chance to backport to 2.7.x @zhfeng? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot_3.14.x updated (001697f -> f7caf8d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git. omit 001697f CAMEL-17543 - Camel Azure Eventhubs: Support adding properties to the Event mapped from Camel Header This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/regen_bot_3.14.x (f7caf8d) \ O -- O -- O (001697f) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../component/azure/eventhubs/EventHubsConstants.java | 1 - .../component/azure/eventhubs/EventHubsConsumer.java | 1 - .../operations/EventHubsProducerOperations.java | 19 ++- 3 files changed, 6 insertions(+), 15 deletions(-)
[camel] branch regen_bot updated (e000175 -> 03fbe30)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from e000175 CAMEL-17579: Add the missing config needed for SpringTransformerRouteTest add 03fbe30 CAMEL-17543 - Camel Azure Eventhubs: Support adding properties to the Event mapped from Camel Header No new revisions were added by this update. Summary of changes: .../component/azure/eventhubs/EventHubsConstants.java | 1 + .../component/azure/eventhubs/EventHubsConsumer.java | 1 + .../operations/EventHubsProducerOperations.java | 19 +-- 3 files changed, 15 insertions(+), 6 deletions(-)
[camel] branch regen_bot_3.14.x updated (48cbf30 -> 001697f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git. from 48cbf30 CAMEL-17579: Fix checkstyle violation add f7caf8d CAMEL-17579: Add the missing config needed for SpringTransformerRouteTest add 001697f CAMEL-17543 - Camel Azure Eventhubs: Support adding properties to the Event mapped from Camel Header No new revisions were added by this update. Summary of changes: .../azure/eventhubs/EventHubsConstants.java| 1 + .../azure/eventhubs/EventHubsConsumer.java | 1 + .../operations/EventHubsProducerOperations.java| 19 ++-- .../transformer/SpringTransformerRouteTest.xml | 25 +++--- 4 files changed, 37 insertions(+), 9 deletions(-)
[camel] branch regen_bot updated (5a24ceb -> e000175)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 5a24ceb Regen for commit cb6012449402ee9d270177d0e97eee81f202a2ba (#6876) add e000175 CAMEL-17579: Add the missing config needed for SpringTransformerRouteTest No new revisions were added by this update. Summary of changes: .../transformer/SpringTransformerRouteTest.xml | 25 +++--- 1 file changed, 22 insertions(+), 3 deletions(-)
[camel-quarkus-examples] branch camel-quarkus-main updated (005b6bd -> 463a9c3)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch camel-quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git. omit 005b6bd Use MicroMeter metrics instead of MicroProfile Metrics omit 780d8b1 Set quarkus.platform.version to 2.7.0.CR1 omit eb571ef Make health tests handle newer MP health output format in Camel 3.15.x omit 0f38b66 Use yq installed on the GitHub actions VM instead of downloading and installing it omit c756617 Next is 2.7.0 add 8e14e17 Next is 2.7.0 add 09ef693 Use yq installed on the GitHub actions VM instead of downloading and installing it add 876b9a5 Make health tests handle newer MP health output format in Camel 3.15.x add 89e91d2 Set quarkus.platform.version to 2.7.0.CR1 add c3acef2 Use MicroMeter metrics instead of MicroProfile Metrics add 4b61302 Upgrade to Quarkus Platform 2.7.0.Final add 7e64111 Tag 2.7.0 new 463a9c3 Next is 2.8.0 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 (005b6bd) \ N -- N -- N refs/heads/camel-quarkus-main (463a9c3) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: aws-lambda/pom.xml| 6 +++--- file-bindy-ftp/pom.xml| 6 +++--- file-bindy-ftp/src/main/kubernetes/kubernetes.yml | 12 ++-- file-bindy-ftp/src/main/kubernetes/openshift.yml | 12 ++-- file-split-log-xml/pom.xml| 6 +++--- health/pom.xml| 6 +++--- http-log/pom.xml | 6 +++--- jdbc-datasource/pom.xml | 6 +++--- kafka/pom.xml | 6 +++--- kamelet-chucknorris/pom.xml | 6 +++--- observability/pom.xml | 6 +++--- rest-json/pom.xml | 6 +++--- timer-log-cdi/pom.xml | 6 +++--- timer-log-kotlin/pom.xml | 6 +++--- timer-log-main/pom.xml| 6 +++--- timer-log-spring/pom.xml | 6 +++--- timer-log-xml/pom.xml | 6 +++--- timer-log/pom.xml | 6 +++--- 18 files changed, 60 insertions(+), 60 deletions(-)
[camel-quarkus-examples] 01/01: Next is 2.8.0
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git
commit 463a9c31848cf26ff9d1ce8e6303a511477a493e
Author: James Netherton
AuthorDate: Wed Feb 2 14:15:15 2022 +
Next is 2.8.0
---
aws-lambda/pom.xml| 10 +-
file-bindy-ftp/pom.xml| 10 +-
file-bindy-ftp/src/main/kubernetes/kubernetes.yml | 12 ++--
file-bindy-ftp/src/main/kubernetes/openshift.yml | 12 ++--
file-split-log-xml/pom.xml| 10 +-
health/pom.xml| 10 +-
http-log/pom.xml | 10 +-
jdbc-datasource/pom.xml | 10 +-
kafka/pom.xml | 10 +-
kamelet-chucknorris/pom.xml | 12 ++--
observability/pom.xml | 10 +-
rest-json/pom.xml | 10 +-
timer-log-cdi/pom.xml | 10 +-
timer-log-kotlin/pom.xml | 10 +-
timer-log-main/pom.xml| 12 ++--
timer-log-spring/pom.xml | 10 +-
timer-log-xml/pom.xml | 10 +-
timer-log/pom.xml | 10 +-
18 files changed, 94 insertions(+), 94 deletions(-)
diff --git a/aws-lambda/pom.xml b/aws-lambda/pom.xml
index a43f7cf..d7ceaea 100644
--- a/aws-lambda/pom.xml
+++ b/aws-lambda/pom.xml
@@ -21,19 +21,19 @@
4.0.0
org.apache.camel.quarkus.examples
camel-quarkus-examples-aws-lambda
-2.7.0
+2.8.0-SNAPSHOT
Camel Quarkus :: Examples :: AWS Lambda
Camel Quarkus Example :: Deploying a Camel Route in AWS
Lambda
2.7.0.Final
-
${quarkus.platform.version}
+
2.8.0-SNAPSHOT
-
io.quarkus.platform
+io.quarkus
quarkus-bom
-
${quarkus.platform.group-id}
-
quarkus-camel-bom
+
org.apache.camel.quarkus
+
camel-quarkus-bom
UTF-8
UTF-8
diff --git a/file-bindy-ftp/pom.xml b/file-bindy-ftp/pom.xml
index 09f14a7..2bd3594 100644
--- a/file-bindy-ftp/pom.xml
+++ b/file-bindy-ftp/pom.xml
@@ -22,19 +22,19 @@
camel-quarkus-examples-file-bindy-ftp
org.apache.camel.quarkus.examples
-2.7.0
+2.8.0-SNAPSHOT
Camel Quarkus :: Examples :: File Bindy FTP
Camel Quarkus Example :: File Bindy FTP
2.7.0.Final
-
${quarkus.platform.version}
+
2.8.0-SNAPSHOT
-
io.quarkus.platform
+io.quarkus
quarkus-bom
-
${quarkus.platform.group-id}
-
quarkus-camel-bom
+
org.apache.camel.quarkus
+
camel-quarkus-bom
UTF-8
UTF-8
diff --git a/file-bindy-ftp/src/main/kubernetes/kubernetes.yml
b/file-bindy-ftp/src/main/kubernetes/kubernetes.yml
index 299a1a7..ae5cae5 100644
--- a/file-bindy-ftp/src/main/kubernetes/kubernetes.yml
+++ b/file-bindy-ftp/src/main/kubernetes/kubernetes.yml
@@ -21,18 +21,18 @@ metadata:
name: ssh-server-deployment
labels:
app.kubernetes.io/name: camel-quarkus-examples-file-bindy-ftp
-app.kubernetes.io/version: 2.7.0
+app.kubernetes.io/version: 2.8.0-SNAPSHOT
spec:
replicas: 1
selector:
matchLabels:
app.kubernetes.io/name: camel-quarkus-examples-file-bindy-ftp
- app.kubernetes.io/version: 2.7.0
+ app.kubernetes.io/version: 2.8.0-SNAPSHOT
template:
metadata:
labels:
app.kubernetes.io/name: camel-quarkus-examples-file-bindy-ftp
-app.kubernetes.io/version: 2.7.0
+app.kubernetes.io/version: 2.8.0-SNAPSHOT
spec:
containers:
- name: openssh-server
@@ -57,7 +57,7 @@ kind: Service
metadata:
labels:
app.kubernetes.io/name: camel-quarkus-examples-file-bindy-ftp
-app.kubernetes.io/version: 2.7.0
+app.kubernetes.io/version: 2.8.0-SNAPSHOT
name: ftp-server
spec:
ports:
@@ -66,7 +66,7 @@ spec:
targetPort:
selector:
app.kubernetes.io/name: camel-quarkus-examples-file-bindy-ftp
-app.kubernetes.io/version: 2.7.0
+app.kubernetes.io/version: 2.8.0-SNAPSHOT
type: ClusterIP
---
apiVersion: v1
@@ -77,7 +77,7 @@ kind: Secret
metadata:
labels:
app.kubernetes.io/name: camel-quarkus-examples-file-bindy-ftp
-app.kubernetes.io/version: 2.7.0
+app.kubernetes.io/version: 2.8.0-SNAPSHOT
name: ftp-credentials
type: Opaque
---
diff --git a/file-bindy-ftp/src/main/kubernetes/openshift.yml
b/file-bindy-ftp/src/main/kubernetes/openshift.yml
index 299a1a7..ae5cae5 100644
--- a/file-bindy-ftp/src/main/kubernetes/openshift.yml
+++
[camel-quarkus-examples] branch 2.7.x created (now 7e64111)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch 2.7.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git. at 7e64111 Tag 2.7.0 No new revisions were added by this update.
[camel-quarkus-examples] tag 2.7.0 created (now 7e64111)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to tag 2.7.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git. at 7e64111 (commit) No new revisions were added by this update.
[camel-quarkus-examples] branch main updated (4b61302 -> 7e64111)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git. from 4b61302 Upgrade to Quarkus Platform 2.7.0.Final add 7e64111 Tag 2.7.0 No new revisions were added by this update. Summary of changes: aws-lambda/pom.xml| 2 +- file-bindy-ftp/pom.xml| 2 +- file-bindy-ftp/src/main/kubernetes/kubernetes.yml | 12 ++-- file-bindy-ftp/src/main/kubernetes/openshift.yml | 12 ++-- file-split-log-xml/pom.xml| 2 +- health/pom.xml| 2 +- http-log/pom.xml | 2 +- jdbc-datasource/pom.xml | 2 +- kafka/pom.xml | 2 +- kamelet-chucknorris/pom.xml | 2 +- observability/pom.xml | 2 +- rest-json/pom.xml | 2 +- timer-log-cdi/pom.xml | 2 +- timer-log-kotlin/pom.xml | 2 +- timer-log-main/pom.xml| 2 +- timer-log-spring/pom.xml | 2 +- timer-log-xml/pom.xml | 2 +- timer-log/pom.xml | 2 +- 18 files changed, 28 insertions(+), 28 deletions(-)
[GitHub] [camel-quarkus-examples] jamesnetherton merged pull request #71: Upgrade to Quarkus Platform 2.7.0.Final
jamesnetherton merged pull request #71: URL: https://github.com/apache/camel-quarkus-examples/pull/71 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus-examples] 03/06: Make health tests handle newer MP health output format in Camel 3.15.x
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git
commit 876b9a59ab108a0a7d3f6388dbac1e9e00078c90
Author: James Netherton
AuthorDate: Tue Jan 25 08:08:13 2022 +
Make health tests handle newer MP health output format in Camel 3.15.x
---
.../src/test/java/org/acme/health/HealthTest.java | 41 +---
.../org/acme/observability/ObservabilityTest.java | 72 --
2 files changed, 86 insertions(+), 27 deletions(-)
diff --git a/health/src/test/java/org/acme/health/HealthTest.java
b/health/src/test/java/org/acme/health/HealthTest.java
index ebda3db..7984a70 100644
--- a/health/src/test/java/org/acme/health/HealthTest.java
+++ b/health/src/test/java/org/acme/health/HealthTest.java
@@ -18,6 +18,8 @@ package org.acme.health;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
+import org.apache.camel.CamelContext;
+import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
@@ -28,13 +30,36 @@ public class HealthTest {
@Test
public void testHealth() throws InterruptedException {
-RestAssured.get("/q/health")
-.then()
-.statusCode(503)
-.body("status", is("DOWN"),
-"checks.status", containsInAnyOrder("DOWN", "UP"),
-"checks.name",
-containsInAnyOrder("camel-readiness-checks",
"camel-liveness-checks"),
-"checks.data.context", containsInAnyOrder(null, "UP"));
+if (isAggregatedHealthResponse()) {
+RestAssured.get("/q/health")
+.then()
+.statusCode(503)
+.body("status", is("DOWN"),
+"checks.status", containsInAnyOrder("DOWN", "UP"),
+"checks.name",
+containsInAnyOrder("camel-readiness-checks",
"camel-liveness-checks"),
+"checks.data.context", containsInAnyOrder(null,
"UP"));
+} else {
+RestAssured.get("/q/health")
+.then()
+.statusCode(503)
+.body("status", is("DOWN"),
+"checks.findAll { it.name == 'toolong' }.status",
Matchers.contains("UP"),
+"checks.findAll { it.name == 'context' }.status",
Matchers.contains("UP"),
+"checks.findAll { it.name == 'camel-routes'
}.status", Matchers.contains("UP"),
+"checks.findAll { it.name == 'camel-consumers'
}.status", Matchers.contains("DOWN"));
+}
+}
+
+/**
+ * The JSON structure produced by camel-microprofile-health in Camel >=
3.15 is different to that
+ * produced in previous versions. This check allows the tests to handle
both formats.
+ *
+ * TODO: Remove when examples upgraded to >= Camel 3.15
+ */
+private boolean isAggregatedHealthResponse() {
+String version =
CamelContext.class.getPackage().getImplementationVersion();
+String[] versionParts = version.split("\\.");
+return Integer.parseInt(versionParts[1]) < 15;
}
}
diff --git
a/observability/src/test/java/org/acme/observability/ObservabilityTest.java
b/observability/src/test/java/org/acme/observability/ObservabilityTest.java
index b120c1a..b0f65fe 100644
--- a/observability/src/test/java/org/acme/observability/ObservabilityTest.java
+++ b/observability/src/test/java/org/acme/observability/ObservabilityTest.java
@@ -17,7 +17,9 @@
package org.acme.observability;
import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
import io.restassured.http.ContentType;
+import org.apache.camel.CamelContext;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
@@ -43,25 +45,57 @@ public class ObservabilityTest {
@Test
public void health() {
-// Verify liveness
-given()
-.when().accept(ContentType.JSON)
-.get("/q/health/live")
-.then()
-.statusCode(200)
-.body("status", Matchers.is("UP"),
-"checks.name",
containsInAnyOrder("camel-liveness-checks"),
-"checks.data.custom-liveness-check",
containsInAnyOrder("UP"));
+if (isAggregatedHealthResponse()) {
+// Verify liveness
+given()
+.when().accept(ContentType.JSON)
+.get("/q/health/live")
+.then()
+.statusCode(200)
+.body("status", Matchers.is("UP"),
+"checks.name",
containsInAnyOrder("camel-liveness-checks"),
+
[camel-quarkus-examples] 06/06: Upgrade to Quarkus Platform 2.7.0.Final
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git
commit 4b6130256cbbb8e96e077746381a72893bca8a7d
Author: James Netherton
AuthorDate: Wed Feb 2 13:23:07 2022 +
Upgrade to Quarkus Platform 2.7.0.Final
---
aws-lambda/pom.xml | 10 +-
file-bindy-ftp/pom.xml | 10 +-
file-split-log-xml/pom.xml | 10 +-
health/pom.xml | 10 +-
http-log/pom.xml| 10 +-
jdbc-datasource/pom.xml | 10 +-
kafka/pom.xml | 10 +-
kamelet-chucknorris/pom.xml | 12 ++--
observability/pom.xml | 10 +-
rest-json/pom.xml | 10 +-
timer-log-cdi/pom.xml | 10 +-
timer-log-kotlin/pom.xml| 10 +-
timer-log-main/pom.xml | 12 ++--
timer-log-spring/pom.xml| 10 +-
timer-log-xml/pom.xml | 10 +-
timer-log/pom.xml | 10 +-
16 files changed, 82 insertions(+), 82 deletions(-)
diff --git a/aws-lambda/pom.xml b/aws-lambda/pom.xml
index 6403b4d..4b72081 100644
--- a/aws-lambda/pom.xml
+++ b/aws-lambda/pom.xml
@@ -27,13 +27,13 @@
Camel Quarkus Example :: Deploying a Camel Route in AWS
Lambda
-2.7.0.CR1
-
2.7.0-SNAPSHOT
+2.7.0.Final
+
${quarkus.platform.version}
-io.quarkus
+
io.quarkus.platform
quarkus-bom
-
org.apache.camel.quarkus
-
camel-quarkus-bom
+
${quarkus.platform.group-id}
+
quarkus-camel-bom
UTF-8
UTF-8
diff --git a/file-bindy-ftp/pom.xml b/file-bindy-ftp/pom.xml
index 844afb8..10574fc 100644
--- a/file-bindy-ftp/pom.xml
+++ b/file-bindy-ftp/pom.xml
@@ -28,13 +28,13 @@
Camel Quarkus Example :: File Bindy FTP
-2.7.0.CR1
-
2.7.0-SNAPSHOT
+2.7.0.Final
+
${quarkus.platform.version}
-io.quarkus
+
io.quarkus.platform
quarkus-bom
-
org.apache.camel.quarkus
-
camel-quarkus-bom
+
${quarkus.platform.group-id}
+
quarkus-camel-bom
UTF-8
UTF-8
diff --git a/file-split-log-xml/pom.xml b/file-split-log-xml/pom.xml
index f560fd4..1caf6e6 100644
--- a/file-split-log-xml/pom.xml
+++ b/file-split-log-xml/pom.xml
@@ -28,13 +28,13 @@
Camel Quarkus Example :: File To Log XML DSL
-2.7.0.CR1
-
2.7.0-SNAPSHOT
+2.7.0.Final
+
${quarkus.platform.version}
-io.quarkus
+
io.quarkus.platform
quarkus-bom
-
org.apache.camel.quarkus
-
camel-quarkus-bom
+
${quarkus.platform.group-id}
+
quarkus-camel-bom
UTF-8
UTF-8
diff --git a/health/pom.xml b/health/pom.xml
index f8e2756..7222da8 100644
--- a/health/pom.xml
+++ b/health/pom.xml
@@ -28,13 +28,13 @@
Camel Quarkus Example :: Health Check
-2.7.0.CR1
-
2.7.0-SNAPSHOT
+2.7.0.Final
+
${quarkus.platform.version}
-io.quarkus
+
io.quarkus.platform
quarkus-bom
-
org.apache.camel.quarkus
-
camel-quarkus-bom
+
${quarkus.platform.group-id}
+
quarkus-camel-bom
UTF-8
UTF-8
diff --git a/http-log/pom.xml b/http-log/pom.xml
index b0ff388..0b9890e 100644
--- a/http-log/pom.xml
+++ b/http-log/pom.xml
@@ -28,13 +28,13 @@
Camel Quarkus Example :: HTTP to Log
-2.7.0.CR1
-
2.7.0-SNAPSHOT
+2.7.0.Final
+
${quarkus.platform.version}
-io.quarkus
+
io.quarkus.platform
quarkus-bom
-
org.apache.camel.quarkus
-
camel-quarkus-bom
+
${quarkus.platform.group-id}
+
quarkus-camel-bom
UTF-8
UTF-8
diff --git a/jdbc-datasource/pom.xml b/jdbc-datasource/pom.xml
index f025e7b..77bc450 100644
--- a/jdbc-datasource/pom.xml
+++ b/jdbc-datasource/pom.xml
@@ -25,13 +25,13 @@
Camel Quarkus :: Examples :: Jdbc - DatataSource - Log
Camel Quarkus Example :: Connect to Database using
Datasource
-2.7.0.CR1
-
2.7.0-SNAPSHOT
+2.7.0.Final
+
${quarkus.platform.version}
-io.quarkus
+
io.quarkus.platform
quarkus-bom
-
org.apache.camel.quarkus
-
camel-quarkus-bom
+
${quarkus.platform.group-id}
+
quarkus-camel-bom
2.11.0
1.3.2
diff --git a/kafka/pom.xml b/kafka/pom.xml
index ff73382..deb011f 100644
--- a/kafka/pom.xml
+++ b/kafka/pom.xml
@@ -28,13 +28,13 @@
Camel Quarkus Example :: Kafka
-2.7.0.CR1
-
2.7.0-SNAPSHOT
+2.7.0.Final
+
${quarkus.platform.version}
-io.quarkus
+
io.quarkus.platform
quarkus-bom
-
org.apache.camel.quarkus
-
camel-quarkus-bom
+
[camel-quarkus-examples] 04/06: Set quarkus.platform.version to 2.7.0.CR1
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git commit 89e91d2d2e17bea1fc11789d8d664bd684fe956b Author: James Netherton AuthorDate: Tue Jan 25 08:17:16 2022 + Set quarkus.platform.version to 2.7.0.CR1 --- aws-lambda/pom.xml | 2 +- file-bindy-ftp/pom.xml | 2 +- file-split-log-xml/pom.xml | 2 +- health/pom.xml | 2 +- http-log/pom.xml| 2 +- jdbc-datasource/pom.xml | 2 +- kafka/pom.xml | 2 +- kamelet-chucknorris/pom.xml | 2 +- observability/pom.xml | 2 +- rest-json/pom.xml | 2 +- timer-log-cdi/pom.xml | 2 +- timer-log-kotlin/pom.xml| 2 +- timer-log-main/pom.xml | 2 +- timer-log-spring/pom.xml| 2 +- timer-log-xml/pom.xml | 2 +- timer-log/pom.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/aws-lambda/pom.xml b/aws-lambda/pom.xml index 7cdb84e..6403b4d 100644 --- a/aws-lambda/pom.xml +++ b/aws-lambda/pom.xml @@ -27,7 +27,7 @@ Camel Quarkus Example :: Deploying a Camel Route in AWS Lambda -2.6.0.Final +2.7.0.CR1 2.7.0-SNAPSHOT io.quarkus diff --git a/file-bindy-ftp/pom.xml b/file-bindy-ftp/pom.xml index ca51fdb..844afb8 100644 --- a/file-bindy-ftp/pom.xml +++ b/file-bindy-ftp/pom.xml @@ -28,7 +28,7 @@ Camel Quarkus Example :: File Bindy FTP -2.6.0.Final +2.7.0.CR1 2.7.0-SNAPSHOT io.quarkus diff --git a/file-split-log-xml/pom.xml b/file-split-log-xml/pom.xml index 8cce0cc..f560fd4 100644 --- a/file-split-log-xml/pom.xml +++ b/file-split-log-xml/pom.xml @@ -28,7 +28,7 @@ Camel Quarkus Example :: File To Log XML DSL -2.6.0.Final +2.7.0.CR1 2.7.0-SNAPSHOT io.quarkus diff --git a/health/pom.xml b/health/pom.xml index 1b494b5..f8e2756 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -28,7 +28,7 @@ Camel Quarkus Example :: Health Check -2.6.0.Final +2.7.0.CR1 2.7.0-SNAPSHOT io.quarkus diff --git a/http-log/pom.xml b/http-log/pom.xml index 1faa773..b0ff388 100644 --- a/http-log/pom.xml +++ b/http-log/pom.xml @@ -28,7 +28,7 @@ Camel Quarkus Example :: HTTP to Log -2.6.0.Final +2.7.0.CR1 2.7.0-SNAPSHOT io.quarkus diff --git a/jdbc-datasource/pom.xml b/jdbc-datasource/pom.xml index 5c8ee9e..f025e7b 100644 --- a/jdbc-datasource/pom.xml +++ b/jdbc-datasource/pom.xml @@ -25,7 +25,7 @@ Camel Quarkus :: Examples :: Jdbc - DatataSource - Log Camel Quarkus Example :: Connect to Database using Datasource -2.6.0.Final +2.7.0.CR1 2.7.0-SNAPSHOT io.quarkus diff --git a/kafka/pom.xml b/kafka/pom.xml index 746e41b..ff73382 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -28,7 +28,7 @@ Camel Quarkus Example :: Kafka -2.6.0.Final +2.7.0.CR1 2.7.0-SNAPSHOT io.quarkus diff --git a/kamelet-chucknorris/pom.xml b/kamelet-chucknorris/pom.xml index 29edc73..fd66df2 100644 --- a/kamelet-chucknorris/pom.xml +++ b/kamelet-chucknorris/pom.xml @@ -28,7 +28,7 @@ Camel Quarkus Example :: Kamelet Chuck Norris -2.6.0.Final +2.7.0.CR1 2.7.0-SNAPSHOT diff --git a/observability/pom.xml b/observability/pom.xml index 313a7c4..c7ba18a 100644 --- a/observability/pom.xml +++ b/observability/pom.xml @@ -29,7 +29,7 @@ -2.6.0.Final +2.7.0.CR1 io.quarkus quarkus-bom diff --git a/rest-json/pom.xml b/rest-json/pom.xml index 2c9dc94..dc2b02e 100644 --- a/rest-json/pom.xml +++ b/rest-json/pom.xml @@ -28,7 +28,7 @@ Camel Quarkus Example :: Rest Json -2.6.0.Final +2.7.0.CR1 2.7.0-SNAPSHOT io.quarkus diff --git a/timer-log-cdi/pom.xml b/timer-log-cdi/pom.xml index b69bbef..d0c10e3 100644 --- a/timer-log-cdi/pom.xml +++ b/timer-log-cdi/pom.xml @@ -28,7 +28,7 @@ Camel Quarkus Example :: Timer to Log CDI -2.6.0.Final +2.7.0.CR1 2.7.0-SNAPSHOT io.quarkus diff --git a/timer-log-kotlin/pom.xml b/timer-log-kotlin/pom.xml index fcd1ea9..bcc8384 100644 --- a/timer-log-kotlin/pom.xml +++ b/timer-log-kotlin/pom.xml @@ -28,7 +28,7 @@ Camel Quarkus Example :: Timer to Log Kotlin -2.6.0.Final +2.7.0.CR1 2.7.0-SNAPSHOT io.quarkus diff --git a/timer-log-main/pom.xml b/timer-log-main/pom.xml index dd74758..d62762d 100644 --- a/timer-log-main/pom.xml +++ b/timer-log-main/pom.xml @@ -28,7 +28,7 @@ Camel Quarkus Example :: Timer to Log Main -2.6.0.Final +2.7.0.CR1 2.7.0-SNAPSHOT diff --git a/timer-log-spring/pom.xml b/timer-log-spring/pom.xml
[camel-quarkus-examples] 05/06: Use MicroMeter metrics instead of MicroProfile Metrics
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git
commit c3acef2f4ad9013b10ee57b17ee7f8bba156f8f1
Author: James Netherton
AuthorDate: Tue Jan 25 10:42:18 2022 +
Use MicroMeter metrics instead of MicroProfile Metrics
---
observability/README.adoc | 7 +++
observability/pom.xml | 6 +-
.../src/main/resources/application.properties | 3 +++
.../org/acme/observability/ObservabilityTest.java | 21 -
4 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/observability/README.adoc b/observability/README.adoc
index 55169fe..5c990f0 100644
--- a/observability/README.adoc
+++ b/observability/README.adoc
@@ -31,12 +31,11 @@ To view all Camel metrics do:
$ curl localhost:8080/q/metrics/application
-To pick out specific metrics you can either use `grep` or the
`https://stedolan.github.io/jq/[jq]` library :
+To retrieve metrics in JSON format, pass the `Accept` HTTP header in the
request:
[source,shell]
-$ curl -s -H"Accept: application/json" localhost:8080/q/metrics/application \
-| jq
'.["camel.context.exchanges.completed.total;camelContext=camel-quarkus-observability"]'
+$ curl -s -H"Accept: application/json" localhost:8080/q/metrics/application
=== Health endpoint
@@ -58,7 +57,7 @@ The JSON output will contain a checks for verifying whether
the `CamelContext` a
This example project contains a custom liveness check class
`CustomLivenessCheck` and custom readiness check class `CustomReadinessCheck`
which leverage the Camel health API.
You'll see these listed in the health JSON as 'custom-liveness-check' and
'custom-readiness-check'. On every 5th invocation of these checks, the health
status of `custom-liveness-check` will be reported as DOWN.
-You can also directly leverage MicroProfile Metrics APIs to create checks.
Class `CamelUptimeHealthCheck` demonstrates how to register a readiness check.
+You can also directly leverage MicroProfile Health APIs to create checks.
Class `CamelUptimeHealthCheck` demonstrates how to register a readiness check.
Tracing
diff --git a/observability/pom.xml b/observability/pom.xml
index c7ba18a..1b29557 100644
--- a/observability/pom.xml
+++ b/observability/pom.xml
@@ -88,13 +88,17 @@
org.apache.camel.quarkus
-camel-quarkus-microprofile-metrics
+camel-quarkus-micrometer
org.apache.camel.quarkus
camel-quarkus-opentracing
+io.micrometer
+micrometer-registry-prometheus
+
+
io.quarkus
quarkus-resteasy
diff --git a/observability/src/main/resources/application.properties
b/observability/src/main/resources/application.properties
index 6337bd2..5b14547 100644
--- a/observability/src/main/resources/application.properties
+++ b/observability/src/main/resources/application.properties
@@ -26,6 +26,9 @@ quarkus.jaeger.sampler-type = const
quarkus.jaeger.sampler-param = 1
quarkus.jaeger.endpoint = http://localhost:14268/api/traces
+# Allow metrics to be exported as JSON. Not strictly required and is disabled
by default
+quarkus.micrometer.export.json.enabled = true
+
#
# Camel
#
diff --git
a/observability/src/test/java/org/acme/observability/ObservabilityTest.java
b/observability/src/test/java/org/acme/observability/ObservabilityTest.java
index b0f65fe..6d4b979 100644
--- a/observability/src/test/java/org/acme/observability/ObservabilityTest.java
+++ b/observability/src/test/java/org/acme/observability/ObservabilityTest.java
@@ -19,6 +19,7 @@ package org.acme.observability;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.http.ContentType;
+import io.restassured.path.json.JsonPath;
import org.apache.camel.CamelContext;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
@@ -27,20 +28,30 @@ import static io.restassured.RestAssured.given;
import static org.hamcrest.CoreMatchers.hasItems;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.junit.jupiter.api.Assertions.assertTrue;
@QuarkusTest
public class ObservabilityTest {
@Test
public void metrics() {
-// Verify a expected Camel metric is available
-given()
+// Verify Camel metrics are available
+JsonPath path = given()
.when().accept(ContentType.JSON)
-.get("/q/metrics/application")
+.get("/q/metrics")
.then()
.statusCode(200)
-.body(
-
"'camel.context.status;camelContext=camel-quarkus-observability'", is(3));
+
[camel-quarkus-examples] 02/06: Use yq installed on the GitHub actions VM instead of downloading and installing it
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git
commit 09ef693f255a1fb12f4110cc795cfadbc554c6a6
Author: James Netherton
AuthorDate: Fri Jan 14 14:54:31 2022 +
Use yq installed on the GitHub actions VM instead of downloading and
installing it
---
.github/workflows/ci-build.yaml | 14 --
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index 6fbb4f9..cb73f1f 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -111,10 +111,8 @@ jobs:
- name: Setup Integration Test Matrix
id: set-itest-matrix
run: |
- sudo wget -O /usr/local/bin/yq
"https://github.com/mikefarah/yq/releases/download/3.2.1/yq_linux_amd64;
- sudo chmod +x /usr/local/bin/yq
- CATEGORIES=$(cat .github/test-categories.yaml | yq r - --printMode p
"*." | sed "s/\(.*\)/'\1'/" | sed ':a;N;$!ba;s/\n/,/g')
- echo "::set-output name=matrix::{'category': [${CATEGORIES}]}"
+ CATEGORIES=$(yq -M -N -I 0 -o=json e 'keys'
.github/test-categories.yaml | tr '"' "'")
+ echo "::set-output name=matrix::{'category': ${CATEGORIES}}"
integration-tests:
name: Integration Tests - ${{matrix.category}}
@@ -140,15 +138,11 @@ jobs:
shell: bash
run: |
tar -xzf ../maven-repo.tgz -C ~
- - name: Install yq
-run: |
- sudo wget -O /usr/local/bin/yq
"https://github.com/mikefarah/yq/releases/download/3.2.1/yq_linux_amd64;
- sudo chmod +x /usr/local/bin/yq
- name: Integration Tests
run: |
EXAMPLE_PROJECTS=""
- for EXAMPLE in $(cat .github/test-categories.yaml | yq r - "${{
matrix.category }}.*"); do
-if [ "${EXAMPLE}" == "-" ]; then
+ for EXAMPLE in $(yq -M -N e ".${{ matrix.category }}"
.github/test-categories.yaml | cut -f2 -d' '); do
+if [ "${EXAMPLE}" == "null" ]; then
continue
fi
[camel-quarkus-examples] 01/06: Next is 2.7.0
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git
commit 8e14e17e477fc55a9e894510be2f3adc6a9c19fd
Author: Zineb Bendhiba
AuthorDate: Thu Dec 23 09:27:05 2021 +0100
Next is 2.7.0
---
aws-lambda/pom.xml| 10 +-
file-bindy-ftp/pom.xml| 10 +-
file-bindy-ftp/src/main/kubernetes/kubernetes.yml | 12 ++--
file-bindy-ftp/src/main/kubernetes/openshift.yml | 12 ++--
file-split-log-xml/pom.xml| 10 +-
health/pom.xml| 10 +-
http-log/pom.xml | 10 +-
jdbc-datasource/pom.xml | 10 +-
kafka/pom.xml | 10 +-
kamelet-chucknorris/pom.xml | 12 ++--
observability/pom.xml | 10 +-
rest-json/pom.xml | 10 +-
timer-log-cdi/pom.xml | 10 +-
timer-log-kotlin/pom.xml | 10 +-
timer-log-main/pom.xml| 12 ++--
timer-log-spring/pom.xml | 10 +-
timer-log-xml/pom.xml | 10 +-
timer-log/pom.xml | 10 +-
18 files changed, 94 insertions(+), 94 deletions(-)
diff --git a/aws-lambda/pom.xml b/aws-lambda/pom.xml
index 0b49c59..7cdb84e 100644
--- a/aws-lambda/pom.xml
+++ b/aws-lambda/pom.xml
@@ -21,19 +21,19 @@
4.0.0
org.apache.camel.quarkus.examples
camel-quarkus-examples-aws-lambda
-2.6.0
+2.7.0-SNAPSHOT
Camel Quarkus :: Examples :: AWS Lambda
Camel Quarkus Example :: Deploying a Camel Route in AWS
Lambda
2.6.0.Final
-
${quarkus.platform.version}
+
2.7.0-SNAPSHOT
-
io.quarkus.platform
+io.quarkus
quarkus-bom
-
${quarkus.platform.group-id}
-
quarkus-camel-bom
+
org.apache.camel.quarkus
+
camel-quarkus-bom
UTF-8
UTF-8
diff --git a/file-bindy-ftp/pom.xml b/file-bindy-ftp/pom.xml
index 5d81a60..ca51fdb 100644
--- a/file-bindy-ftp/pom.xml
+++ b/file-bindy-ftp/pom.xml
@@ -22,19 +22,19 @@
camel-quarkus-examples-file-bindy-ftp
org.apache.camel.quarkus.examples
-2.6.0
+2.7.0-SNAPSHOT
Camel Quarkus :: Examples :: File Bindy FTP
Camel Quarkus Example :: File Bindy FTP
2.6.0.Final
-
${quarkus.platform.version}
+
2.7.0-SNAPSHOT
-
io.quarkus.platform
+io.quarkus
quarkus-bom
-
${quarkus.platform.group-id}
-
quarkus-camel-bom
+
org.apache.camel.quarkus
+
camel-quarkus-bom
UTF-8
UTF-8
diff --git a/file-bindy-ftp/src/main/kubernetes/kubernetes.yml
b/file-bindy-ftp/src/main/kubernetes/kubernetes.yml
index b334520..256e791 100644
--- a/file-bindy-ftp/src/main/kubernetes/kubernetes.yml
+++ b/file-bindy-ftp/src/main/kubernetes/kubernetes.yml
@@ -21,18 +21,18 @@ metadata:
name: ssh-server-deployment
labels:
app.kubernetes.io/name: camel-quarkus-examples-file-bindy-ftp
-app.kubernetes.io/version: 2.6.0
+app.kubernetes.io/version: 2.7.0-SNAPSHOT
spec:
replicas: 1
selector:
matchLabels:
app.kubernetes.io/name: camel-quarkus-examples-file-bindy-ftp
- app.kubernetes.io/version: 2.6.0
+ app.kubernetes.io/version: 2.7.0-SNAPSHOT
template:
metadata:
labels:
app.kubernetes.io/name: camel-quarkus-examples-file-bindy-ftp
-app.kubernetes.io/version: 2.6.0
+app.kubernetes.io/version: 2.7.0-SNAPSHOT
spec:
containers:
- name: openssh-server
@@ -57,7 +57,7 @@ kind: Service
metadata:
labels:
app.kubernetes.io/name: camel-quarkus-examples-file-bindy-ftp
-app.kubernetes.io/version: 2.6.0
+app.kubernetes.io/version: 2.7.0-SNAPSHOT
name: ftp-server
spec:
ports:
@@ -66,7 +66,7 @@ spec:
targetPort:
selector:
app.kubernetes.io/name: camel-quarkus-examples-file-bindy-ftp
-app.kubernetes.io/version: 2.6.0
+app.kubernetes.io/version: 2.7.0-SNAPSHOT
type: ClusterIP
---
apiVersion: v1
@@ -77,7 +77,7 @@ kind: Secret
metadata:
labels:
app.kubernetes.io/name: camel-quarkus-examples-file-bindy-ftp
-app.kubernetes.io/version: 2.6.0
+app.kubernetes.io/version: 2.7.0-SNAPSHOT
name: ftp-credentials
type: Opaque
---
diff --git a/file-bindy-ftp/src/main/kubernetes/openshift.yml
b/file-bindy-ftp/src/main/kubernetes/openshift.yml
index b334520..256e791 100644
--- a/file-bindy-ftp/src/main/kubernetes/openshift.yml
+++ b/file-bindy-ftp/src/main/kubernetes/openshift.yml
@@ -21,18
[camel-quarkus-examples] branch main updated (688916b -> 4b61302)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git. from 688916b Tag 2.6.0 new 8e14e17 Next is 2.7.0 new 09ef693 Use yq installed on the GitHub actions VM instead of downloading and installing it new 876b9a5 Make health tests handle newer MP health output format in Camel 3.15.x new 89e91d2 Set quarkus.platform.version to 2.7.0.CR1 new c3acef2 Use MicroMeter metrics instead of MicroProfile Metrics new 4b61302 Upgrade to Quarkus Platform 2.7.0.Final The 6 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: .github/workflows/ci-build.yaml| 14 +--- aws-lambda/pom.xml | 4 +- file-bindy-ftp/pom.xml | 4 +- file-bindy-ftp/src/main/kubernetes/kubernetes.yml | 12 +-- file-bindy-ftp/src/main/kubernetes/openshift.yml | 12 +-- file-split-log-xml/pom.xml | 4 +- health/pom.xml | 4 +- .../src/test/java/org/acme/health/HealthTest.java | 41 -- http-log/pom.xml | 4 +- jdbc-datasource/pom.xml| 4 +- kafka/pom.xml | 4 +- kamelet-chucknorris/pom.xml| 6 +- observability/README.adoc | 7 +- observability/pom.xml | 10 ++- .../src/main/resources/application.properties | 3 + .../org/acme/observability/ObservabilityTest.java | 93 -- rest-json/pom.xml | 4 +- timer-log-cdi/pom.xml | 4 +- timer-log-kotlin/pom.xml | 4 +- timer-log-main/pom.xml | 6 +- timer-log-spring/pom.xml | 4 +- timer-log-xml/pom.xml | 4 +- timer-log/pom.xml | 4 +- 23 files changed, 163 insertions(+), 93 deletions(-)
[camel] branch camel-3.14.x updated: CAMEL-17543 - Camel Azure Eventhubs: Support adding properties to the Event mapped from Camel Header
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.14.x by this push:
new 001697f CAMEL-17543 - Camel Azure Eventhubs: Support adding
properties to the Event mapped from Camel Header
001697f is described below
commit 001697f69f426bc32f81b07f197331661225b07b
Author: Andrea Cosentino
AuthorDate: Wed Feb 2 14:27:04 2022 +0100
CAMEL-17543 - Camel Azure Eventhubs: Support adding properties to the Event
mapped from Camel Header
---
.../component/azure/eventhubs/EventHubsConstants.java | 1 +
.../component/azure/eventhubs/EventHubsConsumer.java | 1 +
.../operations/EventHubsProducerOperations.java | 19 +--
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git
a/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/EventHubsConstants.java
b/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/EventHubsConstants.java
index f0b24ea..cea1a32 100644
---
a/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/EventHubsConstants.java
+++
b/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/EventHubsConstants.java
@@ -25,6 +25,7 @@ public final class EventHubsConstants {
public static final String OFFSET = HEADER_PREFIX + "Offset";
public static final String ENQUEUED_TIME = HEADER_PREFIX + "EnqueuedTime";
public static final String SEQUENCE_NUMBER = HEADER_PREFIX +
"SequenceNumber";
+public static final String METADATA = HEADER_PREFIX + "Metadata";
private EventHubsConstants() {
}
diff --git
a/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/EventHubsConsumer.java
b/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/EventHubsConsumer.java
index c9171e6..8411707 100644
---
a/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/EventHubsConsumer.java
+++
b/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/EventHubsConsumer.java
@@ -89,6 +89,7 @@ public class EventHubsConsumer extends DefaultConsumer {
long ts =
eventContext.getEventData().getEnqueuedTime().getEpochSecond() * 1000;
message.setHeader(Exchange.MESSAGE_TIMESTAMP, ts);
}
+message.setHeader(EventHubsConstants.METADATA,
eventContext.getEventData().getProperties());
return exchange;
}
diff --git
a/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/operations/EventHubsProducerOperations.java
b/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/operations/EventHubsProducerOperations.java
index 0a4a9f7..23498d2 100644
---
a/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/operations/EventHubsProducerOperations.java
+++
b/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/operations/EventHubsProducerOperations.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.azure.eventhubs.operations;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import com.azure.messaging.eventhubs.EventData;
import com.azure.messaging.eventhubs.EventHubProducerAsyncClient;
@@ -106,14 +107,15 @@ public class EventHubsProducerOperations {
// check if our exchange is list or contain some values
if (exchange.getIn().getBody() instanceof Iterable) {
return createEventDataFromIterable((Iterable)
exchange.getIn().getBody(),
-exchange.getContext().getTypeConverter());
+exchange.getContext().getTypeConverter(),
exchange.getIn().getHeaders());
}
// we have only a single event here
return
Collections.singletonList(createEventDataFromExchange(exchange));
}
-private Iterable createEventDataFromIterable(final
Iterable inputData, final TypeConverter converter) {
+private Iterable createEventDataFromIterable(
+final Iterable inputData, final TypeConverter converter,
Map headers) {
final List finalEventData = new LinkedList<>();
inputData.forEach(data -> {
@@ -122,7 +124,7 @@ public class EventHubsProducerOperations {
} else if (data instanceof Message) {
finalEventData.add(createEventDataFromMessage((Message) data));
} else {
-finalEventData.add(createEventDataFromObject(data, converter));
+
[GitHub] [camel] oscerd merged pull request #6879: [Backport camel-3.14.x] CAMEL-17543 - Camel Azure Eventhubs: Support adding properties to the…
oscerd merged pull request #6879: URL: https://github.com/apache/camel/pull/6879 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (528abb3 -> 5a24ceb)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. omit 528abb3 Regen for commit cb6012449402ee9d270177d0e97eee81f202a2ba add f646dcc Regen for commit a9646086f935e521490e11984a85c7ffaf9f0481 add 5a24ceb Regen for commit cb6012449402ee9d270177d0e97eee81f202a2ba (#6876) 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 (528abb3) \ N -- N -- N refs/heads/regen_bot (5a24ceb) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
[camel] branch backport-6878-to-camel-3.14.x created (now 5b2b084)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch backport-6878-to-camel-3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git. at 5b2b084 CAMEL-17543 - Camel Azure Eventhubs: Support adding properties to the Event mapped from Camel Header No new revisions were added by this update.
[GitHub] [camel] github-actions[bot] opened a new pull request #6879: [Backport camel-3.14.x] CAMEL-17543 - Camel Azure Eventhubs: Support adding properties to the…
github-actions[bot] opened a new pull request #6879: URL: https://github.com/apache/camel/pull/6879 Backport 03fbe3034b71656cc732dbce59c312f30bf15d75 from #6878 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch camel-3.14.x updated: CAMEL-17579: Add the missing config needed for SpringTransformerRouteTest
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.14.x by this push:
new f7caf8d CAMEL-17579: Add the missing config needed for
SpringTransformerRouteTest
f7caf8d is described below
commit f7caf8d5410e929be51c2be4cb7fa48ce119cfaf
Author: Nicolas Filotto
AuthorDate: Wed Feb 2 12:54:53 2022 +0100
CAMEL-17579: Add the missing config needed for SpringTransformerRouteTest
---
.../transformer/SpringTransformerRouteTest.xml | 25 +++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/transformer/SpringTransformerRouteTest.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/transformer/SpringTransformerRouteTest.xml
index fee90da..ea9a097 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/transformer/SpringTransformerRouteTest.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/transformer/SpringTransformerRouteTest.xml
@@ -29,21 +29,28 @@
+
http://camel.apache.org/schema/spring;>
-
+
+
+
+
-
+
+${body} contains
'fake'
+
+
@@ -93,7 +100,19 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
[GitHub] [camel] oscerd merged pull request #6874: CAMEL-17579: Add the missing config needed for SpringTransformerRouteTest
oscerd merged pull request #6874: URL: https://github.com/apache/camel/pull/6874 -- 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
