This is an automated email from the ASF dual-hosted git repository.
valdar pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 46b4ce448c7ac58af2a7d57b533e7ff633873d2a
Author: Andrea Tarocchi <andrea.taroc...@gmail.com>
AuthorDate: Tue Dec 27 16:58:12 2022 +0100
Updated to camel and kamelets 3.20.0
---
.gitignore | 1 +
.../CamelStreamCacheConverterLoader.java | 52 -------------
.../services/org/apache/camel/TypeConverterLoader | 2 -
connectors/pom.xml | 1 +
parent/pom.xml | 10 +--
pom.xml | 2 +-
tests/itests-aws-v2/pom.xml | 2 +-
.../aws/v2/cw/sink/CamelSinkAWSCWITCase.java | 4 +-
.../aws/v2/ec2/sink/CamelSinkAWSEC2ITCase.java | 4 +-
.../aws/v2/iam/sink/CamelSinkAWSIAMITCase.java | 4 +-
.../v2/kinesis/sink/CamelSinkAWSKinesisITCase.java | 4 +-
.../source/CamelSourceAWSKinesisITCase.java | 4 +-
.../aws/v2/kms/sink/CamelSinkAWSKMSITCase.java | 4 +-
.../aws/v2/lambda/sink/CamelSinkLambdaITCase.java | 4 +-
.../aws/v2/s3/sink/CamelSinkAWSS3ITCase.java | 4 +-
.../aws/v2/s3/source/CamelSourceAWSS3ITCase.java | 4 +-
.../aws/v2/sns/sink/CamelSinkAWSSNSITCase.java | 4 +-
.../aws/v2/sqs/sink/CamelSinkAWSSQSITCase.java | 4 +-
.../aws/v2/sqs/source/CamelSourceAWSSQSITCase.java | 4 +-
...CloudWatchLocalContainerServiceWithTimeout.java | 23 ++++++
.../aws2/services/AWSContainerWithTimeout.java | 41 +++++++++++
...WSDynamodbLocalContainerServiceWithTimeout.java | 23 ++++++
.../AWSEC2LocalContainerServiceWithTimeout.java | 23 ++++++
...ventBridgeLocalContainerServiceWithTimeout.java | 23 ++++++
.../AWSIAMLocalContainerServiceWithTimeout.java | 23 ++++++
.../AWSKMSLocalContainerServiceWithTimeout.java | 23 ++++++
...AWSKinesisLocalContainerServiceWithTimeout.java | 33 +++++++++
.../AWSLambdaLocalContainerServiceWithTimeout.java | 23 ++++++
.../AWSS3LocalContainerServiceWithTimeout.java | 23 ++++++
.../AWSSNSLocalContainerServiceWithTimeout.java | 23 ++++++
.../AWSSQSLocalContainerServiceWithTimeout.java | 23 ++++++
.../AWSSTSLocalContainerServiceWithTimeout.java | 23 ++++++
.../services/AWSServiceFactoryWithTimeout.java | 85 ++++++++++++++++++++++
tests/itests-hdfs/pom.xml | 39 ++++++++++
.../hdfs/sink/CamelSinkHDFSITCase.java | 2 +-
.../https/sink/CamelSinkHTTPSITCase.java | 8 +-
36 files changed, 489 insertions(+), 90 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3663cfef1..6d71b2cd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -296,6 +296,7 @@ tags
[._]*.un~
### VisualStudioCode ###
+.vscode/
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
diff --git
a/connectors/camel-syslog-kafka-connector/src/generated/java/org/apache/camel/kafkaconnector/syslog/converters/CamelStreamCacheConverterLoader.java
b/connectors/camel-syslog-kafka-connector/src/generated/java/org/apache/camel/kafkaconnector/syslog/converters/CamelStreamCacheConverterLoader.java
deleted file mode 100644
index 2fdcd612e..000000000
---
a/connectors/camel-syslog-kafka-connector/src/generated/java/org/apache/camel/kafkaconnector/syslog/converters/CamelStreamCacheConverterLoader.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.kafkaconnector.syslog.converters;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.DeferredContextBinding;
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-@DeferredContextBinding
-public final class CamelStreamCacheConverterLoader implements
TypeConverterLoader, CamelContextAware {
-
- private CamelContext camelContext;
-
- public CamelStreamCacheConverterLoader() {
- }
-
- @Override
- public void setCamelContext(CamelContext camelContext) {
- this.camelContext = camelContext;
- }
-
- @Override
- public CamelContext getCamelContext() {
- return camelContext;
- }
-
- @Override
- public void load(TypeConverterRegistry registry) throws
TypeConverterLoaderException {
- registerConverters(registry);
- }
-
- private void registerConverters(TypeConverterRegistry registry) {
- addTypeConverter(registry, io.netty.buffer.ByteBuf.class,
org.apache.camel.StreamCache.class, false,
- (type, exchange, value) ->
org.apache.camel.kafkaconnector.syslog.converters.CamelStreamCacheConverter.toByteBuf((org.apache.camel.StreamCache)
value));
- }
-
- private static void addTypeConverter(TypeConverterRegistry registry,
Class<?> toType, Class<?> fromType, boolean allowNull,
SimpleTypeConverter.ConversionMethod method) {
- registry.addTypeConverter(toType, fromType, new
SimpleTypeConverter(allowNull, method));
- }
-
-}
diff --git
a/connectors/camel-syslog-kafka-connector/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
b/connectors/camel-syslog-kafka-connector/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
deleted file mode 100644
index 541d7123f..000000000
---
a/connectors/camel-syslog-kafka-connector/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-org.apache.camel.kafkaconnector.syslog.converters.CamelStreamCacheConverterLoader
diff --git a/connectors/pom.xml b/connectors/pom.xml
index be95ede4c..a3b17bed4 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -268,6 +268,7 @@
<module>camel-elasticsearch-index-sink-kafka-connector</module>
<module>camel-elasticsearch-search-source-kafka-connector</module>
<module>camel-exec-sink-kafka-connector</module>
+ <module>camel-fhir-sink-kafka-connector</module>
<module>camel-fhir-source-kafka-connector</module>
<module>camel-file-kafka-connector</module>
<module>camel-file-watch-source-kafka-connector</module>
diff --git a/parent/pom.xml b/parent/pom.xml
index 0a4abc0f1..f6358d25e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -27,9 +27,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <kafka.version>2.8.0</kafka.version>
- <camel.version>3.19.0</camel.version>
- <camel.kamelet.catalog.version>0.10.0</camel.kamelet.catalog.version>
+ <kafka.version>3.2.1</kafka.version>
+ <camel.version>3.20.0</camel.version>
+ <camel.kamelet.catalog.version>3.20.0</camel.kamelet.catalog.version>
<apicurio.registry.version>1.3.2.Final</apicurio.registry.version>
<resteasy.version>4.5.6.Final</resteasy.version>
<version.java>11</version.java>
@@ -60,8 +60,8 @@
<gmavenplus-plugin-version>1.11.1</gmavenplus-plugin-version>
<groovy-version>3.0.12</groovy-version>
-
<itest.zookeeper.container.image>quay.io/strimzi/kafka:0.25.0-kafka-2.8.0</itest.zookeeper.container.image>
-
<itest.strimzi.container.image>quay.io/strimzi/kafka:0.25.0-kafka-2.8.0</itest.strimzi.container.image>
+
<itest.zookeeper.container.image>quay.io/strimzi/kafka:0.32.0-kafka-3.2.1</itest.zookeeper.container.image>
+
<itest.strimzi.container.image>quay.io/strimzi/kafka:0.32.0-kafka-3.2.1</itest.strimzi.container.image>
<checkstyle.failOnViolation>false</checkstyle.failOnViolation>
</properties>
diff --git a/pom.xml b/pom.xml
index c058cc898..e35154ecd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.19.0</version>
+ <version>3.20.0</version>
</parent>
<groupId>org.apache.camel.kafkaconnector</groupId>
diff --git a/tests/itests-aws-v2/pom.xml b/tests/itests-aws-v2/pom.xml
index effe13da5..359178666 100644
--- a/tests/itests-aws-v2/pom.xml
+++ b/tests/itests-aws-v2/pom.xml
@@ -119,7 +119,7 @@
<!-- Properties needed for the test:
- com.amazonaws.sdk.disableCbor is used to ensure the AWS
Kinesis reply is parseable
-->
- <argLine>${common.failsafe.args}
-Daws.cborEnabled=false</argLine>
+ <argLine>${common.failsafe.args} -Daws.cborEnabled=false
-Daws.container.startup.timeout=480</argLine>
<skipTests>${skipIntegrationTests}</skipTests>
</configuration>
</plugin>
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/cw/sink/CamelSinkAWSCWITCase.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/cw/sink/CamelSinkAWSCWITCase.java
index e03bb7513..e0fca4c28 100644
---
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/cw/sink/CamelSinkAWSCWITCase.java
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/cw/sink/CamelSinkAWSCWITCase.java
@@ -29,7 +29,7 @@ import
org.apache.camel.kafkaconnector.common.test.CamelSinkTestSupport;
import org.apache.camel.kafkaconnector.common.test.StringMessageProducer;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
-import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
+import org.apache.camel.test.infra.aws2.services.AWSServiceFactoryWithTimeout;
import org.apache.camel.test.infra.common.TestUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -53,7 +53,7 @@ import static org.junit.jupiter.api.Assertions.fail;
public class CamelSinkAWSCWITCase extends CamelSinkTestSupport {
@RegisterExtension
- public static AWSService awsService = AWSServiceFactory
+ public static AWSService awsService = AWSServiceFactoryWithTimeout
.createCloudWatchService();
private static final Logger LOG =
LoggerFactory.getLogger(CamelSinkAWSCWITCase.class);
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/ec2/sink/CamelSinkAWSEC2ITCase.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/ec2/sink/CamelSinkAWSEC2ITCase.java
index 2555833df..da5f3dd57 100644
---
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/ec2/sink/CamelSinkAWSEC2ITCase.java
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/ec2/sink/CamelSinkAWSEC2ITCase.java
@@ -31,7 +31,7 @@ import
org.apache.camel.kafkaconnector.common.test.CamelSinkTestSupport;
import org.apache.camel.kafkaconnector.common.test.StringMessageProducer;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
-import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
+import org.apache.camel.test.infra.aws2.services.AWSServiceFactoryWithTimeout;
import org.apache.camel.test.infra.common.TestUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
@@ -54,7 +54,7 @@ import static org.junit.jupiter.api.Assertions.fail;
@EnabledIfSystemProperty(named = "enable.slow.tests", matches = "true")
public class CamelSinkAWSEC2ITCase extends CamelSinkTestSupport {
@RegisterExtension
- public static AWSService awsService = AWSServiceFactory.createEC2Service();
+ public static AWSService awsService =
AWSServiceFactoryWithTimeout.createEC2Service();
private static final Logger LOG =
LoggerFactory.getLogger(CamelSinkAWSEC2ITCase.class);
private Ec2Client client;
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/iam/sink/CamelSinkAWSIAMITCase.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/iam/sink/CamelSinkAWSIAMITCase.java
index 2764969bd..bd0742863 100644
---
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/iam/sink/CamelSinkAWSIAMITCase.java
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/iam/sink/CamelSinkAWSIAMITCase.java
@@ -31,7 +31,7 @@ import
org.apache.camel.kafkaconnector.common.test.CamelSinkTestSupport;
import org.apache.camel.kafkaconnector.common.test.StringMessageProducer;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
-import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
+import org.apache.camel.test.infra.aws2.services.AWSServiceFactoryWithTimeout;
import org.apache.camel.test.infra.common.TestUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -52,7 +52,7 @@ import static org.junit.jupiter.api.Assertions.fail;
@EnabledIfSystemProperty(named = "enable.slow.tests", matches = "true")
public class CamelSinkAWSIAMITCase extends CamelSinkTestSupport {
@RegisterExtension
- public static AWSService awsService = AWSServiceFactory.createIAMService();
+ public static AWSService awsService =
AWSServiceFactoryWithTimeout.createIAMService();
private static final Logger LOG =
LoggerFactory.getLogger(CamelSinkAWSIAMITCase.class);
private IamClient client;
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kinesis/sink/CamelSinkAWSKinesisITCase.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kinesis/sink/CamelSinkAWSKinesisITCase.java
index 77f347e45..1642f83b1 100644
---
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kinesis/sink/CamelSinkAWSKinesisITCase.java
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kinesis/sink/CamelSinkAWSKinesisITCase.java
@@ -33,7 +33,7 @@ import
org.apache.camel.kafkaconnector.common.test.StringMessageProducer;
import org.apache.camel.test.infra.aws.common.AWSCommon;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
-import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
+import org.apache.camel.test.infra.aws2.services.AWSServiceFactoryWithTimeout;
import org.apache.camel.test.infra.common.TestUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -56,7 +56,7 @@ import static org.junit.jupiter.api.Assertions.fail;
@EnabledIfSystemProperty(named = "enable.slow.tests", matches = "true")
public class CamelSinkAWSKinesisITCase extends CamelSinkTestSupport {
@RegisterExtension
- public static AWSService awsService =
AWSServiceFactory.createKinesisService();
+ public static AWSService awsService =
AWSServiceFactoryWithTimeout.createKinesisService();
private static final Logger LOG =
LoggerFactory.getLogger(CamelSinkAWSKinesisITCase.class);
private String streamName;
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kinesis/source/CamelSourceAWSKinesisITCase.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kinesis/source/CamelSourceAWSKinesisITCase.java
index 8f824e228..3e87bdbd3 100644
---
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kinesis/source/CamelSourceAWSKinesisITCase.java
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kinesis/source/CamelSourceAWSKinesisITCase.java
@@ -26,7 +26,7 @@ import
org.apache.camel.kafkaconnector.common.test.TestMessageConsumer;
import org.apache.camel.test.infra.aws.common.AWSCommon;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
-import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
+import org.apache.camel.test.infra.aws2.services.AWSServiceFactoryWithTimeout;
import org.apache.camel.test.infra.common.TestUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -46,7 +46,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
@EnabledIfSystemProperty(named = "enable.slow.tests", matches = "true")
public class CamelSourceAWSKinesisITCase extends CamelSourceTestSupport {
@RegisterExtension
- public static AWSService awsService =
AWSServiceFactory.createKinesisService();
+ public static AWSService awsService =
AWSServiceFactoryWithTimeout.createKinesisService();
private String streamName;
private KinesisClient kinesisClient;
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kms/sink/CamelSinkAWSKMSITCase.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kms/sink/CamelSinkAWSKMSITCase.java
index 3aef0c39b..80699e35e 100644
---
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kms/sink/CamelSinkAWSKMSITCase.java
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kms/sink/CamelSinkAWSKMSITCase.java
@@ -30,7 +30,7 @@ import
org.apache.camel.kafkaconnector.common.test.CamelSinkTestSupport;
import org.apache.camel.kafkaconnector.common.test.StringMessageProducer;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
-import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
+import org.apache.camel.test.infra.aws2.services.AWSServiceFactoryWithTimeout;
import org.apache.camel.test.infra.common.TestUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -54,7 +54,7 @@ import static org.junit.jupiter.api.Assertions.fail;
public class CamelSinkAWSKMSITCase extends CamelSinkTestSupport {
@RegisterExtension
- public static AWSService awsService = AWSServiceFactory.createKMSService();
+ public static AWSService awsService =
AWSServiceFactoryWithTimeout.createKMSService();
private static final Logger LOG =
LoggerFactory.getLogger(CamelSinkAWSKMSITCase.class);
private String logicalName;
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/lambda/sink/CamelSinkLambdaITCase.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/lambda/sink/CamelSinkLambdaITCase.java
index 37d440a5b..7eeff1018 100644
---
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/lambda/sink/CamelSinkLambdaITCase.java
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/lambda/sink/CamelSinkLambdaITCase.java
@@ -38,7 +38,7 @@ import
org.apache.camel.kafkaconnector.common.test.AbstractTestMessageProducer;
import org.apache.camel.kafkaconnector.common.test.CamelSinkTestSupport;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
-import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
+import org.apache.camel.test.infra.aws2.services.AWSServiceFactoryWithTimeout;
import org.apache.camel.test.infra.common.TestUtils;
import org.apache.kafka.common.utils.Bytes;
import org.junit.jupiter.api.BeforeEach;
@@ -60,7 +60,7 @@ import static org.junit.jupiter.api.Assertions.fail;
@EnabledIfSystemProperty(named = "enable.slow.tests", matches = "true")
public class CamelSinkLambdaITCase extends CamelSinkTestSupport {
@RegisterExtension
- public static AWSService awsService =
AWSServiceFactory.createLambdaService();
+ public static AWSService awsService =
AWSServiceFactoryWithTimeout.createLambdaService();
private static final Logger LOG =
LoggerFactory.getLogger(CamelSinkLambdaITCase.class);
private LambdaClient client;
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/s3/sink/CamelSinkAWSS3ITCase.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/s3/sink/CamelSinkAWSS3ITCase.java
index 3818f0175..afff877d0 100644
---
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/s3/sink/CamelSinkAWSS3ITCase.java
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/s3/sink/CamelSinkAWSS3ITCase.java
@@ -33,7 +33,7 @@ import
org.apache.camel.kafkaconnector.common.test.StringMessageProducer;
import org.apache.camel.test.infra.aws.common.AWSCommon;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
-import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
+import org.apache.camel.test.infra.aws2.services.AWSServiceFactoryWithTimeout;
import org.apache.camel.test.infra.common.TestUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -56,7 +56,7 @@ import static org.junit.jupiter.api.Assertions.fail;
@EnabledIfSystemProperty(named = "enable.slow.tests", matches = "true")
public class CamelSinkAWSS3ITCase extends CamelSinkTestSupport {
@RegisterExtension
- public static AWSService service = AWSServiceFactory.createS3Service();
+ public static AWSService service =
AWSServiceFactoryWithTimeout.createS3Service();
private static final Logger LOG =
LoggerFactory.getLogger(CamelSinkAWSS3ITCase.class);
private S3Client awsS3Client;
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/s3/source/CamelSourceAWSS3ITCase.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/s3/source/CamelSourceAWSS3ITCase.java
index 1b4d2e564..c187c631d 100644
---
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/s3/source/CamelSourceAWSS3ITCase.java
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/s3/source/CamelSourceAWSS3ITCase.java
@@ -30,7 +30,7 @@ import
org.apache.camel.kafkaconnector.common.test.TestMessageConsumer;
import org.apache.camel.test.infra.aws.common.AWSCommon;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
-import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
+import org.apache.camel.test.infra.aws2.services.AWSServiceFactoryWithTimeout;
import org.apache.camel.test.infra.common.TestUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
@@ -53,7 +53,7 @@ import static org.junit.jupiter.api.Assertions.fail;
@EnabledIfSystemProperty(named = "enable.slow.tests", matches = "true")
public class CamelSourceAWSS3ITCase extends CamelSourceTestSupport {
@RegisterExtension
- public static AWSService service = AWSServiceFactory.createS3Service();
+ public static AWSService service =
AWSServiceFactoryWithTimeout.createS3Service();
private static final Logger LOG =
LoggerFactory.getLogger(CamelSourceAWSS3ITCase.class);
private S3Client awsS3Client;
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sns/sink/CamelSinkAWSSNSITCase.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sns/sink/CamelSinkAWSSNSITCase.java
index b3408d7da..5af898df5 100644
---
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sns/sink/CamelSinkAWSSNSITCase.java
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sns/sink/CamelSinkAWSSNSITCase.java
@@ -29,7 +29,7 @@ import
org.apache.camel.kafkaconnector.common.test.CamelSinkTestSupport;
import org.apache.camel.test.infra.aws.common.AWSCommon;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
-import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
+import org.apache.camel.test.infra.aws2.services.AWSServiceFactoryWithTimeout;
import org.apache.camel.test.infra.common.TestUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -48,7 +48,7 @@ import static org.junit.jupiter.api.Assertions.fail;
@EnabledIfSystemProperty(named = "enable.slow.tests", matches = "true")
public class CamelSinkAWSSNSITCase extends CamelSinkTestSupport {
@RegisterExtension
- public static AWSService service = AWSServiceFactory.createSNSService();
+ public static AWSService service =
AWSServiceFactoryWithTimeout.createSNSService();
private static final Logger LOG =
LoggerFactory.getLogger(CamelSinkAWSSNSITCase.class);
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/sink/CamelSinkAWSSQSITCase.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/sink/CamelSinkAWSSQSITCase.java
index e21b5d24a..6c098f3e5 100644
---
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/sink/CamelSinkAWSSQSITCase.java
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/sink/CamelSinkAWSSQSITCase.java
@@ -28,7 +28,7 @@ import
org.apache.camel.kafkaconnector.common.test.CamelSinkTestSupport;
import org.apache.camel.test.infra.aws.common.AWSCommon;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
-import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
+import org.apache.camel.test.infra.aws2.services.AWSServiceFactoryWithTimeout;
import org.apache.camel.test.infra.common.TestUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -49,7 +49,7 @@ import static org.junit.jupiter.api.Assertions.fail;
public class CamelSinkAWSSQSITCase extends CamelSinkTestSupport {
@RegisterExtension
- public static AWSService awsService = AWSServiceFactory.createSQSService();
+ public static AWSService awsService =
AWSServiceFactoryWithTimeout.createSQSService();
private static final Logger LOG =
LoggerFactory.getLogger(CamelSinkAWSSQSITCase.class);
private AWSSQSClient awssqsClient;
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/source/CamelSourceAWSSQSITCase.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/source/CamelSourceAWSSQSITCase.java
index 7ee73bd5d..20a163fd4 100644
---
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/source/CamelSourceAWSSQSITCase.java
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/source/CamelSourceAWSSQSITCase.java
@@ -26,7 +26,7 @@ import
org.apache.camel.kafkaconnector.common.test.TestMessageConsumer;
import org.apache.camel.test.infra.aws.common.AWSCommon;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
-import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
+import org.apache.camel.test.infra.aws2.services.AWSServiceFactoryWithTimeout;
import org.apache.camel.test.infra.common.TestUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -45,7 +45,7 @@ import static org.junit.jupiter.api.Assertions.fail;
@EnabledIfSystemProperty(named = "enable.slow.tests", matches = "true")
public class CamelSourceAWSSQSITCase extends CamelSourceTestSupport {
@RegisterExtension
- public static AWSService service = AWSServiceFactory.createSQSService();
+ public static AWSService service =
AWSServiceFactoryWithTimeout.createSQSService();
private static final Logger LOG =
LoggerFactory.getLogger(CamelSourceAWSSQSITCase.class);
private AWSSQSClient awssqsClient;
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSCloudWatchLocalContainerServiceWithTimeout.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSCloudWatchLocalContainerServiceWithTimeout.java
new file mode 100644
index 000000000..9bb377ffd
--- /dev/null
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSCloudWatchLocalContainerServiceWithTimeout.java
@@ -0,0 +1,23 @@
+/*
+ * 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.test.infra.aws2.services;
+
+public class AWSCloudWatchLocalContainerServiceWithTimeout extends
AWSLocalContainerService {
+ public AWSCloudWatchLocalContainerServiceWithTimeout() {
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:1.3.0"), new Service[]{Service.CLOUD_WATCH}));
+ }
+}
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainerWithTimeout.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainerWithTimeout.java
new file mode 100644
index 000000000..d7efdfbc4
--- /dev/null
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainerWithTimeout.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.test.infra.aws2.services;
+
+import java.time.Duration;
+
+import org.testcontainers.containers.wait.strategy.Wait;
+
+public class AWSContainerWithTimeout extends AWSContainer {
+ private static final String DEFAULT_STARTUP_TIMEOUT = "60";
+
+ public AWSContainerWithTimeout() {
+ super();
+ }
+
+ public AWSContainerWithTimeout(String imageName, Service... services) {
+ super(imageName, services);
+ }
+
+ @Override
+ protected void setupContainer() {
+ int startupTimeout =
Integer.parseInt(System.getProperty("aws.container.startup.timeout",
DEFAULT_STARTUP_TIMEOUT));
+ this.withExposedPorts(new Integer[]{4566});
+ this.waitingFor(Wait.forLogMessage(".*Ready\\.\n", 1)
+
.withStartupTimeout(Duration.ofSeconds(startupTimeout)));
+ }
+}
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSDynamodbLocalContainerServiceWithTimeout.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSDynamodbLocalContainerServiceWithTimeout.java
new file mode 100644
index 000000000..c0962f53a
--- /dev/null
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSDynamodbLocalContainerServiceWithTimeout.java
@@ -0,0 +1,23 @@
+/*
+ * 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.test.infra.aws2.services;
+
+public class AWSDynamodbLocalContainerServiceWithTimeout extends
AWSLocalContainerService {
+ public AWSDynamodbLocalContainerServiceWithTimeout() {
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:1.3.0"), new Service[]{Service.DYNAMODB}));
+ }
+}
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSEC2LocalContainerServiceWithTimeout.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSEC2LocalContainerServiceWithTimeout.java
new file mode 100644
index 000000000..be4a26c5f
--- /dev/null
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSEC2LocalContainerServiceWithTimeout.java
@@ -0,0 +1,23 @@
+/*
+ * 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.test.infra.aws2.services;
+
+public class AWSEC2LocalContainerServiceWithTimeout extends
AWSLocalContainerService {
+ public AWSEC2LocalContainerServiceWithTimeout() {
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:1.3.0"), new Service[]{Service.EC2}));
+ }
+}
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSEventBridgeLocalContainerServiceWithTimeout.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSEventBridgeLocalContainerServiceWithTimeout.java
new file mode 100644
index 000000000..8f690e4ce
--- /dev/null
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSEventBridgeLocalContainerServiceWithTimeout.java
@@ -0,0 +1,23 @@
+/*
+ * 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.test.infra.aws2.services;
+
+public class AWSEventBridgeLocalContainerServiceWithTimeout extends
AWSLocalContainerService {
+ public AWSEventBridgeLocalContainerServiceWithTimeout() {
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:1.3.0"), new Service[]{Service.EVENT_BRIDGE}));
+ }
+}
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSIAMLocalContainerServiceWithTimeout.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSIAMLocalContainerServiceWithTimeout.java
new file mode 100644
index 000000000..a356ab145
--- /dev/null
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSIAMLocalContainerServiceWithTimeout.java
@@ -0,0 +1,23 @@
+/*
+ * 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.test.infra.aws2.services;
+
+public class AWSIAMLocalContainerServiceWithTimeout extends
AWSLocalContainerService {
+ public AWSIAMLocalContainerServiceWithTimeout() {
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:1.3.0"), new Service[]{Service.IAM}));
+ }
+}
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSKMSLocalContainerServiceWithTimeout.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSKMSLocalContainerServiceWithTimeout.java
new file mode 100644
index 000000000..b791d7744
--- /dev/null
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSKMSLocalContainerServiceWithTimeout.java
@@ -0,0 +1,23 @@
+/*
+ * 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.test.infra.aws2.services;
+
+public class AWSKMSLocalContainerServiceWithTimeout extends
AWSLocalContainerService {
+ public AWSKMSLocalContainerServiceWithTimeout() {
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:1.3.0"), new Service[]{Service.KMS}));
+ }
+}
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSKinesisLocalContainerServiceWithTimeout.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSKinesisLocalContainerServiceWithTimeout.java
new file mode 100644
index 000000000..7254fe5e7
--- /dev/null
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSKinesisLocalContainerServiceWithTimeout.java
@@ -0,0 +1,33 @@
+/*
+ * 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.test.infra.aws2.services;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import software.amazon.awssdk.core.SdkSystemSetting;
+
+public class AWSKinesisLocalContainerServiceWithTimeout extends
AWSLocalContainerService {
+ private static final Logger LOG =
LoggerFactory.getLogger(AWSKinesisLocalContainerService.class);
+
+ public AWSKinesisLocalContainerServiceWithTimeout() {
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:1.3.0"), new Service[]{Service.KINESIS}));
+ }
+
+ static {
+ System.setProperty(SdkSystemSetting.CBOR_ENABLED.property(), "false");
+ }
+}
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSLambdaLocalContainerServiceWithTimeout.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSLambdaLocalContainerServiceWithTimeout.java
new file mode 100644
index 000000000..51dd5b3ff
--- /dev/null
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSLambdaLocalContainerServiceWithTimeout.java
@@ -0,0 +1,23 @@
+/*
+ * 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.test.infra.aws2.services;
+
+public class AWSLambdaLocalContainerServiceWithTimeout extends
AWSLocalContainerService {
+ public AWSLambdaLocalContainerServiceWithTimeout() {
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:1.3.0"), new Service[]{Service.LAMBDA}));
+ }
+}
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSS3LocalContainerServiceWithTimeout.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSS3LocalContainerServiceWithTimeout.java
new file mode 100644
index 000000000..7df8a8de4
--- /dev/null
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSS3LocalContainerServiceWithTimeout.java
@@ -0,0 +1,23 @@
+/*
+ * 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.test.infra.aws2.services;
+
+public class AWSS3LocalContainerServiceWithTimeout extends
AWSLocalContainerService {
+ public AWSS3LocalContainerServiceWithTimeout() {
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:1.3.0"), new Service[]{Service.S3}));
+ }
+}
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSNSLocalContainerServiceWithTimeout.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSNSLocalContainerServiceWithTimeout.java
new file mode 100644
index 000000000..f29754753
--- /dev/null
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSNSLocalContainerServiceWithTimeout.java
@@ -0,0 +1,23 @@
+/*
+ * 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.test.infra.aws2.services;
+
+public class AWSSNSLocalContainerServiceWithTimeout extends
AWSLocalContainerService {
+ public AWSSNSLocalContainerServiceWithTimeout() {
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:1.3.0"), new Service[]{Service.SNS}));
+ }
+}
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSQSLocalContainerServiceWithTimeout.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSQSLocalContainerServiceWithTimeout.java
new file mode 100644
index 000000000..71493e353
--- /dev/null
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSQSLocalContainerServiceWithTimeout.java
@@ -0,0 +1,23 @@
+/*
+ * 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.test.infra.aws2.services;
+
+public class AWSSQSLocalContainerServiceWithTimeout extends
AWSLocalContainerService {
+ public AWSSQSLocalContainerServiceWithTimeout() {
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:1.3.0"), new Service[]{Service.SQS}));
+ }
+}
\ No newline at end of file
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSTSLocalContainerServiceWithTimeout.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSTSLocalContainerServiceWithTimeout.java
new file mode 100644
index 000000000..5135959f0
--- /dev/null
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSTSLocalContainerServiceWithTimeout.java
@@ -0,0 +1,23 @@
+/*
+ * 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.test.infra.aws2.services;
+
+public class AWSSTSLocalContainerServiceWithTimeout extends
AWSLocalContainerService {
+ public AWSSTSLocalContainerServiceWithTimeout() {
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:1.3.0"), new Service[]{Service.STS}));
+ }
+}
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSServiceFactoryWithTimeout.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSServiceFactoryWithTimeout.java
new file mode 100644
index 000000000..fcd4e378b
--- /dev/null
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSServiceFactoryWithTimeout.java
@@ -0,0 +1,85 @@
+/*
+ * 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.test.infra.aws2.services;
+
+import java.util.function.Supplier;
+
+import org.apache.camel.test.infra.aws.common.services.AWSService;
+import org.apache.camel.test.infra.common.services.SimpleTestServiceBuilder;
+
+
+public final class AWSServiceFactoryWithTimeout {
+ private AWSServiceFactoryWithTimeout() {
+ }
+
+ public static <T extends AWSService> SimpleTestServiceBuilder<T> builder()
{
+ return new SimpleTestServiceBuilder("aws");
+ }
+
+ private static AWSService createService(Supplier<AWSService> supplier) {
+ return
(AWSService)builder().addRemoteMapping(AWSRemoteService::new).addLocalMapping(supplier).withPropertyNameFormat("%s-service.instance.type").build();
+ }
+
+ public static AWSService createKinesisService() {
+ return
(AWSService)builder().addRemoteMapping(AWSRemoteService::new).addLocalMapping(AWSKinesisLocalContainerServiceWithTimeout::new).withPropertyNameFormat("%s-service.kinesis.instance.type").build();
+ }
+
+ public static AWSService createSQSService() {
+ return createService(AWSSQSLocalContainerServiceWithTimeout::new);
+ }
+
+ public static AWSService createS3Service() {
+ return createService(AWSS3LocalContainerServiceWithTimeout::new);
+ }
+
+ public static AWSService createSNSService() {
+ return createService(AWSSNSLocalContainerServiceWithTimeout::new);
+ }
+
+ public static AWSService createCloudWatchService() {
+ return
createService(AWSCloudWatchLocalContainerServiceWithTimeout::new);
+ }
+
+ public static AWSService createEC2Service() {
+ return createService(AWSEC2LocalContainerServiceWithTimeout::new);
+ }
+
+ public static AWSService createEventBridgeService() {
+ return
createService(AWSEventBridgeLocalContainerServiceWithTimeout::new);
+ }
+
+ public static AWSService createIAMService() {
+ return createService(AWSIAMLocalContainerServiceWithTimeout::new);
+ }
+
+ public static AWSService createKMSService() {
+ return createService(AWSKMSLocalContainerServiceWithTimeout::new);
+ }
+
+ public static AWSService createLambdaService() {
+ return createService(AWSLambdaLocalContainerServiceWithTimeout::new);
+ }
+
+ public static AWSService createSTSService() {
+ return createService(AWSSTSLocalContainerServiceWithTimeout::new);
+ }
+
+ public static AWSService createDynamodbService() {
+ return createService(AWSDynamodbLocalContainerServiceWithTimeout::new);
+ }
+
+}
diff --git a/tests/itests-hdfs/pom.xml b/tests/itests-hdfs/pom.xml
index a3a5d7431..ab018df8c 100644
--- a/tests/itests-hdfs/pom.xml
+++ b/tests/itests-hdfs/pom.xml
@@ -52,6 +52,41 @@
<version>${camel.version}</version>
<type>test-jar</type>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-servlet</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>2.28.2</version>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -66,6 +101,10 @@
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
diff --git
a/tests/itests-hdfs/src/test/java/org/apache/camel/kafkaconnector/hdfs/sink/CamelSinkHDFSITCase.java
b/tests/itests-hdfs/src/test/java/org/apache/camel/kafkaconnector/hdfs/sink/CamelSinkHDFSITCase.java
index 017818742..7784af41e 100644
---
a/tests/itests-hdfs/src/test/java/org/apache/camel/kafkaconnector/hdfs/sink/CamelSinkHDFSITCase.java
+++
b/tests/itests-hdfs/src/test/java/org/apache/camel/kafkaconnector/hdfs/sink/CamelSinkHDFSITCase.java
@@ -47,7 +47,7 @@ import static org.junit.jupiter.api.Assertions.fail;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class CamelSinkHDFSITCase extends CamelSinkTestSupport {
@RegisterExtension
- public static HDFSService hdfsService = HDFSServiceFactory.createService();
+ public static HDFSService hdfsService =
HDFSServiceFactory.createSingletonService();
private static final Logger LOG =
LoggerFactory.getLogger(CamelSinkHDFSITCase.class);
diff --git
a/tests/itests-https/src/test/java/org/apache/camel/kafkaconnector/https/sink/CamelSinkHTTPSITCase.java
b/tests/itests-https/src/test/java/org/apache/camel/kafkaconnector/https/sink/CamelSinkHTTPSITCase.java
index a82101b64..0db13e0b1 100644
---
a/tests/itests-https/src/test/java/org/apache/camel/kafkaconnector/https/sink/CamelSinkHTTPSITCase.java
+++
b/tests/itests-https/src/test/java/org/apache/camel/kafkaconnector/https/sink/CamelSinkHTTPSITCase.java
@@ -112,12 +112,12 @@ public class CamelSinkHTTPSITCase extends
CamelSinkTestSupport {
@Timeout(60)
public void testBasicSendReceive() throws Exception {
mockWebService.enqueueResponses(expect);
-
+
LOG.info("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:
{}", toPath("client-truststore.jks"));
String uri = mockServer.getHostName() + ":" + mockServer.getPort() +
"/ckc";
ConnectorPropertyFactory connectorPropertyFactory =
CamelHTTPSPropertyFactory.basic()
.withTopics(topicName)
.withHttpUri(uri)
- .withSslContextParameters("scp",
toPath("client-truststore.jks"), "secret")
+ .withSslContextParameters("scp", "file:" +
toPath("client-truststore.jks"), "secret")
// let's skip host verification as hostname may vary depending
on test env
.withX509HostnameVerifier("x509HostnameVerifier",
NoopHostnameVerifier.class);
@@ -134,7 +134,7 @@ public class CamelSinkHTTPSITCase extends
CamelSinkTestSupport {
.withTopics(topicName)
.withHttpUri(uri)
.withHttpMethod("POST")
- .withSslContextParameters("scp",
toPath("client-truststore.jks"), "secret")
+ .withSslContextParameters("scp", "file:" +
toPath("client-truststore.jks"), "secret")
// let's skip host verification as hostname may vary depending
on test env
.withX509HostnameVerifier("x509HostnameVerifier",
NoopHostnameVerifier.class);
@@ -148,7 +148,7 @@ public class CamelSinkHTTPSITCase extends
CamelSinkTestSupport {
ConnectorPropertyFactory connectorPropertyFactory =
CamelHTTPSPropertyFactory.basic()
.withTopics(topicName)
- .withSslContextParameters("scp",
toPath("client-truststore.jks"), "secret")
+ .withSslContextParameters("scp", "file:" +
toPath("client-truststore.jks"), "secret")
// let's skip host verification as hostname may vary depending
on test env
.withX509HostnameVerifier("x509HostnameVerifier",
NoopHostnameVerifier.class)
.withUrl(mockServer.getHostName(), mockServer.getPort(), "ckc")
