Skip to content

Commit e6cd1d8

Browse files
authored
GEODE-10575: Upgrade Jackson to 2.21.2 (annotations 2.21) (#8002)
1 parent 4b7f7bf commit e6cd1d8

File tree

5 files changed

+30
-26
lines changed

5 files changed

+30
-26
lines changed

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.18.6</version>
473+
<version>2.21</version>
474474
</dependency>
475475
<dependency>
476476
<groupId>com.fasterxml.jackson.core</groupId>
477477
<artifactId>jackson-core</artifactId>
478-
<version>2.18.6</version>
478+
<version>2.21.2</version>
479479
</dependency>
480480
<dependency>
481481
<groupId>com.fasterxml.jackson.core</groupId>
482482
<artifactId>jackson-databind</artifactId>
483-
<version>2.18.6</version>
483+
<version>2.21.2</version>
484484
</dependency>
485485
<dependency>
486486
<groupId>com.fasterxml.jackson.datatype</groupId>
487487
<artifactId>jackson-datatype-joda</artifactId>
488-
<version>2.18.6</version>
488+
<version>2.21.2</version>
489489
</dependency>
490490
<dependency>
491491
<groupId>com.fasterxml.jackson.datatype</groupId>
492492
<artifactId>jackson-datatype-jsr310</artifactId>
493-
<version>2.18.6</version>
493+
<version>2.21.2</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: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@ 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.18.6")
57-
deps.put("jackson.databind.version", "2.18.6")
56+
deps.put("jackson.version", "2.21.2")
57+
deps.put("jackson.annotations.version", "2.21")
58+
deps.put("jackson.databind.version", "2.21.2")
5859
// Spring Framework 6.x Migration
5960
deps.put("springshell.version", "3.3.3")
6061
deps.put("springframework.version", "6.1.21")
@@ -218,8 +219,11 @@ class DependencyConstraints {
218219
entry('mockito-junit-jupiter')
219220
}
220221

221-
dependencySet(group: 'com.fasterxml.jackson.core', version: get('jackson.version')) {
222+
dependencySet(group: 'com.fasterxml.jackson.core', version: get('jackson.annotations.version')) {
222223
entry('jackson-annotations')
224+
}
225+
226+
dependencySet(group: 'com.fasterxml.jackson.core', version: get('jackson.version')) {
223227
entry('jackson-core')
224228
}
225229

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -964,12 +964,12 @@ lib/httpclient5-5.4.4.jar
964964
lib/httpcore5-5.3.4.jar
965965
lib/httpcore5-h2-5.3.4.jar
966966
lib/istack-commons-runtime-4.1.1.jar
967-
lib/jackson-annotations-2.18.6.jar
968-
lib/jackson-core-2.18.6.jar
969-
lib/jackson-databind-2.18.6.jar
970-
lib/jackson-dataformat-yaml-2.18.6.jar
971-
lib/jackson-datatype-joda-2.18.6.jar
972-
lib/jackson-datatype-jsr310-2.18.6.jar
967+
lib/jackson-annotations-2.21.jar
968+
lib/jackson-core-2.21.2.jar
969+
lib/jackson-databind-2.21.2.jar
970+
lib/jackson-dataformat-yaml-2.21.2.jar
971+
lib/jackson-datatype-joda-2.21.2.jar
972+
lib/jackson-datatype-jsr310-2.21.2.jar
973973
lib/jakarta.activation-api-2.1.3.jar
974974
lib/jakarta.annotation-api-2.1.1.jar
975975
lib/jakarta.el-api-5.0.0.jar

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

Lines changed: 6 additions & 6 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.21.jar
2222
commons-lang3-3.18.0.jar
2323
rmiio-2.1.2.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
24+
jackson-datatype-joda-2.21.2.jar
25+
jackson-annotations-2.21.jar
26+
jackson-dataformat-yaml-2.21.2.jar
27+
jackson-core-2.21.2.jar
28+
jackson-datatype-jsr310-2.21.2.jar
29+
jackson-databind-2.21.2.jar
3030
swagger-annotations-2.2.22.jar
3131
jaxb-runtime-4.0.2.jar
3232
jaxb-core-4.0.2.jar

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

Lines changed: 6 additions & 6 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.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
22+
jackson-datatype-jsr310-2.21.2.jar
23+
jackson-annotations-2.21.jar
24+
jackson-dataformat-yaml-2.21.2.jar
25+
jackson-core-2.21.2.jar
26+
jackson-datatype-joda-2.21.2.jar
27+
jackson-databind-2.21.2.jar
2828
httpclient5-5.4.4.jar
2929
httpcore5-h2-5.3.4.jar
3030
httpcore5-5.3.4.jar

0 commit comments

Comments
 (0)