This is an automated email from the ASF dual-hosted git repository.
engelen pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new ce33349ff8 Upgrade slf4j-api from 1.7.32 to 1.7.36 (#7951)
ce33349ff8 is described below
commit ce33349ff885ebf00a5ad86e31e3c0fa658611e9
Author: Jinwoo Hwang <[email protected]>
AuthorDate: Mon Nov 3 10:30:50 2025 -0500
Upgrade slf4j-api from 1.7.32 to 1.7.36 (#7951)
This upgrade resolves a version conflict where both slf4j-api 1.7.32 and
1.7.36
were being included in the build. The conflict was caused by Apache Shiro
1.13.0
declaring a dependency on slf4j-api 1.7.36, while Geode's dependency
constraints
specified 1.7.32.
Changes:
- Updated slf4j-api.version in DependencyConstraints.groovy from 1.7.32 to
1.7.36
- Updated expected-pom.xml test resource in geode-all-bom to reflect new
version
- Removed duplicate slf4j-api-1.7.32.jar entry from assembly_content.txt
- Updated dependency_classpath.txt in geode-server-all to use 1.7.36
Impact:
- Eliminates duplicate slf4j-api jars in the build output
- Aligns with the version required by Apache Shiro 1.13.0
- Maintains compatibility with existing Geode codebase
All builds and checks pass successfully.
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 2 +-
.../groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy | 2 +-
geode-assembly/src/integrationTest/resources/assembly_content.txt | 1 -
geode-server-all/src/integrationTest/resources/dependency_classpath.txt | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml
b/boms/geode-all-bom/src/test/resources/expected-pom.xml
index df91731e16..4caa8b9bf7 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -415,7 +415,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.32</version>
+ <version>1.7.36</version>
</dependency>
<dependency>
<groupId>org.springframework.hateoas</groupId>
diff --git
a/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
b/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index 817fe62de3..d0339c139a 100644
---
a/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++
b/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -43,7 +43,7 @@ class DependencyConstraints {
deps.put("log4j.version", "2.17.2")
deps.put("micrometer.version", "1.9.1")
deps.put("shiro.version", "1.13.0")
- deps.put("slf4j-api.version", "1.7.32")
+ deps.put("slf4j-api.version", "1.7.36")
deps.put("jboss-modules.version", "1.11.0.Final")
deps.put("jackson.version", "2.17.0")
deps.put("jackson.databind.version", "2.17.0")
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 78f4dd8e84..f39125f110 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1016,7 +1016,6 @@ lib/shiro-crypto-core-1.13.0.jar
lib/shiro-crypto-hash-1.13.0.jar
lib/shiro-event-1.13.0.jar
lib/shiro-lang-1.13.0.jar
-lib/slf4j-api-1.7.32.jar
lib/slf4j-api-1.7.36.jar
lib/snappy-0.5.jar
lib/spring-beans-5.3.21.jar
diff --git
a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt
b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt
index 998ddc8410..9bffce778e 100644
--- a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt
@@ -30,7 +30,7 @@ spring-beans-5.3.21.jar
lucene-queries-6.6.6.jar
shiro-core-1.13.0.jar
HikariCP-4.0.3.jar
-slf4j-api-1.7.32.jar
+slf4j-api-1.7.36.jar
geode-http-service-0.0.0.jar
commons-collections-3.2.2.jar
httpclient-4.5.13.jar
