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 e835377697e8e6e74adb893733623e10ccedfd39
Author: Andrea Tarocchi <andrea.taroc...@gmail.com>
AuthorDate: Mon Feb 12 16:06:06 2024 +0100
Updated to camel 4.3.0
---
parent/pom.xml | 7 ++-
pom.xml | 2 +-
.../aws/v2/clients/AWSSQSClient.java | 13 +++++-
.../aws/v2/lambda/sink/CamelSinkLambdaITCase.java | 22 ++++-----
.../aws/v2/sns/sink/CamelSinkAWSSNSITCase.java | 4 +-
.../aws/v2/sqs/source/CamelSourceAWSSQSITCase.java | 2 +-
...CloudWatchLocalContainerServiceWithTimeout.java | 2 +-
...WSDynamodbLocalContainerServiceWithTimeout.java | 2 +-
.../AWSEC2LocalContainerServiceWithTimeout.java | 2 +-
...ventBridgeLocalContainerServiceWithTimeout.java | 2 +-
.../AWSIAMLocalContainerServiceWithTimeout.java | 2 +-
.../AWSKMSLocalContainerServiceWithTimeout.java | 2 +-
...AWSKinesisLocalContainerServiceWithTimeout.java | 2 +-
.../AWSLambdaLocalContainerServiceWithTimeout.java | 2 +-
.../AWSS3LocalContainerServiceWithTimeout.java | 2 +-
.../AWSSNSLocalContainerServiceWithTimeout.java | 2 +-
.../AWSSQSLocalContainerServiceWithTimeout.java | 2 +-
.../AWSSTSLocalContainerServiceWithTimeout.java | 2 +-
.../kafka/ByteArrayProducerPropertyFactory.java | 52 ++++++++++++++++++++++
.../hdfs/sink/CamelSinkHDFSITCase.java | 2 +
tooling/pom.xml | 2 +-
21 files changed, 97 insertions(+), 33 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 4ed1d3cce4..83182af4d3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -28,8 +28,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<kafka.version>3.5.1</kafka.version>
- <camel.version>4.0.0</camel.version>
- <camel.kamelet.catalog.version>4.0.0</camel.kamelet.catalog.version>
+ <camel.version>4.3.0</camel.version>
+ <camel.kamelet.catalog.version>4.3.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>17</version.java>
@@ -58,8 +58,7 @@
<version.plexus.build.api>0.0.7</version.plexus.build.api>
<mycila-license-version>3.0</mycila-license-version>
- <gmavenplus-plugin-version>1.11.1</gmavenplus-plugin-version>
- <groovy-version>3.0.12</groovy-version>
+ <groovy-version>3.0.20</groovy-version>
<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>
diff --git a/pom.xml b/pom.xml
index 6e788f1ddf..d2fc9e8214 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>4.0.0</version>
+ <version>4.3.0</version>
</parent>
<groupId>org.apache.camel.kafkaconnector</groupId>
diff --git
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/clients/AWSSQSClient.java
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/clients/AWSSQSClient.java
index b4c0d33c84..f0ec4090a8 100644
---
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/clients/AWSSQSClient.java
+++
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/clients/AWSSQSClient.java
@@ -27,9 +27,12 @@ import
software.amazon.awssdk.services.sqs.model.CreateQueueRequest;
import software.amazon.awssdk.services.sqs.model.CreateQueueResponse;
import software.amazon.awssdk.services.sqs.model.DeleteQueueRequest;
import software.amazon.awssdk.services.sqs.model.DeleteQueueResponse;
+import software.amazon.awssdk.services.sqs.model.GetQueueAttributesRequest;
+import software.amazon.awssdk.services.sqs.model.GetQueueAttributesResponse;
import software.amazon.awssdk.services.sqs.model.GetQueueUrlRequest;
import software.amazon.awssdk.services.sqs.model.GetQueueUrlResponse;
import software.amazon.awssdk.services.sqs.model.Message;
+import software.amazon.awssdk.services.sqs.model.QueueAttributeName;
import software.amazon.awssdk.services.sqs.model.QueueDoesNotExistException;
import software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest;
import software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse;
@@ -56,7 +59,6 @@ public class AWSSQSClient {
return getQueueUrlResult.queueUrl();
}
-
public String createQueue(String queue) {
final CreateQueueRequest createFifoQueueRequest =
CreateQueueRequest.builder()
.queueName(queue)
@@ -161,4 +163,13 @@ public class AWSSQSClient {
return queueUrl;
}
+
+ public String getQueueArnFromUrl(String queueUrl) {
+ GetQueueAttributesRequest getQueueAttributesRequest =
GetQueueAttributesRequest.builder()
+ .queueUrl(queueUrl)
+ .attributeNames(QueueAttributeName.QUEUE_ARN).build();
+ GetQueueAttributesResponse getQueueAttributesResponse =
sqs.getQueueAttributes(getQueueAttributesRequest);
+
+ return
getQueueAttributesResponse.attributes().get(QueueAttributeName.QUEUE_ARN);
+ }
}
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 7eeff1018b..aceaa5ed69 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
@@ -29,7 +29,7 @@ import java.util.zip.ZipOutputStream;
import org.apache.camel.kafkaconnector.CamelSinkTask;
import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
-import
org.apache.camel.kafkaconnector.common.clients.kafka.ByteProducerPropertyFactory;
+import
org.apache.camel.kafkaconnector.common.clients.kafka.ByteArrayProducerPropertyFactory;
import
org.apache.camel.kafkaconnector.common.clients.kafka.ConsumerPropertyFactory;
import
org.apache.camel.kafkaconnector.common.clients.kafka.DefaultConsumerPropertyFactory;
import org.apache.camel.kafkaconnector.common.clients.kafka.KafkaClient;
@@ -40,7 +40,6 @@ 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.AWSServiceFactoryWithTimeout;
import org.apache.camel.test.infra.common.TestUtils;
-import org.apache.kafka.common.utils.Bytes;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
@@ -70,32 +69,33 @@ public class CamelSinkLambdaITCase extends
CamelSinkTestSupport {
private final int expect = 1;
- private static class CustomProducer extends
AbstractTestMessageProducer<Bytes> {
+ private static class CustomProducer extends
AbstractTestMessageProducer<byte[]> {
public CustomProducer(String bootstrapServer, String topicName, int
count) {
super(bootstrapServer, topicName, count);
}
@Override
- protected KafkaClient<String, Bytes> createKafkaClient(String
bootstrapServer) {
+ protected KafkaClient<String, byte[]> createKafkaClient(String
bootstrapServer) {
ConsumerPropertyFactory consumerPropertyFactory = new
DefaultConsumerPropertyFactory(bootstrapServer);
- ProducerPropertyFactory producerPropertyFactory = new
ByteProducerPropertyFactory(bootstrapServer);
+ ProducerPropertyFactory producerPropertyFactory = new
ByteArrayProducerPropertyFactory(bootstrapServer);
return new KafkaClient<>(consumerPropertyFactory,
producerPropertyFactory);
}
@Override
- public Bytes testMessageContent(int current) {
+ public byte[] testMessageContent(int current) {
try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
ZipOutputStream zip = new ZipOutputStream(out);
- ZipEntry entry = new ZipEntry("test");
+ ZipEntry entry = new ZipEntry("test.class");
zip.putNextEntry(entry);
zip.write("hello test".getBytes());
zip.closeEntry();
zip.finish();
- return Bytes.wrap(out.toByteArray());
+// return Bytes.wrap(out.toByteArray());
+ return out.toByteArray();
} catch (IOException e) {
LOG.error("I/O error writing zip entry: {}", e.getMessage(),
e);
fail("I/O error writing zip entry");
@@ -105,16 +105,16 @@ public class CamelSinkLambdaITCase extends
CamelSinkTestSupport {
}
@Override
- public Map<String, String> messageHeaders(Bytes text, int current) {
+ public Map<String, String> messageHeaders(byte[] text, int current) {
Map<String, String> headers = new HashMap<>();
headers.put(CamelSinkTask.HEADER_CAMEL_PREFIX +
"CamelAwsLambdaOperation",
"createFunction");
headers.put(CamelSinkTask.HEADER_CAMEL_PREFIX +
"CamelAwsLambdaRole",
- "admin");
+ "arn:aws:iam::123456789012:role/admin");
headers.put(CamelSinkTask.HEADER_CAMEL_PREFIX +
"CamelAwsLambdaRuntime",
- "java8");
+
software.amazon.awssdk.services.lambda.model.Runtime.JAVA8.toString());
headers.put(CamelSinkTask.HEADER_CAMEL_PREFIX +
"CamelAwsLambdaHandler",
"org.apache.camel.kafkaconnector.SomeHandler");
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 5af898df5c..87a2528f6c 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
@@ -74,7 +74,7 @@ public class CamelSinkAWSSNSITCase extends
CamelSinkTestSupport {
awsSnsClient = new AWSSNSClient(AWSSDKClientUtils.newSNSClient());
queueName = AWSCommon.DEFAULT_SQS_QUEUE_FOR_SNS + "-" +
TestUtils.randomWithRange(0, 1000);
- sqsQueueUrl = awsSqsClient.createQueue(queueName);
+ sqsQueueUrl = awsSqsClient.getOrCreateQueue(queueName);
LOG.info("Created SQS queue {}", sqsQueueUrl);
@@ -82,7 +82,7 @@ public class CamelSinkAWSSNSITCase extends
CamelSinkTestSupport {
LOG.info("Created SNS topic {}", snsTopicUrl);
- awsSnsClient.subscribeSQS(snsTopicUrl, sqsQueueUrl);
+ awsSnsClient.subscribeSQS(snsTopicUrl,
awsSqsClient.getQueueArnFromUrl(sqsQueueUrl));
LOG.info("Created subscription between SQS queue {} and SNS topic {}",
sqsQueueUrl, snsTopicUrl);
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 20a163fd41..692f6a7c61 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
@@ -67,7 +67,7 @@ public class CamelSourceAWSSQSITCase extends
CamelSourceTestSupport {
queueName = AWSCommon.BASE_SQS_QUEUE_NAME + "-" +
TestUtils.randomWithRange(0, 1000);
// TODO: this is a work-around for CAMEL-15833
- awssqsClient.createQueue(queueName);
+ awssqsClient.getOrCreateQueue(queueName);
}
@AfterEach
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
index 9bb377ffdf..6ef9c1a8e5 100644
---
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
@@ -18,6 +18,6 @@ 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}));
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:3.0.2"), new Service[]{Service.CLOUD_WATCH}));
}
}
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
index c0962f53aa..f04091dc90 100644
---
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
@@ -18,6 +18,6 @@ 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}));
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:3.0.2"), 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
index be4a26c5f8..653eb49dd2 100644
---
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
@@ -18,6 +18,6 @@ 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}));
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:3.0.2"), 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
index 8f690e4ce6..69b26b2b43 100644
---
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
@@ -18,6 +18,6 @@ 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}));
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:3.0.2"), 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
index a356ab1458..ab221064fd 100644
---
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
@@ -18,6 +18,6 @@ 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}));
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:3.0.2"), 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
index b791d77448..cf12767c26 100644
---
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
@@ -18,6 +18,6 @@ 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}));
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:3.0.2"), 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
index 7254fe5e75..994087a9f1 100644
---
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
@@ -24,7 +24,7 @@ public class AWSKinesisLocalContainerServiceWithTimeout
extends AWSLocalContaine
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}));
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:3.0.2"), new Service[]{Service.KINESIS}));
}
static {
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
index 51dd5b3ff3..a205118842 100644
---
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
@@ -18,6 +18,6 @@ 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}));
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:1.4.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
index 7df8a8de43..6d08784990 100644
---
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
@@ -18,6 +18,6 @@ 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}));
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:3.0.2"), 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
index f297547538..c46440e80d 100644
---
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
@@ -18,6 +18,6 @@ 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}));
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:3.0.2"), 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
index 71493e3533..8f71a75820 100644
---
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
@@ -18,6 +18,6 @@ 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}));
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:3.0.2"), 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
index 5135959f01..0d27ce46e8 100644
---
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
@@ -18,6 +18,6 @@ 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}));
+ super(new AWSContainerWithTimeout(System.getProperty("aws.container",
"localstack/localstack:3.0.2"), new Service[]{Service.STS}));
}
}
diff --git
a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/clients/kafka/ByteArrayProducerPropertyFactory.java
b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/clients/kafka/ByteArrayProducerPropertyFactory.java
new file mode 100644
index 0000000000..4159cae4ea
--- /dev/null
+++
b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/clients/kafka/ByteArrayProducerPropertyFactory.java
@@ -0,0 +1,52 @@
+/*
+ * 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.kafkaconnector.common.clients.kafka;
+
+import java.util.Properties;
+import java.util.UUID;
+
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.common.serialization.ByteArraySerializer;
+import org.apache.kafka.common.serialization.StringSerializer;
+
+public class ByteArrayProducerPropertyFactory implements
ProducerPropertyFactory {
+ private final String bootstrapServer;
+
+ /**
+ * Constructs the properties using the given bootstrap server
+ * @param bootstrapServer the address of the server in the format
+ * PLAINTEXT://${address}:${port}
+ */
+ public ByteArrayProducerPropertyFactory(String bootstrapServer) {
+ this.bootstrapServer = bootstrapServer;
+ }
+
+ @Override
+ public Properties getProperties() {
+ Properties props = new Properties();
+
+ props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServer);
+ props.put(ProducerConfig.CLIENT_ID_CONFIG,
UUID.randomUUID().toString());
+ props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG,
+ StringSerializer.class.getName());
+ props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
+ ByteArraySerializer.class.getName());
+
+ return props;
+ }
+}
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 cb7634673c..42ecda5129 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
@@ -31,6 +31,7 @@ import
org.apache.camel.test.infra.hdfs.v2.services.HDFSService;
import org.apache.camel.test.infra.hdfs.v2.services.HDFSServiceFactory;
import org.apache.hadoop.fs.LocatedFileStatus;
import org.apache.hadoop.fs.Path;
+import org.junit.Ignore;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -45,6 +46,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+@Ignore("Waiting forhttps://issues.apache.org/jira/browse/CAMEL-20399 to be
released i.e. camel 4.4.0")
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class CamelSinkHDFSITCase extends CamelSinkTestSupport {
@RegisterExtension
diff --git a/tooling/pom.xml b/tooling/pom.xml
index d3777ba9ea..c13a6954c9 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -50,7 +50,7 @@
<itf-jupiter-extension-version>0.9.0</itf-jupiter-extension-version>
<jakarta-jaxb-version>2.3.2</jakarta-jaxb-version>
<jandex-version>2.1.1.Final</jandex-version>
- <mvel-version>2.4.12.Final</mvel-version>
+ <mvel-version>2.5.2.Final</mvel-version>
<roaster-version>2.20.1.Final</roaster-version>
</properties>
