Skip to content

Align all usages of Jackson to be 2.14.2 #93438

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 11 commits into from
Feb 7, 2023
Merged

Align all usages of Jackson to be 2.14.2 #93438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
afc5d36
partially done
jakelandis Nov 18, 2022
10a3475
finish alignment
jakelandis Nov 18, 2022
479ebef
Update docs/changelog/91725.yaml
jakelandis Nov 18, 2022
12755bf
align x-content
jakelandis Nov 18, 2022
282038d
Merge branch 'align_jackson_versions' of github.com:jakelandis/elasti…
pgomulka Feb 1, 2023
c92f3f6
keep azure on the same version
pgomulka Feb 1, 2023
3ad0ac1
update 2.14.0 -> 2.14.2
pgomulka Feb 1, 2023
75b074a
verification metadata
pgomulka Feb 2, 2023
fc20026
Update docs/changelog/93438.yaml
pgomulka Feb 2, 2023
8468c3b
fix maxind version
pgomulka Feb 2, 2023
caefb2a
Merge remote-tracking branch 'upstream/main' into jakelandis-align_ja…
pgomulka Feb 7, 2023
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
2 changes: 1 addition & 1 deletion build-tools-internal/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bundled_jdk = 19.0.2+7@fdb695a9d9064ad6b064dc6df578380c
# optional dependencies
spatial4j = 0.7
jts = 1.15.0
jackson = 2.13.3
jackson = 2.14.2
snakeyaml = 1.33
icu4j = 68.2
supercsv = 2.4.0
Expand Down
5 changes: 5 additions & 0 deletions docs/changelog/93438.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 93438
summary: Align all usages of Jackson to be 2.14.2
area: Infra/Core
type: upgrade
issues: []
2 changes: 1 addition & 1 deletion gradle/build.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
asm = "9.3"
jackson = "2.13.2"
jackson = "2.14.2"
junit5 = "5.8.1"
spock = "2.1-groovy-3.0"

Expand Down
70 changes: 0 additions & 70 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,16 +229,6 @@
<sha256 value="5ad94fbb2642df695892c4d6e2ab4c319821e5f9bfb7b920f1378de4f611417c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.13.2">
<artifact name="jackson-annotations-2.13.2.jar">
<sha256 value="7d3df5aafa2dc61ad1dbad30f411548c0184ed92d94628c63168721f08237cd4" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.13.3">
<artifact name="jackson-annotations-2.13.3.jar">
<sha256 value="5326a6fbcde7cf8817f36c254101cd45f6acea4258518cd3c80ee5b89f4e4b9b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.13.4">
<artifact name="jackson-annotations-2.13.4.jar">
<sha256 value="ac5b27a634942391ca113850ee7db01df1499a240174021263501c05fc653b44" origin="Generated by Gradle"/>
Expand All @@ -254,21 +244,6 @@
<sha256 value="2656010d1e921ac69b76fc7e0c0f5a6b14aca62fa9603e78831e6148eb7c77ba" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.core" name="jackson-core" version="2.13.1">
<artifact name="jackson-core-2.13.1.jar">
<sha256 value="8be6935cd8f9673ac684a589aaa1caecd57dee7c37ed1443d17924325799003d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.core" name="jackson-core" version="2.13.2">
<artifact name="jackson-core-2.13.2.jar">
<sha256 value="9bfa278ad05179fb68087851caf607652702ca25424bec8358a3716e751405c8" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.core" name="jackson-core" version="2.13.3">
<artifact name="jackson-core-2.13.3.jar">
<sha256 value="ab119a8ea3cc69472ebc0e870b849bfbbe536ad57d613dc38453ccd592ca6a3d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.core" name="jackson-core" version="2.13.4">
<artifact name="jackson-core-2.13.4.jar">
<sha256 value="4c2e043200edd9ee7ba6fc378bd5c17784a5bf2388e152d208068b51fd0839cf" origin="Generated by Gradle"/>
Expand All @@ -284,16 +259,6 @@
<sha256 value="f93db83891a53e8d268e2cc8fcd88ead2981edc2163e35c2a52c88d9ab57b4a0" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.13.2">
<artifact name="jackson-databind-2.13.2.jar">
<sha256 value="0d5459b7f18184c4ce8f07264b1b7feced51529e550a098d6f9e2dfe091138ad" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.13.3">
<artifact name="jackson-databind-2.13.3.jar">
<sha256 value="6444bf08d8cd4629740afc3db1276938f494728deb663ce585c4e91f6b45eb84" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.13.4.2">
<artifact name="jackson-databind-2.13.4.2.jar">
<sha256 value="ba1a368137f9b92f48dd07f299ff7a782a69487b853ef5578215426fcde8f08b" origin="Generated by Gradle"/>
Expand All @@ -304,56 +269,26 @@
<sha256 value="501d3abce4d18dcc381058ec593c5b94477906bba6efbac14dae40a642f77424" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-cbor" version="2.13.2">
<artifact name="jackson-dataformat-cbor-2.13.2.jar">
<sha256 value="bc2055d3c199f47b425ac527f895152b80174b43c53a9cf13a818df692a3f91e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-cbor" version="2.13.3">
<artifact name="jackson-dataformat-cbor-2.13.3.jar">
<sha256 value="8a6a687759739421b1f3c3f9678e7bc1cb37df5832e365996e2f412d7ca7e860" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-cbor" version="2.14.2">
<artifact name="jackson-dataformat-cbor-2.14.2.jar">
<sha256 value="c942726863a8b7e0483d30d9213f9dadc8b07eadf0767003a4fe6dc56daa7135" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-smile" version="2.13.2">
<artifact name="jackson-dataformat-smile-2.13.2.jar">
<sha256 value="cc492aaeeb5cdb899d175c8433846eeddf2a52e92aee79e94ce6a34f86f38f98" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-smile" version="2.14.2">
<artifact name="jackson-dataformat-smile-2.14.2.jar">
<sha256 value="9c279bb29770de09289c14cf8862dd195112687cd7fde815919f54a9157ce213" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-xml" version="2.13.2">
<artifact name="jackson-dataformat-xml-2.13.2.jar">
<sha256 value="8ea46758e5720695ab0fd9455d33ba698784a079248057a34148f2c23fe2f4b0" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-xml" version="2.13.4">
<artifact name="jackson-dataformat-xml-2.13.4.jar">
<sha256 value="76fbf0cedd51af6a13aba39c27c8c29a5a280dc24ee66577d559e4660d8709ce" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-yaml" version="2.13.2">
<artifact name="jackson-dataformat-yaml-2.13.2.jar">
<sha256 value="e0a4d674e5aaf30ed3cd045e7fd94e9b82f0a7fbe94b25c8c496f70977966ba3" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-yaml" version="2.14.2">
<artifact name="jackson-dataformat-yaml-2.14.2.jar">
<sha256 value="5c3a0a71d0339529c80ae771497b20fdc0fa7cb67c772f99af5935927560006a" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.datatype" name="jackson-datatype-jsr310" version="2.13.2">
<artifact name="jackson-datatype-jsr310-2.13.2.jar">
<sha256 value="cf5034791afbbec5139d539c1a94194f172d52a516ad9c25aad5f235a937c747" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.datatype" name="jackson-datatype-jsr310" version="2.13.4">
<artifact name="jackson-datatype-jsr310-2.13.4.jar">
<sha256 value="5ad75d210bacc17271925da28e1f393aaf8c83f6c92fbe5b2ed61954b84decf7" origin="Generated by Gradle"/>
Expand All @@ -374,11 +309,6 @@
<sha256 value="994a0a510a35d55a869567807075736597da97e9d36ad1ebaff5e37def5a55d3" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.module" name="jackson-module-jaxb-annotations" version="2.13.2">
<artifact name="jackson-module-jaxb-annotations-2.13.2.jar">
<sha256 value="7fdf1769b4feddbd73d89da47dc07b2e8230860700da00885a92bf7d66205376" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.module" name="jackson-module-jaxb-annotations" version="2.13.4">
<artifact name="jackson-module-jaxb-annotations-2.13.4.jar">
<sha256 value="b23725fd92b783e3ddc149d23f565b9da5bdfc98361be81488ff4e45e6735ba1" origin="Generated by Gradle"/>
Expand Down
6 changes: 3 additions & 3 deletions modules/ingest-geoip/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ tasks.named('internalClusterTestTestingConventions').configure {
dependencies {
implementation('com.maxmind.geoip2:geoip2:4.0.0')
// geoip2 dependencies:
runtimeOnly("com.fasterxml.jackson.core:jackson-annotations:2.14.2")
runtimeOnly("com.fasterxml.jackson.core:jackson-databind:2.14.2")
runtimeOnly("com.fasterxml.jackson.core:jackson-core:2.14.2")
runtimeOnly("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

as a matter of fact com.maxmind.geoip2:geoip2 declares its dependencies as

com.fasterxml.jackson.core » jackson-databind	2.13.4.2
com.fasterxml.jackson.core » jackson-core	2.13.4
com.fasterxml.jackson.core » jackson-annotations	2.13.4

so it could be the same argument as in repository-azure? #91725 (comment)

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm okay with us locking it onto the same version. We could always unlock it in the future if need be.

Copy link
Member

Choose a reason for hiding this comment

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

This was explicitly unlocked in the past. Upgrading Jackson can sometimes be very difficult. This was decoupled from other uses of Jackson so that we can upgrade them independently. Every time we start using versions.jackson again, we recouple them.

runtimeOnly("com.fasterxml.jackson.core:jackson-databind:${versions.jackson}")
runtimeOnly("com.fasterxml.jackson.core:jackson-core:${versions.jackson}")
implementation('com.maxmind.db:maxmind-db:3.0.0')

testImplementation 'org.elasticsearch:geolite2-databases:20191119'
Expand Down