resolved merge conflict

Author: JinwooHwang

boms/geode-all-bom/src/test/resources/expected-pom.xml

@@ -415,7 +415,7 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>2.0.17</version>
+        <version>2.0.18</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.hateoas</groupId>

build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy

@@ -52,7 +52,7 @@ class DependencyConstraints {
     deps.put("shiro.version", "3.0.0")
     // GEODE-10583: Pin Bouncy Castle (transitive via shiro-crypto-hash) to a fixed version
     deps.put("bouncycastle.version", "1.85")
-    deps.put("slf4j-api.version", "2.0.17")
+    deps.put("slf4j-api.version", "2.0.18")
     deps.put("jakarta.transaction-api.version", "2.0.1")
     deps.put("jboss-modules.version", "1.11.0.Final")
     deps.put("jackson.version", "2.21.5")

geode-assembly/src/integrationTest/resources/assembly_content.txt

@@ -1012,7 +1012,7 @@ lib/jna-5.11.0.jar
 lib/jna-platform-5.11.0.jar
 lib/joda-time-2.12.7.jar
 lib/jopt-simple-5.0.4.jar
-lib/jul-to-slf4j-2.0.17.jar
+lib/jul-to-slf4j-2.0.18.jar
 lib/log4j-api-2.25.5.jar
 lib/log4j-core-2.25.5.jar
 lib/log4j-jcl-2.25.5.jar
@@ -1044,7 +1044,7 @@ lib/shiro-event-3.0.0.jar
 lib/shiro-hashes-argon2-3.0.0.jar
 lib/shiro-hashes-bcrypt-3.0.0.jar
 lib/shiro-lang-3.0.0.jar
-lib/slf4j-api-2.0.17.jar
+lib/slf4j-api-2.0.18.jar
 lib/snakeyaml-2.5.jar
 lib/snappy-0.5.jar
 lib/spring-aop-6.1.21.jar

geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt

@@ -112,10 +112,10 @@ jetty-xml-12.0.33.jar
 jetty-http-12.0.33.jar
 jetty-io-12.0.33.jar
 spring-boot-starter-logging-3.3.13.jar
-jul-to-slf4j-2.0.17.jar
+jul-to-slf4j-2.0.18.jar
 jetty-jndi-12.0.33.jar
 jetty-util-12.0.33.jar
-slf4j-api-2.0.17.jar
+slf4j-api-2.0.18.jar
 jackson-annotations-2.21.jar
 micrometer-observation-1.15.12.jar
 spring-jcl-6.1.21.jar

geode-server-all/src/integrationTest/resources/dependency_classpath.txt

@@ -111,12 +111,12 @@ shiro-crypto-core-3.0.0.jar
 shiro-lang-3.0.0.jar
 jetty-xml-12.0.33.jar
 jetty-http-12.0.33.jar
-jetty-io-12.0.33.jar
+jetty-io-1git 2.0.33.jar
 jetty-jndi-12.0.33.jar
 jetty-util-12.0.33.jar
 spring-boot-starter-logging-3.3.13.jar
-jul-to-slf4j-2.0.17.jar
-slf4j-api-2.0.17.jar
+jul-to-slf4j-2.0.18.jar
+slf4j-api-2.0.18.jar
 micrometer-observation-1.15.12.jar
 micrometer-commons-1.15.12.jar
 LatencyUtils-2.0.3.jar