From ed6517e9c02e31807cf4949f9e35a7d793a3f36c Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Thu, 29 Sep 2022 16:54:48 -0400 Subject: [PATCH] Upgrade Kafka Client to 3.0.2 (#2123) (#2126) * Upgrade Kafka Client to 3.0.2 Signed-off-by: Vinayak Kothari (cherry picked from commit 416e360500d5838a1f343b19989fb381c1889d49) Co-authored-by: Vinayak Kothari Signed-off-by: Stephen Crawford --- build.gradle | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 7d2526a0ac..ffe57b404e 100644 --- a/build.gradle +++ b/build.gradle @@ -18,6 +18,10 @@ buildscript { // 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT version_tokens = opensearch_version.tokenize('-') opensearch_build = version_tokens[0] + '.0' + + common_utils_version = System.getProperty("common_utils.version", '2.1.0.0') + kafka_version = '3.0.2' + if (buildVersionQualifier) { opensearch_build += "-${buildVersionQualifier}" } @@ -82,7 +86,7 @@ forbiddenApisTest.enabled = false filepermissions.enabled = false forbiddenPatterns.enabled = false testingConventions.enabled = false -// Conflicts between runtime kafka-clients:3.0.1 & testRuntime kafka-clients:3.0.1:test +// Conflicts between runtime kafka-clients:x.y.z & testRuntime kafka-clients:x.y.z:test jarHell.enabled = false test { @@ -243,7 +247,7 @@ dependencies { } implementation 'com.github.wnameless:json-flattener:0.5.0' implementation 'com.flipkart.zjsonpatch:zjsonpatch:0.4.4' - implementation 'org.apache.kafka:kafka-clients:3.0.1' + implementation "org.apache.kafka:kafka-clients:${kafka_version}" implementation 'com.onelogin:java-saml:2.5.0' implementation 'com.onelogin:java-saml-core:2.5.0' @@ -322,9 +326,9 @@ dependencies { testImplementation 'com.unboundid:unboundid-ldapsdk:4.0.9' testImplementation 'javax.servlet:servlet-api:2.5' testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.13' - testImplementation 'org.apache.kafka:kafka_2.13:3.0.1' - testImplementation 'org.apache.kafka:kafka_2.13:3.0.1:test' - testImplementation 'org.apache.kafka:kafka-clients:3.0.1:test' + testImplementation "org.apache.kafka:kafka_2.13:${kafka_version}" + testImplementation "org.apache.kafka:kafka_2.13:${kafka_version}:test" + testImplementation "org.apache.kafka:kafka-clients:${kafka_version}:test" testImplementation 'org.springframework.kafka:spring-kafka-test:2.8.6' testImplementation 'org.springframework:spring-beans:5.3.20' testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' @@ -339,9 +343,9 @@ dependencies { testRuntimeOnly 'org.scala-lang:scala-library:2.13.8' testRuntimeOnly 'com.yammer.metrics:metrics-core:2.2.0' testRuntimeOnly 'com.typesafe.scala-logging:scala-logging_3:3.9.5' - testRuntimeOnly 'org.apache.zookeeper:zookeeper:3.6.3' - testRuntimeOnly 'org.apache.kafka:kafka-metadata:3.0.1' - testRuntimeOnly 'org.apache.kafka:kafka-storage:3.0.1' + testRuntimeOnly 'org.apache.zookeeper:zookeeper:3.7.1' + testRuntimeOnly "org.apache.kafka:kafka-metadata:${kafka_version}" + testRuntimeOnly "org.apache.kafka:kafka-storage:${kafka_version}"