Skip to content

Commit ce33349

Browse files
authored
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.
1 parent fb8e93d commit ce33349

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@
415415
<dependency>
416416
<groupId>org.slf4j</groupId>
417417
<artifactId>slf4j-api</artifactId>
418-
<version>1.7.32</version>
418+
<version>1.7.36</version>
419419
</dependency>
420420
<dependency>
421421
<groupId>org.springframework.hateoas</groupId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class DependencyConstraints {
4343
deps.put("log4j.version", "2.17.2")
4444
deps.put("micrometer.version", "1.9.1")
4545
deps.put("shiro.version", "1.13.0")
46-
deps.put("slf4j-api.version", "1.7.32")
46+
deps.put("slf4j-api.version", "1.7.36")
4747
deps.put("jboss-modules.version", "1.11.0.Final")
4848
deps.put("jackson.version", "2.17.0")
4949
deps.put("jackson.databind.version", "2.17.0")

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,6 @@ lib/shiro-crypto-core-1.13.0.jar
10161016
lib/shiro-crypto-hash-1.13.0.jar
10171017
lib/shiro-event-1.13.0.jar
10181018
lib/shiro-lang-1.13.0.jar
1019-
lib/slf4j-api-1.7.32.jar
10201019
lib/slf4j-api-1.7.36.jar
10211020
lib/snappy-0.5.jar
10221021
lib/spring-beans-5.3.21.jar

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spring-beans-5.3.21.jar
3030
lucene-queries-6.6.6.jar
3131
shiro-core-1.13.0.jar
3232
HikariCP-4.0.3.jar
33-
slf4j-api-1.7.32.jar
33+
slf4j-api-1.7.36.jar
3434
geode-http-service-0.0.0.jar
3535
commons-collections-3.2.2.jar
3636
httpclient-4.5.13.jar

0 commit comments

Comments
 (0)