Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Kafka 3.6 #51

Merged
merged 3 commits into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id("com.bakdata.release") version "1.4.0"
id("com.bakdata.sonar") version "1.4.0"
id("com.bakdata.sonatype") version "1.4.0"
id("com.bakdata.sonatype") version "1.4.1"
id("io.freefair.lombok") version "8.4"
}

Expand Down
13 changes: 6 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ version=2.7.1-SNAPSHOT
org.gradle.caching=true
org.gradle.parallel=true
org.gradle.jvmargs=-Xmx2048m
kafkaVersion=3.5.2
confluentVersion=7.5.1
junitVersion=5.10.1
log4jVersion=2.22.1
assertJVersion=3.25.1
joolVersion=0.9.14
testContainersVersion=1.19.3
kafkaVersion=3.6.1
confluentVersion=7.6.0
junitVersion=5.11.4
log4jVersion=2.24.3
assertJVersion=3.27.2
testContainersVersion=1.20.4
8 changes: 3 additions & 5 deletions large-message-connect/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,17 @@ dependencies {
api(group = "org.apache.kafka", name = "connect-api", version = kafkaVersion)
compileOnly(group = "org.apache.kafka", name = "connect-runtime", version = kafkaVersion)

testImplementation(project(":large-message-serde"))
val junitVersion: String by project
testRuntimeOnly(group = "org.junit.jupiter", name = "junit-jupiter-engine", version = junitVersion)
testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = junitVersion)
testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-params", version = junitVersion)
testRuntimeOnly(group = "org.junit.jupiter", name = "junit-jupiter-engine", version = junitVersion)
testImplementation(project(":large-message-serde"))
val assertJVersion: String by project
testImplementation(group = "org.assertj", name = "assertj-core", version = assertJVersion)

val log4jVersion: String by project
testImplementation(group = "org.apache.logging.log4j", name = "log4j-slf4j2-impl", version = log4jVersion)
val joolVersion: String by project
testImplementation(group = "org.jooq", name = "jool-java-8", version = joolVersion)
testImplementation(group = "net.mguenther.kafka", name = "kafka-junit", version = "3.5.0") {
testImplementation(group = "net.mguenther.kafka", name = "kafka-junit", version = "3.6.0") {
exclude(group = "org.slf4j", module = "slf4j-log4j12")
}
testImplementation(group = "org.apache.kafka", name = "connect-file", version = kafkaVersion)
Expand Down
16 changes: 8 additions & 8 deletions large-message-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -33,28 +33,28 @@ dependencies {
val confluentVersion: String by project
api(group = "io.confluent", name = "common-config", version = confluentVersion)

implementation(group = "org.slf4j", name = "slf4j-api", version = "2.0.10")
val awsVersion = "2.22.10"
implementation(group = "org.slf4j", name = "slf4j-api", version = "2.0.16")
val awsVersion = "2.29.4"
api(group = "software.amazon.awssdk", name = "s3", version = awsVersion)
api(group = "software.amazon.awssdk", name = "sts", version = awsVersion)
api(group = "com.azure", name = "azure-storage-blob", version = "12.25.1")
api(group = "com.google.cloud", name = "google-cloud-storage", version = "2.30.1")
implementation(group = "com.google.guava", name = "guava", version = "33.0.0-jre")
api(group = "com.azure", name = "azure-storage-blob", version = "12.29.0")
api(group = "com.google.cloud", name = "google-cloud-storage", version = "2.46.0")
implementation(group = "com.google.guava", name = "guava", version = "33.4.0-jre")

val junitVersion: String by project
testRuntimeOnly(group = "org.junit.jupiter", name = "junit-jupiter-engine", version = junitVersion)
testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = junitVersion)
testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-params", version = junitVersion)
testRuntimeOnly(group = "org.junit.jupiter", name = "junit-jupiter-engine", version = junitVersion)
val assertJVersion: String by project
testImplementation(group = "org.assertj", name = "assertj-core", version = assertJVersion)
val mockitoVersion = "5.8.0"
val mockitoVersion = "5.15.2"
testImplementation(group = "org.mockito", name = "mockito-core", version = mockitoVersion)
testImplementation(group = "org.mockito", name = "mockito-junit-jupiter", version = mockitoVersion)

val log4jVersion: String by project
testImplementation(group = "org.apache.logging.log4j", name = "log4j-slf4j2-impl", version = log4jVersion)
testImplementation(group = "com.google.cloud", name = "google-cloud-nio", version = "0.127.28")
val testContainersVersion: String by project
testFixturesApi(group = "org.testcontainers", name = "junit-jupiter", version = testContainersVersion)
testFixturesImplementation(group = "org.testcontainers", name = "localstack", version = testContainersVersion)
testImplementation(group = "com.google.cloud", name = "google-cloud-nio", version = "0.127.8")
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* MIT License
*
* Copyright (c) 2022 bakdata
* Copyright (c) 2025 bakdata
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -57,7 +57,6 @@
import software.amazon.awssdk.services.s3.S3ClientBuilder;
import software.amazon.awssdk.services.sts.StsClient;
import software.amazon.awssdk.services.sts.auth.StsAssumeRoleCredentialsProvider;
import software.amazon.awssdk.services.sts.model.AssumeRoleRequest;

/**
* This class provides default configuration options for blob storage backed data. It offers configuration of the
Expand Down Expand Up @@ -339,11 +338,10 @@ private Optional<AwsCredentialsProvider> getAmazonCredentialsProvider() {

if (!isEmpty(roleExternalId)) {
final AwsCredentialsProvider roleProvider = StsAssumeRoleCredentialsProvider.builder()
.refreshRequest(AssumeRoleRequest.builder()
.refreshRequest(builder -> builder
.roleArn(roleArn)
.roleSessionName(roleSessionName)
.externalId(roleExternalId)
.build())
.externalId(roleExternalId))
.stsClient(StsClient.create())
.build();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* MIT License
*
* Copyright (c) 2024 bakdata
* Copyright (c) 2025 bakdata
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -36,7 +36,6 @@
import software.amazon.awssdk.core.exception.SdkException;
import software.amazon.awssdk.core.sync.RequestBody;
import software.amazon.awssdk.services.s3.S3Client;
import software.amazon.awssdk.services.s3.model.Delete;
import software.amazon.awssdk.services.s3.model.DeleteObjectsRequest;
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
import software.amazon.awssdk.services.s3.model.ListObjectVersionsRequest;
Expand Down Expand Up @@ -151,9 +150,8 @@ private void delete(final String bucketName, final Collection<ObjectIdentifier>
if (!keys.isEmpty()) {
this.s3.deleteObjects(DeleteObjectsRequest.builder()
.bucket(bucketName)
.delete(Delete.builder()
.objects(keys)
.build())
.delete(builder -> builder
.objects(keys))
.build());
}
}
Expand Down
6 changes: 2 additions & 4 deletions large-message-serde/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,18 @@ dependencies {
api(project(":large-message-core"))

val junitVersion: String by project
testRuntimeOnly(group = "org.junit.jupiter", name = "junit-jupiter-engine", version = junitVersion)
testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = junitVersion)
testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-params", version = junitVersion)
testRuntimeOnly(group = "org.junit.jupiter", name = "junit-jupiter-engine", version = junitVersion)
val assertJVersion: String by project
testImplementation(group = "org.assertj", name = "assertj-core", version = assertJVersion)

testImplementation(
group = "com.bakdata.fluent-kafka-streams-tests",
name = "fluent-kafka-streams-tests-junit5",
version = "2.11.1"
version = "2.14.0"
)
val log4jVersion: String by project
testImplementation(group = "org.apache.logging.log4j", name = "log4j-slf4j2-impl", version = log4jVersion)
val joolVersion: String by project
testImplementation(group = "org.jooq", name = "jool", version = joolVersion)
testImplementation(testFixtures(project(":large-message-core")))
}
Loading