Skip to content

Commit d284679

Browse files
authored
[GEODE-10607] Remediation of CVE-2026-49268 (#8033)
* GEODE-10607 Remediation of CVE-2026-49268 * resolved merge conflict * resolved merge conflict * Triggering github action * resolved merge conflict
1 parent b507bd3 commit d284679

5 files changed

Lines changed: 43 additions & 43 deletions

File tree

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>2.0.17</version>
418+
<version>2.0.18</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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ class DependencyConstraints {
4949
deps.put("log4j.version", "2.25.5")
5050
deps.put("log4j-slf4j2-impl.version", "2.23.1")
5151
deps.put("micrometer.version", "1.15.12")
52-
deps.put("shiro.version", "2.1.0")
52+
deps.put("shiro.version", "3.0.0")
5353
// GEODE-10583: Pin Bouncy Castle (transitive via shiro-crypto-hash) to a fixed version
5454
deps.put("bouncycastle.version", "1.85")
55-
deps.put("slf4j-api.version", "2.0.17")
55+
deps.put("slf4j-api.version", "2.0.18")
5656
deps.put("jakarta.transaction-api.version", "2.0.1")
5757
deps.put("jboss-modules.version", "1.11.0.Final")
5858
deps.put("jackson.version", "2.21.5")

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,7 @@ lib/jna-5.11.0.jar
10121012
lib/jna-platform-5.11.0.jar
10131013
lib/joda-time-2.12.7.jar
10141014
lib/jopt-simple-5.0.4.jar
1015-
lib/jul-to-slf4j-2.0.17.jar
1015+
lib/jul-to-slf4j-2.0.18.jar
10161016
lib/log4j-api-2.25.5.jar
10171017
lib/log4j-core-2.25.5.jar
10181018
lib/log4j-jcl-2.25.5.jar
@@ -1033,18 +1033,18 @@ lib/ra.jar
10331033
lib/reactive-streams-1.0.4.jar
10341034
lib/reactor-core-3.6.10.jar
10351035
lib/rmiio-2.1.2.jar
1036-
lib/shiro-cache-2.1.0.jar
1037-
lib/shiro-config-core-2.1.0.jar
1038-
lib/shiro-config-ogdl-2.1.0.jar
1039-
lib/shiro-core-2.1.0.jar
1040-
lib/shiro-crypto-cipher-2.1.0.jar
1041-
lib/shiro-crypto-core-2.1.0.jar
1042-
lib/shiro-crypto-hash-2.1.0.jar
1043-
lib/shiro-event-2.1.0.jar
1044-
lib/shiro-hashes-argon2-2.1.0.jar
1045-
lib/shiro-hashes-bcrypt-2.1.0.jar
1046-
lib/shiro-lang-2.1.0.jar
1047-
lib/slf4j-api-2.0.17.jar
1036+
lib/shiro-cache-3.0.0.jar
1037+
lib/shiro-config-core-3.0.0.jar
1038+
lib/shiro-config-ogdl-3.0.0.jar
1039+
lib/shiro-core-3.0.0.jar
1040+
lib/shiro-crypto-cipher-3.0.0.jar
1041+
lib/shiro-crypto-core-3.0.0.jar
1042+
lib/shiro-crypto-hash-3.0.0.jar
1043+
lib/shiro-event-3.0.0.jar
1044+
lib/shiro-hashes-argon2-3.0.0.jar
1045+
lib/shiro-hashes-bcrypt-3.0.0.jar
1046+
lib/shiro-lang-3.0.0.jar
1047+
lib/slf4j-api-2.0.18.jar
10481048
lib/snakeyaml-2.5.jar
10491049
lib/snappy-0.5.jar
10501050
lib/spring-aop-6.1.21.jar

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ HikariCP-4.0.3.jar
6666
antlr-2.7.7.jar
6767
istack-commons-runtime-4.1.1.jar
6868
commons-validator-1.7.jar
69-
shiro-core-2.1.0.jar
70-
shiro-config-ogdl-2.1.0.jar
69+
shiro-core-3.0.0.jar
70+
shiro-config-ogdl-3.0.0.jar
7171
commons-beanutils-1.11.0.jar
7272
commons-codec-1.15.jar
7373
commons-collections-3.2.2.jar
@@ -91,9 +91,9 @@ jakarta.transaction-api-2.0.1.jar
9191
joda-time-2.12.7.jar
9292
jna-platform-5.11.0.jar
9393
jna-5.11.0.jar
94-
shiro-hashes-argon2-2.1.0.jar
95-
shiro-hashes-bcrypt-2.1.0.jar
96-
shiro-crypto-hash-2.1.0.jar
94+
shiro-hashes-argon2-3.0.0.jar
95+
shiro-hashes-bcrypt-3.0.0.jar
96+
shiro-crypto-hash-3.0.0.jar
9797
bcprov-jdk18on-1.85.jar
9898
jetty-ee-12.0.37.jar
9999
jetty-session-12.0.37.jar
@@ -102,20 +102,20 @@ jetty-security-12.0.37.jar
102102
jetty-server-12.0.37.jar
103103
snappy-0.5.jar
104104
jgroups-3.6.20.Final.jar
105-
shiro-cache-2.1.0.jar
106-
shiro-crypto-cipher-2.1.0.jar
107-
shiro-config-core-2.1.0.jar
108-
shiro-event-2.1.0.jar
109-
shiro-crypto-core-2.1.0.jar
110-
shiro-lang-2.1.0.jar
105+
shiro-cache-3.0.0.jar
106+
shiro-crypto-cipher-3.0.0.jar
107+
shiro-config-core-3.0.0.jar
108+
shiro-event-3.0.0.jar
109+
shiro-crypto-core-3.0.0.jar
110+
shiro-lang-3.0.0.jar
111111
jetty-xml-12.0.37.jar
112112
jetty-http-12.0.37.jar
113113
jetty-io-12.0.37.jar
114114
spring-boot-starter-logging-3.3.13.jar
115-
jul-to-slf4j-2.0.17.jar
115+
jul-to-slf4j-2.0.18.jar
116116
jetty-jndi-12.0.37.jar
117117
jetty-util-12.0.37.jar
118-
slf4j-api-2.0.17.jar
118+
slf4j-api-2.0.18.jar
119119
jackson-annotations-2.21.jar
120120
micrometer-observation-1.15.12.jar
121121
spring-jcl-6.1.21.jar

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jakarta.enterprise.cdi-api-4.0.1.jar
5656
jakarta.interceptor-api-2.1.0.jar
5757
jakarta.annotation-api-2.1.1.jar
5858
jakarta.transaction-api-2.0.1.jar
59-
shiro-core-2.1.0.jar
59+
shiro-core-3.0.0.jar
6060
jgroups-3.6.20.Final.jar
6161
jackson-annotations-2.21.jar
6262
commons-validator-1.7.jar
@@ -83,7 +83,7 @@ lucene-analysis-common-9.12.3.jar
8383
lucene-queryparser-9.12.3.jar
8484
lucene-queries-9.12.3.jar
8585
lucene-core-9.12.3.jar
86-
shiro-config-ogdl-2.1.0.jar
86+
shiro-config-ogdl-3.0.0.jar
8787
commons-beanutils-1.11.0.jar
8888
commons-codec-1.15.jar
8989
commons-collections-3.2.2.jar
@@ -94,29 +94,29 @@ jetty-ee10-webapp-12.0.37.jar
9494
jetty-ee10-servlet-12.0.37.jar
9595
jakarta.servlet-api-6.0.0.jar
9696
joda-time-2.12.7.jar
97-
shiro-hashes-argon2-2.1.0.jar
98-
shiro-hashes-bcrypt-2.1.0.jar
99-
shiro-crypto-hash-2.1.0.jar
97+
shiro-hashes-argon2-3.0.0.jar
98+
shiro-hashes-bcrypt-3.0.0.jar
99+
shiro-crypto-hash-3.0.0.jar
100100
bcprov-jdk18on-1.85.jar
101101
jetty-ee-12.0.37.jar
102102
jetty-session-12.0.37.jar
103103
jetty-plus-12.0.37.jar
104104
jetty-security-12.0.37.jar
105105
jetty-server-12.0.37.jar
106-
shiro-cache-2.1.0.jar
107-
shiro-crypto-cipher-2.1.0.jar
108-
shiro-config-core-2.1.0.jar
109-
shiro-event-2.1.0.jar
110-
shiro-crypto-core-2.1.0.jar
111-
shiro-lang-2.1.0.jar
106+
shiro-cache-3.0.0.jar
107+
shiro-crypto-cipher-3.0.0.jar
108+
shiro-config-core-3.0.0.jar
109+
shiro-event-3.0.0.jar
110+
shiro-crypto-core-3.0.0.jar
111+
shiro-lang-3.0.0.jar
112112
jetty-xml-12.0.37.jar
113113
jetty-http-12.0.37.jar
114-
jetty-io-12.0.37.jar
114+
jetty-io-1git 2.0.37.jar
115115
jetty-jndi-12.0.37.jar
116116
jetty-util-12.0.37.jar
117117
spring-boot-starter-logging-3.3.13.jar
118-
jul-to-slf4j-2.0.17.jar
119-
slf4j-api-2.0.17.jar
118+
jul-to-slf4j-2.0.18.jar
119+
slf4j-api-2.0.18.jar
120120
micrometer-observation-1.15.12.jar
121121
micrometer-commons-1.15.12.jar
122122
LatencyUtils-2.0.3.jar

0 commit comments

Comments
 (0)