This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1b57f455530d3878012d1510a4bd1baa25d7680a
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Feb 1 11:45:14 2023 +0100
CAMEL-18131 - camel-health - Add health checks for components that has
extension for connectivity verification - AWS Cloudtrail
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---
.../org/apache/camel/component/aws/cloudtrail/CloudtrailConsumer.java | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumer.java
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumer.java
index f68026811da..ed11a2e5520 100644
---
a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumer.java
+++
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumer.java
@@ -31,10 +31,13 @@ import
org.apache.camel.health.WritableHealthCheckRepository;
import org.apache.camel.support.ScheduledBatchPollingConsumer;
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
+<<<<<<< HEAD
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import software.amazon.awssdk.awscore.exception.AwsServiceException;
+=======
+>>>>>>> 9446467e2e9 (CAMEL-18131 - camel-health - Add health checks for
components that has extension for connectivity verification - AWS Cloudtrail)
import software.amazon.awssdk.services.cloudtrail.CloudTrailClient;
import software.amazon.awssdk.services.cloudtrail.model.Event;
import software.amazon.awssdk.services.cloudtrail.model.LookupAttribute;
