Skip to content

Commit b65f59a

Browse files
robert3005bulldozer-bot[bot]
authored andcommitted
Fix: Cleanup jackson version overrides (#1334)
Consistently specify jackson version as 2.10.1
1 parent a25aee7 commit b65f59a

File tree

4 files changed

+12
-17
lines changed

4 files changed

+12
-17
lines changed

changelog/@unreleased/pr-1334.v2.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
type: fix
2+
fix:
3+
description: Consistently specify jackson version as 2.10.1
4+
links:
5+
- https://github.com/palantir/conjure-java-runtime/pull/1334

conjure-java-jackson-serialization/src/main/java/com/palantir/conjure/java/serialization/ObjectMappers.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ public static ObjectMapper withDefaultModules(ObjectMapper mapper) {
104104
.registerModule(new JavaTimeModule())
105105
.registerModule(new LenientLongModule())
106106
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
107+
.disable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
107108
.disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE)
108109
.disable(DeserializationFeature.WRAP_EXCEPTIONS)
109110
.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)

versions.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Run ./gradlew --write-locks to regenerate this file
22
com.fasterxml:classmate:1.3.1 (1 constraints: a40e4f58)
3-
com.fasterxml.jackson.core:jackson-annotations:2.10.1 (9 constraints: 34a6d7a3)
4-
com.fasterxml.jackson.core:jackson-core:2.10.1 (14 constraints: a42963d5)
5-
com.fasterxml.jackson.core:jackson-databind:2.10.1 (19 constraints: 60615739)
6-
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.10.1 (2 constraints: 741c10bc)
3+
com.fasterxml.jackson.core:jackson-annotations:2.10.1 (9 constraints: 5da6fb11)
4+
com.fasterxml.jackson.core:jackson-core:2.10.1 (14 constraints: e4293053)
5+
com.fasterxml.jackson.core:jackson-databind:2.10.1 (19 constraints: a061ef90)
6+
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.10.1 (2 constraints: 941c47c9)
77
com.fasterxml.jackson.datatype:jackson-datatype-guava:2.10.1 (3 constraints: 6a20e231)
8-
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9 (3 constraints: 4a200b23)
9-
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9 (2 constraints: a0134956)
8+
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.1 (3 constraints: 6a20e231)
9+
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.1 (2 constraints: c0138060)
1010
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.10.1 (2 constraints: d12e2568)
1111
com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider:2.10.1 (1 constraints: 3605303b)
1212
com.fasterxml.jackson.module:jackson-module-afterburner:2.10.1 (3 constraints: 6a20e231)

versions.props

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
ch.qos.logback:logback-classic = 1.1.7
22
# catch-all jackson version
33
com.fasterxml.jackson.*:jackson-* = 2.10.1
4-
# individual components are sometimes updated out of band to fix vulnerabilities
5-
# https://github.com/FasterXML/jackson-databind/issues/2387
6-
# https://github.com/FasterXML/jackson-databind/issues/2389
7-
com.fasterxml.jackson.core:jackson-databind = 2.10.1
8-
com.fasterxml.jackson.datatype:jackson-datatype-guava = 2.10.1
9-
com.fasterxml.jackson.module:jackson-module-afterburner = 2.10.1
10-
com.fasterxml.jackson.datatype:jackson-datatype-jdk8 = 2.9.9
11-
com.fasterxml.jackson.datatype:jackson-datatype-jsr310 = 2.9.9
12-
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml = 2.10.1
13-
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor = 2.9.9
14-
com.fasterxml.jackson.module:jackson-module-scala_2.11 = 2.10.1
154
com.github.ben-manes.caffeine:caffeine = 2.8.0
165
com.google.code.findbugs:jsr305 = 3.0.2
176
com.google.guava:guava = 23.6.1-jre

0 commit comments

Comments
 (0)