From ef7627e7f9596443346556468f4d9f563981b1c7 Mon Sep 17 00:00:00 2001 From: Darshit Chanpura Date: Wed, 4 Dec 2024 15:21:19 -0500 Subject: [PATCH 1/3] Bump spring-framework dependency to 2.9.13 Signed-off-by: Darshit Chanpura --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index da457a3b18..ea7d0d9b0d 100644 --- a/build.gradle +++ b/build.gradle @@ -81,8 +81,8 @@ configurations.all { force 'commons-cli:commons-cli:1.3.1' force 'org.apache.httpcomponents:httpcore:4.4.12' force "org.apache.commons:commons-lang3:3.4" - force "org.springframework:spring-core:5.3.28" - force "org.springframework:spring-expression:5.3.28" + force "org.springframework:spring-core:5.3.39" + force "org.springframework:spring-expression:5.3.39" force "com.google.guava:guava:32.1.1-jre" force "com.fasterxml.woodstox:woodstox-core:6.4.0" force "org.scala-lang:scala-library:2.13.9" @@ -205,7 +205,7 @@ dependencies { testImplementation 'junit:junit:4.13.1' testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.13' testImplementation 'org.mockito:mockito-core:2.23.0' - testImplementation 'org.springframework.kafka:spring-kafka-test:2.9.10' + testImplementation 'org.springframework.kafka:spring-kafka-test:2.9.13' testImplementation 'javax.servlet:servlet-api:2.5' testImplementation 'com.unboundid:unboundid-ldapsdk:4.0.9' testImplementation 'com.github.stephenc.jcip:jcip-annotations:1.0-1' From 389b00e6a11eace47e5e70e9664fbd4075ff36f1 Mon Sep 17 00:00:00 2001 From: Darshit Chanpura Date: Wed, 4 Dec 2024 15:34:48 -0500 Subject: [PATCH 2/3] Bump zookeeper to 3.9.3 and kafka-clients to 3.7.1 Signed-off-by: Darshit Chanpura --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index ea7d0d9b0d..c55ea15d04 100644 --- a/build.gradle +++ b/build.gradle @@ -62,7 +62,7 @@ ext { buildVersionQualifier = System.getProperty("build.version_qualifier", "") version_tokens = opensearch_version.tokenize('-') opensearch_build = version_tokens[0] + '.0' - kafka_version = '3.7.0' + kafka_version = '3.7.1' if (buildVersionQualifier) { opensearch_build += "-${buildVersionQualifier}" @@ -88,7 +88,7 @@ configurations.all { force "org.scala-lang:scala-library:2.13.9" force "org.apache.bcel:bcel:6.6.0" // This line should be removed once Spotbugs is upgraded to 4.7.4 force "org.xerial.snappy:snappy-java:1.1.10.5" - force "org.apache.zookeeper:zookeeper:3.9.2" + force "org.apache.zookeeper:zookeeper:3.9.3" force "ch.qos.logback:logback-core:1.2.13" force "ch.qos.logback:logback-classic:1.2.13" force "org.bitbucket.b_c:jose4j:0.9.4" From 035a937d09721c0f8ec879ee0a9ca2c4da35c4b4 Mon Sep 17 00:00:00 2001 From: Darshit Chanpura Date: Wed, 4 Dec 2024 17:09:06 -0500 Subject: [PATCH 3/3] Force spring-context to 5.3.39 Signed-off-by: Darshit Chanpura --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index c55ea15d04..a800f5d5f3 100644 --- a/build.gradle +++ b/build.gradle @@ -83,6 +83,7 @@ configurations.all { force "org.apache.commons:commons-lang3:3.4" force "org.springframework:spring-core:5.3.39" force "org.springframework:spring-expression:5.3.39" + force "org.springframework:spring-context:5.3.39" force "com.google.guava:guava:32.1.1-jre" force "com.fasterxml.woodstox:woodstox-core:6.4.0" force "org.scala-lang:scala-library:2.13.9"