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

Jump to bottom

Upgrade kafka/kafka-clients to V2.8.2 #41595

Merged
merged 5 commits into from
Oct 31, 2023
Merged

Upgrade kafka/kafka-clients to V2.8.2 #41595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac1bcb5
[Gradle Release Plugin] - new version commit: 'v1.2.46-SNAPSHOT'.
ballerina-bot Oct 14, 2023
e410703
Upgrade kafka/kafka-clients to V2.8.2
RDPerera Oct 30, 2023
8339543
Fix formatting issues
RDPerera Oct 30, 2023
c322c2e
Update gradle.properties
RDPerera Oct 31, 2023
82b7042
Update gradle.properties
RDPerera Oct 31, 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
2 changes: 1 addition & 1 deletion distribution/zip/jballerina-tools/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ netty-common-4.1.39.Final.jar
ballerina-formatter-1.1.0.jar jar apache2
quartz-jobs-2.3.0.jar jar apache2
ballerina-kafka-1.1.0.jar jar apache2
kafka_2.11-2.0.1.jar jar apache2
kafka_2.13-2.8.2.jar jar apache2
broker-coordination-0.970.0.jar bundle apache2
org.wso2.carbon.messaging-2.3.7.jar bundle apache2
bir.jar jar apache2
Expand Down
2 changes: 1 addition & 1 deletion distribution/zip/jballerina/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ netty-common-4.1.39.Final.jar
ballerina-formatter-1.1.0.jar jar apache2
quartz-jobs-2.3.0.jar jar apache2
ballerina-kafka-1.1.0.jar jar apache2
kafka_2.11-2.0.1.jar jar apache2
kafka_2.13-2.8.2.jar jar apache2
broker-coordination-0.970.0.jar bundle apache2
org.wso2.carbon.messaging-2.3.7.jar bundle apache2
bir.jar jar apache2
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ org.gradle.caching=true
org.gradle.parallel=true
org.gradle.jvmargs='-Dfile.encoding=UTF-8'
org.gradle.workers.max=3
version=1.2.45
version=1.2.46-SNAPSHOT
group=org.ballerinalang
bootstrappedOn=1.1.0-alpha
4 changes: 2 additions & 2 deletions gradle/javaLibsProject.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ dependencies {
dist 'org.bouncycastle:bcpkix-jdk15on:1.61'

dist 'info.picocli:picocli:4.0.1'
dist 'org.apache.kafka:kafka-clients:2.3.1'
dist 'org.apache.kafka:kafka_2.11:2.3.1'
dist 'org.apache.kafka:kafka-clients:2.8.2'
dist 'org.apache.kafka:kafka_2.13:2.8.2'
dist 'io.ballerina.messaging:broker-auth:0.970.0'
dist 'io.ballerina.messaging:broker-common:0.970.0'
dist 'io.ballerina.messaging:broker-coordination:0.970.0'
Expand Down
4 changes: 2 additions & 2 deletions gradle/javaProject.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ dependencies {
implementation 'org.apache.commons:commons-text:1.10.0'
implementation 'org.apache.directory.server:apacheds-all:2.0.0-M24'
implementation 'org.apache.geronimo.specs:geronimo-stax-api_1.0_spec:1.0.1'
implementation 'org.apache.kafka:kafka-clients:2.3.1'
implementation 'org.apache.kafka:kafka_2.11:2.3.1'
implementation 'org.apache.kafka:kafka-clients:2.8.2'
implementation 'org.apache.kafka:kafka_2.13:2.8.2'
implementation 'org.apache.avro:avro:1.9.2'
implementation 'org.apache.james:apache-mime4j-core:0.8.9'
implementation 'org.apache.mina:mina-core:2.0.16'
Expand Down
2 changes: 1 addition & 1 deletion misc/testerina/modules/testerina-core/src/main/ballerina/Ballerina.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ target = "java8"
[[platform.libraries]]
artifactId = "mock"
version = "0.0.0"
path = "./lib/testerina-core-1.2.44.jar"
path = "./lib/testerina-core-1.2.45.jar"
groupId = "ballerina"
2 changes: 1 addition & 1 deletion stdlib/messaging/kafka/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies {
implementation project(':ballerina-time')
implementation project(':ballerina-lang:internal')
implementation 'org.apache.kafka:kafka-clients'
implementation 'org.apache.kafka:kafka_2.11'
implementation 'org.apache.kafka:kafka_2.13'
implementation 'org.apache.avro:avro'

baloImplementation project(path: ':ballerina-filepath', configuration: 'baloImplementation')
Expand Down
10 changes: 5 additions & 5 deletions stdlib/messaging/kafka/src/main/ballerina/Ballerina.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ target = "java8"

[[platform.libraries]]
artifactId = "kafka-clients"
version = "2.3.1"
path = "./lib/kafka-clients-2.3.1.jar"
version = "2.8.2"
path = "./lib/kafka-clients-2.8.2.jar"
groupId = "org.apache.kafka"
modules = ["kafka"]

[[platform.libraries]]
artifactId = "kafka_2.11"
version = "2.3.1"
path = "./lib/kafka_2.11-2.3.1.jar"
artifactId = "kafka_2.13"
version = "2.8.2"
path = "./lib/kafka_2.13-2.8.2.jar"
groupId = "org.apache.kafka"
modules = ["kafka"]
10 changes: 2 additions & 8 deletions stdlib/messaging/kafka/src/test/java/org/ballerinalang/messaging/kafka/utils/KafkaLocal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,10 @@

package org.ballerinalang.messaging.kafka.utils;

import kafka.metrics.KafkaMetricsReporter;
import kafka.metrics.KafkaMetricsReporter$;
import kafka.server.KafkaConfig;
import kafka.server.KafkaServer;
import kafka.utils.VerifiableProperties;
import org.apache.kafka.common.utils.Time;
import scala.Option;
import scala.collection.Seq;

import java.util.Properties;

Expand All @@ -34,13 +30,11 @@
*/
public class KafkaLocal {
private static final String prefix = "kafka-thread";
private KafkaServer kafkaServer;
private Seq<KafkaMetricsReporter> reporters;
private final KafkaServer kafkaServer;

public KafkaLocal(Properties properties) {
KafkaConfig kafkaConfig = KafkaConfig.fromProps(properties);
reporters = KafkaMetricsReporter$.MODULE$.startReporters(new VerifiableProperties(properties));
this.kafkaServer = new KafkaServer(kafkaConfig, Time.SYSTEM, Option.apply(prefix), reporters);
this.kafkaServer = new KafkaServer(kafkaConfig, Time.SYSTEM, Option.apply(prefix), false);
}

public void start() {
Expand Down
2 changes: 1 addition & 1 deletion tests/jballerina-integration-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ dependencies {
implementation project(':observability-test-utils')
implementation project(path: ':ballerina-test-utils', configuration: 'shadow')
implementation 'org.apache.kafka:kafka-clients'
implementation 'org.apache.kafka:kafka_2.11'
implementation 'org.apache.kafka:kafka_2.13'
implementation 'io.netty:netty-tcnative-classes'
implementation 'io.netty:netty-tcnative-boringssl-static'
implementation 'io.netty:netty-tcnative-boringssl-static::windows-x86_64'
Expand Down
Loading