You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/06/09 07:28:59 UTC
[camel] branch main updated (31a3851 -> 1813dc3)
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 31a3851 yaml-dsl: add tests for kamelet eip and flow mode
new cb437f9 Upgrade slack
new 70fe28a CAMEL-16627: camel-core - Add common header for source timestamp
new 1813dc3 CAMEL-16627: camel-core - Add common header for source timestamp
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:
.../camel/component/pulsar/utils/message/PulsarMessageUtils.java | 1 +
.../src/main/java/org/apache/camel/component/quartz/QuartzMessage.java | 3 +++
components/camel-slack/pom.xml | 3 ---
parent/pom.xml | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
[camel] 01/03: Upgrade slack
Posted by da...@apache.org.
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 cb437f97def12f444741a064341f9a65b3d10366
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jun 9 09:21:51 2021 +0200
Upgrade slack
---
components/camel-slack/pom.xml | 3 ---
parent/pom.xml | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/components/camel-slack/pom.xml b/components/camel-slack/pom.xml
index 7537c5c..90e5543 100644
--- a/components/camel-slack/pom.xml
+++ b/components/camel-slack/pom.xml
@@ -32,9 +32,6 @@
<name>Camel :: Slack</name>
<description>Camel Slack Support</description>
- <properties>
- </properties>
-
<dependencies>
<dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index f391dab..42421dd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -489,7 +489,7 @@
<shrinkwrap-resolver-version>3.1.3</shrinkwrap-resolver-version>
<shrinkwrap-version>1.2.6</shrinkwrap-version>
<sip-api-version>1.1</sip-api-version>
- <slack-api-model-version>1.6.1</slack-api-model-version>
+ <slack-api-model-version>1.8.1</slack-api-model-version>
<slf4j-api-version>1.7.30</slf4j-api-version>
<slf4j-version>1.7.30</slf4j-version>
<smack-version>4.3.5</smack-version>
[camel] 02/03: CAMEL-16627: camel-core - Add common header for
source timestamp
Posted by da...@apache.org.
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 70fe28a0880bc555b5cc23bc0052b484ed1b326a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jun 9 09:24:21 2021 +0200
CAMEL-16627: camel-core - Add common header for source timestamp
---
.../src/main/java/org/apache/camel/component/quartz/QuartzMessage.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzMessage.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzMessage.java
index 7d961ed..205f820 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzMessage.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzMessage.java
@@ -60,6 +60,9 @@ public class QuartzMessage extends DefaultMessage {
map.put("trigger", trigger);
map.put("triggerName", trigger.getKey().getName());
map.put("triggerGroup", trigger.getKey().getGroup());
+ if (jobExecutionContext.getFireTime() != null) {
+ map.put(Exchange.MESSAGE_TIMESTAMP, jobExecutionContext.getFireTime().getTime());
+ }
}
}
[camel] 03/03: CAMEL-16627: camel-core - Add common header for
source timestamp
Posted by da...@apache.org.
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 1813dc395aaf6c882fad61fa89f280a9937ab36e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jun 9 09:28:19 2021 +0200
CAMEL-16627: camel-core - Add common header for source timestamp
---
.../apache/camel/component/pulsar/utils/message/PulsarMessageUtils.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/message/PulsarMessageUtils.java b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/message/PulsarMessageUtils.java
index c25b1d3..ec900d1 100644
--- a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/message/PulsarMessageUtils.java
+++ b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/message/PulsarMessageUtils.java
@@ -54,6 +54,7 @@ public final class PulsarMessageUtils {
msg.setHeader(SEQUENCE_ID, message.getSequenceId());
msg.setHeader(PUBLISH_TIME, message.getPublishTime());
msg.setHeader(PROPERTIES, message.getProperties());
+ msg.setHeader(Exchange.MESSAGE_TIMESTAMP, message.getPublishTime());
msg.setBody(message.getValue());