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.

Sign up for GitHub

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

Bump kafka.version from 3.5.1 to 3.6.0 #101

Merged
merged 3 commits into from
Oct 9, 2023
Merged

Bump kafka.version from 3.5.1 to 3.6.0 #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75c09cb
Bump kafka.version from 3.5.1 to 3.6.0
dependabot[bot] Oct 6, 2023
68a4abd
Update to kafka-server-extension required due to KAFKA-14595: Move Ad…
k-wall Oct 6, 2023
ca56ff6
Kafka 3.6 has PartitionAssignors, which are loaded by reflection
k-wall Oct 6, 2023
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
7 changes: 6 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>3.4.2</quarkus.platform.version>

<kafka.version>3.5.1</kafka.version>
<kafka.version>3.6.0</kafka.version>
<zookeeper.version>3.9.1</zookeeper.version>
<scala.version>2.13.12</scala.version>

Expand Down Expand Up @@ -123,6 +123,11 @@
<artifactId>kafka-storage</artifactId>
<version>${kafka.version}</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-group-coordinator</artifactId>
<version>${kafka.version}</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
Expand Down
11 changes: 10 additions & 1 deletion .../java/com/ozangunalp/kafka/server/extension/deployment/KafkaServerExtensionProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.apache.kafka.common.security.plain.internals.PlainSaslServerProvider;
import org.apache.kafka.common.security.scram.internals.ScramSaslServer;
import org.apache.kafka.common.security.scram.internals.ScramSaslServerProvider;
import org.apache.kafka.coordinator.group.assignor.PartitionAssignor;
import org.apache.kafka.server.metrics.KafkaYammerMetrics;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
Expand Down Expand Up @@ -66,6 +67,9 @@ class KafkaServerExtensionProcessor {
create.topic.policy.class.name, default: null
kafka.metrics.reporters, default: null
metric.reporters, default: null

group.consumer.assignors, default: org.apache.kafka.coordinator.group.assignor.RangeAssignor

*/

private static final Set<String> SECURITY_PROVIDERS = Set.of(
Expand All @@ -91,6 +95,7 @@ class KafkaServerExtensionProcessor {
.createSimple(AuthenticateCallbackHandler.class.getName());

private static final DotName KAFKA_PRINCIPAL_BUILDER = DotName.createSimple(KafkaPrincipalBuilder.class.getName());
private static final DotName PARTITION_ASSIGNOR = DotName.createSimple(PartitionAssignor.class.getName());

@BuildStep
FeatureBuildItem feature() {
Expand All @@ -107,6 +112,7 @@ void index(BuildProducer<IndexDependencyBuildItem> indexDependency) {
indexDependency.produce(new IndexDependencyBuildItem("org.apache.kafka", "kafka_2.13"));
indexDependency.produce(new IndexDependencyBuildItem("org.apache.kafka", "kafka-server-common"));
indexDependency.produce(new IndexDependencyBuildItem("org.apache.kafka", "kafka-clients"));
indexDependency.produce(new IndexDependencyBuildItem("org.apache.kafka", "kafka-group-coordinator"));
indexDependency.produce(new IndexDependencyBuildItem("io.strimzi", "kafka-oauth-server"));
indexDependency.produce(new IndexDependencyBuildItem("io.strimzi", "kafka-oauth-server-plain"));
indexDependency.produce(new IndexDependencyBuildItem("io.strimzi", "kafka-oauth-client"));
Expand Down Expand Up @@ -156,7 +162,7 @@ private void strimziOAuth(BuildProducer<ReflectiveClassBuildItem> reflectiveClas
@BuildStep
private void zookeeper(BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
BuildProducer<RuntimeInitializedClassBuildItem> producer) {
producer.produce(new RuntimeInitializedClassBuildItem("kafka.admin.AdminUtils$"));
producer.produce(new RuntimeInitializedClassBuildItem("org.apache.kafka.admin.AdminUtils"));
reflectiveClass.produce(ReflectiveClassBuildItem.builder(
"sun.security.provider.ConfigFile",
"org.apache.zookeeper.ClientCnxnSocketNIO")
Expand Down Expand Up @@ -195,6 +201,9 @@ public void sasl(CombinedIndexBuildItem index,
for (ClassInfo principalBuilder : index.getIndex().getAllKnownImplementors(KAFKA_PRINCIPAL_BUILDER)) {
reflectiveClass.produce(ReflectiveClassBuildItem.builder(principalBuilder.name().toString()).build());
}
for (ClassInfo partitionAssignor : index.getIndex().getAllKnownImplementors(PARTITION_ASSIGNOR)) {
reflectiveClass.produce(ReflectiveClassBuildItem.builder(partitionAssignor.name().toString()).build());
}
for (ClassInfo authenticateCallbackHandler : index.getIndex().getAllKnownImplementors(AUTHENTICATE_CALLBACK_HANDLER)) {
reflectiveClass.produce(ReflectiveClassBuildItem.builder(authenticateCallbackHandler.name().toString()).build());
}
Expand Down
4 changes: 4 additions & 0 deletions quarkus-kafka-server-extension/runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-storage</artifactId>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-group-coordinator</artifactId>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka_2.13</artifactId>
Expand Down