Merge branch 'main' into search_relevance_role_updates

Author: cwperks

CHANGELOG.md

@@ -77,6 +77,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `actions/checkout` from 5 to 6 ([#5810](https://github.com/opensearch-project/security/pull/5810))
 - Bump `org.bouncycastle:bcpkix-jdk18on` from 1.82 to 1.83 ([#5825](https://github.com/opensearch-project/security/pull/5825))
 - Bump `commons-codec:commons-codec` from 1.19.0 to 1.20.0 ([#5823](https://github.com/opensearch-project/security/pull/5823))
+- Upgrade springframework to 7.0.1 and zookeeper to 3.9.4 ([#5829](https://github.com/opensearch-project/security/pull/5829))
 
 ### Documentation
 

build.gradle

@@ -33,7 +33,7 @@ buildscript {
         jjwt_version = '0.13.0'
         guava_version = '33.5.0-jre'
         jaxb_version = '2.3.9'
-        spring_version = '6.2.14'
+        spring_version = '7.0.1'
 
         if (buildVersionQualifier) {
             opensearch_build += "-${buildVersionQualifier}"
@@ -479,6 +479,7 @@ configurations {
     all {
         resolutionStrategy {
             force 'commons-codec:commons-codec:1.20.0'
+            force 'commons-logging:commons-logging:1.3.5'
             force 'org.slf4j:slf4j-api:1.7.36'
             force 'org.scala-lang:scala-library:2.13.18'
             force "com.fasterxml.jackson:jackson-bom:${versions.jackson}"
@@ -798,7 +799,7 @@ dependencies {
     }
     testRuntimeOnly 'org.scala-lang:scala-library:2.13.18'
     testRuntimeOnly 'com.typesafe.scala-logging:scala-logging_3:3.9.6'
-    testRuntimeOnly('org.apache.zookeeper:zookeeper:3.9.3') {
+    testRuntimeOnly('org.apache.zookeeper:zookeeper:3.9.4') {
         exclude(group:'ch.qos.logback', module: 'logback-classic' )
         exclude(group:'ch.qos.logback', module: 'logback-core' )
     }