Update the S3 source connector to use a later version of Kafka

Signed-off-by: Aindriu Lavelle <[email protected]>
Aiven-Open · Jan 10, 2025 · cd43bb3 · cd43bb3
1 parent b4475c9
commit cd43bb3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/s3-source-connector/build.gradle.kts b/s3-source-connector/build.gradle.kts
@@ -21,7 +21,7 @@ plugins { id("aiven-apache-kafka-connectors-all.java-conventions") }
 val amazonS3Version by extra("2.29.34")
 val amazonSTSVersion by extra("2.29.34")
 val s3mockVersion by extra("0.2.6")
-val testKafkaVersion by extra("3.7.1")
+val kafkaVersion by extra("3.3.0")
 
 val integrationTest: SourceSet =
     sourceSets.create("integrationTest") {
@@ -62,8 +62,8 @@ idea {
 }
 
 dependencies {
-  compileOnly(apache.kafka.connect.api)
-  compileOnly(apache.kafka.connect.runtime)
+  compileOnly("org.apache.kafka:connect-api:$kafkaVersion")
+  compileOnly("org.apache.kafka:connect-runtime:$kafkaVersion")
 
   implementation(project(":commons"))
   implementation(project(":s3-commons"))
@@ -80,9 +80,9 @@ dependencies {
   testImplementation(compressionlibs.snappy)
   testImplementation(compressionlibs.zstd.jni)
 
-  testImplementation(apache.kafka.connect.api)
-  testImplementation(apache.kafka.connect.runtime)
-  testImplementation(apache.kafka.connect.json)
+  testImplementation("org.apache.kafka:connect-api:$kafkaVersion")
+  testImplementation("org.apache.kafka:connect-runtime:$kafkaVersion")
+  testImplementation("org.apache.kafka:connect-json:$kafkaVersion")
 
   testImplementation(testinglibs.junit.jupiter)
   testImplementation(testinglibs.assertj.core)
@@ -183,11 +183,11 @@ dependencies {
     exclude(group = "io.netty", module = "netty")
   }
 
-  integrationTestImplementation("org.apache.kafka:connect-runtime:${testKafkaVersion}:test")
-  integrationTestImplementation("org.apache.kafka:connect-runtime:${testKafkaVersion}")
-  integrationTestImplementation("org.apache.kafka:kafka-clients:${testKafkaVersion}:test")
-  integrationTestImplementation("org.apache.kafka:kafka_2.13:${testKafkaVersion}:test")
-  integrationTestImplementation("org.apache.kafka:kafka_2.13:${testKafkaVersion}")
+  integrationTestImplementation("org.apache.kafka:connect-runtime:${kafkaVersion}:test")
+  integrationTestImplementation("org.apache.kafka:connect-runtime:${kafkaVersion}")
+  integrationTestImplementation("org.apache.kafka:kafka-clients:${kafkaVersion}:test")
+  integrationTestImplementation("org.apache.kafka:kafka_2.13:${kafkaVersion}:test")
+  integrationTestImplementation("org.apache.kafka:kafka_2.13:${kafkaVersion}")
 
   // Make test utils from 'test' available in 'integration-test'
   integrationTestImplementation(sourceSets["test"].output)

diff --git a/...rce-connector/src/main/java/io/aiven/kafka/connect/s3/source/utils/AWSV2SourceClient.java b/...rce-connector/src/main/java/io/aiven/kafka/connect/s3/source/utils/AWSV2SourceClient.java
@@ -28,7 +28,7 @@
 import io.aiven.kafka.connect.s3.source.config.S3SourceConfig;
 
 import org.apache.commons.io.function.IOSupplier;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import software.amazon.awssdk.core.ResponseBytes;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;