Skip to content

Fix: Cleanup jackson version overrides #1334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 21, 2019
Merged

Fix: Cleanup jackson version overrides #1334

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
deb8567
Fix: cleanup jackson version overrides
Nov 21, 2019
755752f
Add generated changelog entries
Nov 21, 2019
36953e8
Update pr-1334.v2.yml
robert3005 Nov 21, 2019
d4d3fb7
Account for duration config change
Nov 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog/@unreleased/pr-1334.v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
12 changes: 6 additions & 6 deletions versions.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

heh

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)
Expand Down
11 changes: 0 additions & 11 deletions versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For future reference, a star constraint like the above will handle these hotfix releases just fine as well.
As in, it will try to find the given version for all components, but will fall back to the highest constrained version (of a bottom lib like jackson-databind) if the requested version doesn't exist.

In fact jackson itself features in gradle's integration tests for this feature:
https://github.com/gradle/gradle/blob/5d5c27d35e276d674da9a28a4af972d79589b78d/subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/alignment/AlignmentIntegrationTest.groovy#L241-L292

# 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
Expand Down