Skip to content

Commit de876fe

Browse files
authored
GEODE-10565: Jackson upgrade due to security vulnerabilities (#7990)
* jackson upgrade * Update integration test resources for dependency classpath and bundled jars: remove byte-buddy, update snakeyaml to 2.3 * Fix integration test snapshots: remove snakeyaml-2.2, add logback jars * Fix integration test snapshot: remove incorrect logback entries
1 parent 0e5edc3 commit de876fe

6 files changed

Lines changed: 28 additions & 32 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -470,27 +470,27 @@
470470
<dependency>
471471
<groupId>com.fasterxml.jackson.core</groupId>
472472
<artifactId>jackson-annotations</artifactId>
473-
<version>2.17.0</version>
473+
<version>2.18.6</version>
474474
</dependency>
475475
<dependency>
476476
<groupId>com.fasterxml.jackson.core</groupId>
477477
<artifactId>jackson-core</artifactId>
478-
<version>2.17.0</version>
478+
<version>2.18.6</version>
479479
</dependency>
480480
<dependency>
481481
<groupId>com.fasterxml.jackson.core</groupId>
482482
<artifactId>jackson-databind</artifactId>
483-
<version>2.17.0</version>
483+
<version>2.18.6</version>
484484
</dependency>
485485
<dependency>
486486
<groupId>com.fasterxml.jackson.datatype</groupId>
487487
<artifactId>jackson-datatype-joda</artifactId>
488-
<version>2.17.0</version>
488+
<version>2.18.6</version>
489489
</dependency>
490490
<dependency>
491491
<groupId>com.fasterxml.jackson.datatype</groupId>
492492
<artifactId>jackson-datatype-jsr310</artifactId>
493-
<version>2.17.0</version>
493+
<version>2.18.6</version>
494494
</dependency>
495495
<dependency>
496496
<groupId>com.jayway.jsonpath</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
@@ -53,8 +53,8 @@ class DependencyConstraints {
5353
deps.put("slf4j-api.version", "2.0.17")
5454
deps.put("jakarta.transaction-api.version", "2.0.1")
5555
deps.put("jboss-modules.version", "1.11.0.Final")
56-
deps.put("jackson.version", "2.17.0")
57-
deps.put("jackson.databind.version", "2.17.0")
56+
deps.put("jackson.version", "2.18.6")
57+
deps.put("jackson.databind.version", "2.18.6")
5858
// Spring Framework 6.x Migration
5959
deps.put("springshell.version", "3.3.3")
6060
deps.put("springframework.version", "6.1.14")

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,6 @@ lib/antlr-runtime-3.5.2.jar
923923
lib/asm-9.8.jar
924924
lib/asm-commons-9.8.jar
925925
lib/asm-tree-9.8.jar
926-
lib/byte-buddy-1.14.9.jar
927926
lib/classgraph-4.8.147.jar
928927
lib/classmate-1.5.1.jar
929928
lib/commons-beanutils-1.11.0.jar
@@ -964,12 +963,12 @@ lib/httpclient5-5.4.4.jar
964963
lib/httpcore5-5.3.4.jar
965964
lib/httpcore5-h2-5.3.4.jar
966965
lib/istack-commons-runtime-4.1.1.jar
967-
lib/jackson-annotations-2.17.0.jar
968-
lib/jackson-core-2.17.0.jar
969-
lib/jackson-databind-2.17.0.jar
970-
lib/jackson-dataformat-yaml-2.17.0.jar
971-
lib/jackson-datatype-joda-2.17.0.jar
972-
lib/jackson-datatype-jsr310-2.17.0.jar
966+
lib/jackson-annotations-2.18.6.jar
967+
lib/jackson-core-2.18.6.jar
968+
lib/jackson-databind-2.18.6.jar
969+
lib/jackson-dataformat-yaml-2.18.6.jar
970+
lib/jackson-datatype-joda-2.18.6.jar
971+
lib/jackson-datatype-jsr310-2.18.6.jar
973972
lib/jakarta.activation-api-2.1.3.jar
974973
lib/jakarta.annotation-api-2.1.1.jar
975974
lib/jakarta.el-api-5.0.0.jar
@@ -1042,7 +1041,7 @@ lib/shiro-crypto-hash-1.13.0.jar
10421041
lib/shiro-event-1.13.0.jar
10431042
lib/shiro-lang-1.13.0.jar
10441043
lib/slf4j-api-2.0.17.jar
1045-
lib/snakeyaml-2.2.jar
1044+
lib/snakeyaml-2.3.jar
10461045
lib/snappy-0.5.jar
10471046
lib/spring-aop-6.1.14.jar
10481047
lib/spring-beans-6.1.14.jar

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ antlr-runtime
99
asm
1010
asm-commons
1111
asm-tree
12-
byte-buddy
1312
classgraph
1413
classmate
1514
commons-beanutils

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ spring-shell-starter-3.3.3.jar
2121
spring-web-6.1.14.jar
2222
commons-lang3-3.18.0.jar
2323
rmiio-2.1.2.jar
24-
jackson-datatype-jsr310-2.17.0.jar
25-
jackson-datatype-joda-2.17.0.jar
26-
jackson-annotations-2.17.0.jar
27-
jackson-core-2.17.0.jar
28-
jackson-dataformat-yaml-2.17.0.jar
29-
jackson-databind-2.17.0.jar
24+
jackson-datatype-joda-2.18.6.jar
25+
jackson-annotations-2.18.6.jar
26+
jackson-dataformat-yaml-2.18.6.jar
27+
jackson-core-2.18.6.jar
28+
jackson-datatype-jsr310-2.18.6.jar
29+
jackson-databind-2.18.6.jar
3030
swagger-annotations-2.2.22.jar
3131
jaxb-runtime-4.0.2.jar
3232
jaxb-core-4.0.2.jar
@@ -113,12 +113,10 @@ jul-to-slf4j-2.0.16.jar
113113
jetty-jndi-12.0.27.jar
114114
jetty-util-12.0.27.jar
115115
slf4j-api-2.0.17.jar
116-
byte-buddy-1.14.9.jar
117116
micrometer-observation-1.14.0.jar
118117
spring-jcl-6.1.14.jar
119118
micrometer-commons-1.14.0.jar
120119
LatencyUtils-2.0.3.jar
121-
snakeyaml-2.2.jar
122120
reactor-core-3.6.10.jar
123121
jline-console-3.26.3.jar
124122
jline-builtins-3.26.3.jar
@@ -127,6 +125,7 @@ jline-style-3.26.3.jar
127125
jline-terminal-3.26.3.jar
128126
ST4-4.3.3.jar
129127
txw2-4.0.2.jar
128+
snakeyaml-2.3.jar
130129
asm-commons-9.8.jar
131130
asm-tree-9.8.jar
132131
asm-9.8.jar

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ geode-unsafe-0.0.0.jar
1919
geode-deployment-legacy-0.0.0.jar
2020
snappy-0.5.jar
2121
swagger-annotations-2.2.22.jar
22-
jackson-datatype-jsr310-2.17.0.jar
23-
jackson-annotations-2.17.0.jar
24-
jackson-dataformat-yaml-2.17.0.jar
25-
jackson-core-2.17.0.jar
26-
jackson-datatype-joda-2.17.0.jar
27-
jackson-databind-2.17.0.jar
22+
jackson-datatype-jsr310-2.18.6.jar
23+
jackson-annotations-2.18.6.jar
24+
jackson-dataformat-yaml-2.18.6.jar
25+
jackson-core-2.18.6.jar
26+
jackson-datatype-joda-2.18.6.jar
27+
jackson-databind-2.18.6.jar
2828
httpclient5-5.4.4.jar
2929
httpcore5-h2-5.3.4.jar
3030
httpcore5-5.3.4.jar
@@ -116,8 +116,6 @@ slf4j-api-2.0.17.jar
116116
micrometer-observation-1.14.0.jar
117117
micrometer-commons-1.14.0.jar
118118
LatencyUtils-2.0.3.jar
119-
byte-buddy-1.14.9.jar
120-
snakeyaml-2.2.jar
121119
spring-jcl-6.1.14.jar
122120
asm-commons-9.8.jar
123121
asm-tree-9.8.jar
@@ -130,6 +128,7 @@ jline-reader-3.26.3.jar
130128
jline-style-3.26.3.jar
131129
jline-terminal-3.26.3.jar
132130
ST4-4.3.3.jar
131+
snakeyaml-2.3.jar
133132
jakarta.enterprise.lang-model-4.0.1.jar
134133
reactive-streams-1.0.4.jar
135134
jline-native-3.26.3.jar

0 commit comments

Comments
 (0)