From deb8567100b16be22624283c96f497781d7318b0 Mon Sep 17 00:00:00 2001 From: Robert Kruszewski Date: Thu, 21 Nov 2019 17:20:01 +0000 Subject: [PATCH 1/4] Fix: cleanup jackson version overrides --- versions.lock | 12 ++++++------ versions.props | 11 ----------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/versions.lock b/versions.lock index 3729cdb05..d1adbbf6b 100644 --- a/versions.lock +++ b/versions.lock @@ -1,12 +1,12 @@ # Run ./gradlew --write-locks to regenerate this file com.fasterxml:classmate:1.3.1 (1 constraints: a40e4f58) -com.fasterxml.jackson.core:jackson-annotations:2.10.1 (9 constraints: 34a6d7a3) -com.fasterxml.jackson.core:jackson-core:2.10.1 (14 constraints: a42963d5) -com.fasterxml.jackson.core:jackson-databind:2.10.1 (19 constraints: 60615739) -com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.10.1 (2 constraints: 741c10bc) +com.fasterxml.jackson.core:jackson-annotations:2.10.1 (9 constraints: 5da6fb11) +com.fasterxml.jackson.core:jackson-core:2.10.1 (14 constraints: e4293053) +com.fasterxml.jackson.core:jackson-databind:2.10.1 (19 constraints: a061ef90) +com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.10.1 (2 constraints: 941c47c9) com.fasterxml.jackson.datatype:jackson-datatype-guava:2.10.1 (3 constraints: 6a20e231) -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9 (3 constraints: 4a200b23) -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9 (2 constraints: a0134956) +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.1 (3 constraints: 6a20e231) +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.1 (2 constraints: c0138060) com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.10.1 (2 constraints: d12e2568) com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider:2.10.1 (1 constraints: 3605303b) com.fasterxml.jackson.module:jackson-module-afterburner:2.10.1 (3 constraints: 6a20e231) diff --git a/versions.props b/versions.props index b65ab6812..c2dbbf4c4 100644 --- a/versions.props +++ b/versions.props @@ -1,17 +1,6 @@ ch.qos.logback:logback-classic = 1.1.7 # catch-all jackson version com.fasterxml.jackson.*:jackson-* = 2.10.1 -# individual components are sometimes updated out of band to fix vulnerabilities -# https://github.com/FasterXML/jackson-databind/issues/2387 -# https://github.com/FasterXML/jackson-databind/issues/2389 -com.fasterxml.jackson.core:jackson-databind = 2.10.1 -com.fasterxml.jackson.datatype:jackson-datatype-guava = 2.10.1 -com.fasterxml.jackson.module:jackson-module-afterburner = 2.10.1 -com.fasterxml.jackson.datatype:jackson-datatype-jdk8 = 2.9.9 -com.fasterxml.jackson.datatype:jackson-datatype-jsr310 = 2.9.9 -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml = 2.10.1 -com.fasterxml.jackson.dataformat:jackson-dataformat-cbor = 2.9.9 -com.fasterxml.jackson.module:jackson-module-scala_2.11 = 2.10.1 com.github.ben-manes.caffeine:caffeine = 2.8.0 com.google.code.findbugs:jsr305 = 3.0.2 com.google.guava:guava = 23.6.1-jre From 755752fbec33ef6386bab44b6330d69b8ffab3c6 Mon Sep 17 00:00:00 2001 From: Robert Kruszewski Date: Thu, 21 Nov 2019 17:20:01 +0000 Subject: [PATCH 2/4] Add generated changelog entries --- changelog/@unreleased/pr-1334.v2.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/@unreleased/pr-1334.v2.yml diff --git a/changelog/@unreleased/pr-1334.v2.yml b/changelog/@unreleased/pr-1334.v2.yml new file mode 100644 index 000000000..d1be4f3f9 --- /dev/null +++ b/changelog/@unreleased/pr-1334.v2.yml @@ -0,0 +1,5 @@ +type: fix +fix: + description: Consistnetly specify jackson version as 2.10.1 + links: + - https://github.com/palantir/conjure-java-runtime/pull/1334 From 36953e823a66dcb66c55eabba64d3a8e641c15a8 Mon Sep 17 00:00:00 2001 From: Robert Kruszewski Date: Thu, 21 Nov 2019 17:23:55 +0000 Subject: [PATCH 3/4] Update pr-1334.v2.yml --- changelog/@unreleased/pr-1334.v2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/@unreleased/pr-1334.v2.yml b/changelog/@unreleased/pr-1334.v2.yml index d1be4f3f9..480e720e3 100644 --- a/changelog/@unreleased/pr-1334.v2.yml +++ b/changelog/@unreleased/pr-1334.v2.yml @@ -1,5 +1,5 @@ type: fix fix: - description: Consistnetly specify jackson version as 2.10.1 + description: Consistently specify jackson version as 2.10.1 links: - https://github.com/palantir/conjure-java-runtime/pull/1334 From d4d3fb75fe03a421999526fbce21a4ea740a9efb Mon Sep 17 00:00:00 2001 From: Robert Kruszewski Date: Thu, 21 Nov 2019 17:37:35 +0000 Subject: [PATCH 4/4] Account for duration config change --- .../com/palantir/conjure/java/serialization/ObjectMappers.java | 1 + 1 file changed, 1 insertion(+) diff --git a/conjure-java-jackson-serialization/src/main/java/com/palantir/conjure/java/serialization/ObjectMappers.java b/conjure-java-jackson-serialization/src/main/java/com/palantir/conjure/java/serialization/ObjectMappers.java index 378a919aa..0badf3589 100644 --- a/conjure-java-jackson-serialization/src/main/java/com/palantir/conjure/java/serialization/ObjectMappers.java +++ b/conjure-java-jackson-serialization/src/main/java/com/palantir/conjure/java/serialization/ObjectMappers.java @@ -104,6 +104,7 @@ public static ObjectMapper withDefaultModules(ObjectMapper mapper) { .registerModule(new JavaTimeModule()) .registerModule(new LenientLongModule()) .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) + .disable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS) .disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE) .disable(DeserializationFeature.WRAP_EXCEPTIONS) .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)