Skip to content

Commit 8b8a2be

Browse files
rjernstrjernst
authored
Upgrade Jackson xml to 2.15.0 (elastic#95641)
Additionally this commit updates snakeyaml to 2.0 as that is the version now used by Jackson.
1 parent f58f0d6 commit 8b8a2be

File tree

5 files changed

+86
-6
lines changed

5 files changed

+86
-6
lines changed

‎build-tools-internal/version.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ bundled_jdk = 20.0.1+9@b4887098932d415489976708ad6d1a4b
77
# optional dependencies
88
spatial4j = 0.7
99
jts = 1.15.0
10-
jackson = 2.14.2
11-
snakeyaml = 1.33
10+
jackson = 2.15.0
11+
snakeyaml = 2.0
1212
icu4j = 68.2
1313
supercsv = 2.4.0
1414
log4j = 2.19.0

‎docs/changelog/95641.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 95641
2+
summary: Upgrade Jackson xml to 2.15.0
3+
area: Infra/Core
4+
type: upgrade
5+
issues: []

‎gradle/build.versions.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
2-
asm = "9.3"
3-
jackson = "2.14.2"
2+
asm = "9.4"
3+
jackson = "2.15.0"
44
junit5 = "5.8.1"
55
spock = "2.1-groovy-3.0"
66

@@ -35,7 +35,7 @@ junit5-vintage = { group = "org.junit.vintage", name="junit-vintage-engine", ver
3535
maven-model = "org.apache.maven:maven-model:3.6.2"
3636
mockito-core = "org.mockito:mockito-core:1.9.5"
3737
nebula-info = "com.netflix.nebula:gradle-info-plugin:11.3.3"
38-
shadow-plugin = "gradle.plugin.com.github.johnrengelman:shadow:7.1.2"
38+
shadow-plugin = "gradle.plugin.com.github.johnrengelman:shadow:8.0.0"
3939
spock-core = { group = "org.spockframework", name="spock-core", version.ref="spock" }
4040
spock-junit4 = { group = "org.spockframework", name="spock-junit4", version.ref="spock" }
4141
spock-platform = { group = "org.spockframework", name="spock-bom", version.ref="spock" }

‎gradle/verification-metadata.xml‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@
6464
<sha256 value="3366d2c88fb576e486d830f521184e8f1839f8c15dcd2151a3f6e1f62b0b37a0" origin="Generated by Gradle"/>
6565
</artifact>
6666
</component>
67+
<component group="ch.randelshofer" name="fastdoubleparser" version="0.8.0">
68+
<artifact name="fastdoubleparser-0.8.0.jar">
69+
<sha256 value="10fe288fd7a2cdaf5175332b73529f9abf8fd54dcfff317d6967c0c35ffb133b" origin="Generated by Gradle"/>
70+
</artifact>
71+
</component>
6772
<component group="co.elastic.apm" name="elastic-apm-agent" version="1.36.0">
6873
<artifact name="elastic-apm-agent-1.36.0.jar">
6974
<sha256 value="3be90268557494f88fe252caf6358d4107aa9349852b8704b1e0ff4831cb74d6" origin="Generated by Gradle"/>
@@ -244,6 +249,11 @@
244249
<sha256 value="2c6869d505cf60dc066734b7d50339f975bd3adc635e26a78abb71acb4473c0d" origin="Generated by Gradle"/>
245250
</artifact>
246251
</component>
252+
<component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.15.0">
253+
<artifact name="jackson-annotations-2.15.0.jar">
254+
<sha256 value="91adcd3dcf5fd9a16499934e7536a23d456692a0093e3d4fd52f138c3936348c" origin="Generated by Gradle"/>
255+
</artifact>
256+
</component>
247257
<component group="com.fasterxml.jackson.core" name="jackson-core" version="2.10.5">
248258
<artifact name="jackson-core-2.10.5.jar">
249259
<sha256 value="2656010d1e921ac69b76fc7e0c0f5a6b14aca62fa9603e78831e6148eb7c77ba" origin="Generated by Gradle"/>
@@ -259,6 +269,11 @@
259269
<sha256 value="b5d37a77c88277b97e3593c8740925216c06df8e4172bbde058528df04ad3e7a" origin="Generated by Gradle"/>
260270
</artifact>
261271
</component>
272+
<component group="com.fasterxml.jackson.core" name="jackson-core" version="2.15.0">
273+
<artifact name="jackson-core-2.15.0.jar">
274+
<sha256 value="5b483f68fa9dd6aa37da37d1f79dd5c4b9464238f4f0660a242cb6b5c724950c" origin="Generated by Gradle"/>
275+
</artifact>
276+
</component>
262277
<component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.10.5.1">
263278
<artifact name="jackson-databind-2.10.5.1.jar">
264279
<sha256 value="f93db83891a53e8d268e2cc8fcd88ead2981edc2163e35c2a52c88d9ab57b4a0" origin="Generated by Gradle"/>
@@ -274,16 +289,31 @@
274289
<sha256 value="501d3abce4d18dcc381058ec593c5b94477906bba6efbac14dae40a642f77424" origin="Generated by Gradle"/>
275290
</artifact>
276291
</component>
292+
<component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.15.0">
293+
<artifact name="jackson-databind-2.15.0.jar">
294+
<sha256 value="00c5a5d5ae71ac8e8d5b8da606841e2251c806355939cb5d51c4cdc6b644a0dc" origin="Generated by Gradle"/>
295+
</artifact>
296+
</component>
277297
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-cbor" version="2.14.2">
278298
<artifact name="jackson-dataformat-cbor-2.14.2.jar">
279299
<sha256 value="c942726863a8b7e0483d30d9213f9dadc8b07eadf0767003a4fe6dc56daa7135" origin="Generated by Gradle"/>
280300
</artifact>
281301
</component>
302+
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-cbor" version="2.15.0">
303+
<artifact name="jackson-dataformat-cbor-2.15.0.jar">
304+
<sha256 value="da59dba8212ea0886cf2ecf0e67365850db417b92a238e746a13381028cd2d75" origin="Generated by Gradle"/>
305+
</artifact>
306+
</component>
282307
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-smile" version="2.14.2">
283308
<artifact name="jackson-dataformat-smile-2.14.2.jar">
284309
<sha256 value="9c279bb29770de09289c14cf8862dd195112687cd7fde815919f54a9157ce213" origin="Generated by Gradle"/>
285310
</artifact>
286311
</component>
312+
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-smile" version="2.15.0">
313+
<artifact name="jackson-dataformat-smile-2.15.0.jar">
314+
<sha256 value="bc9d5020ffce81eca245c9148054600134a209b3d279d7be38fa4f2c07f7a505" origin="Generated by Gradle"/>
315+
</artifact>
316+
</component>
287317
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-xml" version="2.13.4">
288318
<artifact name="jackson-dataformat-xml-2.13.4.jar">
289319
<sha256 value="76fbf0cedd51af6a13aba39c27c8c29a5a280dc24ee66577d559e4660d8709ce" origin="Generated by Gradle"/>
@@ -294,6 +324,11 @@
294324
<sha256 value="5c3a0a71d0339529c80ae771497b20fdc0fa7cb67c772f99af5935927560006a" origin="Generated by Gradle"/>
295325
</artifact>
296326
</component>
327+
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-yaml" version="2.15.0">
328+
<artifact name="jackson-dataformat-yaml-2.15.0.jar">
329+
<sha256 value="691a0a605de15ea610180317331957fe6f7e91f45471ee45cbf9832d74291c31" origin="Generated by Gradle"/>
330+
</artifact>
331+
</component>
297332
<component group="com.fasterxml.jackson.datatype" name="jackson-datatype-jsr310" version="2.13.4">
298333
<artifact name="jackson-datatype-jsr310-2.13.4.jar">
299334
<sha256 value="5ad75d210bacc17271925da28e1f393aaf8c83f6c92fbe5b2ed61954b84decf7" origin="Generated by Gradle"/>
@@ -1099,6 +1134,11 @@
10991134
<sha256 value="bf705cc2ea5c0180aa870a0fa80b39bf13a14d27128e1eb3a4b674be34f58e90" origin="Generated by Gradle"/>
11001135
</artifact>
11011136
</component>
1137+
<component group="gradle.plugin.com.github.johnrengelman" name="shadow" version="8.0.0">
1138+
<artifact name="shadow-8.0.0.jar">
1139+
<sha256 value="1b13b1ffbb2400dfba6b3758e691a7a843727bce161c7826a1e871e19196fe14" origin="Generated by Gradle"/>
1140+
</artifact>
1141+
</component>
11021142
<component group="gradle.plugin.org.jetbrains.gradle.plugin.idea-ext" name="gradle-idea-ext" version="1.1.4">
11031143
<artifact name="gradle-idea-ext-1.1.4.jar">
11041144
<sha256 value="97d371d6996c3c510b5d6f0298dd541229b63248decc61159b73ab9ed59e777d" origin="Generated by Gradle"/>
@@ -2431,6 +2471,11 @@
24312471
<sha256 value="b0d8a4c8ab4fb8b1888d0095822703b0e6d4793c419550203da9e69196161de4" origin="Generated by Gradle"/>
24322472
</artifact>
24332473
</component>
2474+
<component group="org.apache.logging.log4j" name="log4j-api" version="2.18.0">
2475+
<artifact name="log4j-api-2.18.0.jar">
2476+
<sha256 value="b977057233153b242ac58cc5b7d3121136b9c34c86c1e191c042ba4a828144c5" origin="Generated by Gradle"/>
2477+
</artifact>
2478+
</component>
24342479
<component group="org.apache.logging.log4j" name="log4j-api" version="2.19.0">
24352480
<artifact name="log4j-api-2.19.0.jar">
24362481
<sha256 value="5ccb24ad9f92e768d0bc456d3061a737951262df803e004d2cad096b75a88d60" origin="Generated by Gradle"/>
@@ -2441,6 +2486,11 @@
24412486
<sha256 value="c967f223487980b9364e94a7c7f9a8a01fd3ee7c19bdbf0b0f9f8cb8511f3d41" origin="Generated by Gradle"/>
24422487
</artifact>
24432488
</component>
2489+
<component group="org.apache.logging.log4j" name="log4j-core" version="2.18.0">
2490+
<artifact name="log4j-core-2.18.0.jar">
2491+
<sha256 value="ec7a23bfaf4d8ddf3394671561dd4a0f35b69d6fa6918734e3e8bc4066f741c4" origin="Generated by Gradle"/>
2492+
</artifact>
2493+
</component>
24442494
<component group="org.apache.logging.log4j" name="log4j-core" version="2.19.0">
24452495
<artifact name="log4j-core-2.19.0.jar">
24462496
<sha256 value="b4a1796fab7bfc36df015c1b4052459147997e8d215a7199d71d05f9e747e4f4" origin="Generated by Gradle"/>
@@ -2874,6 +2924,11 @@
28742924
<sha256 value="52d85e04b3918722af11d12855b4a8257df96a0e76c8f4e3852e6faa851f357b" origin="Generated by Gradle"/>
28752925
</artifact>
28762926
</component>
2927+
<component group="org.codehaus.plexus" name="plexus-utils" version="3.4.2">
2928+
<artifact name="plexus-utils-3.4.2.jar">
2929+
<sha256 value="f957f13604ea1686de805801862f339dbbb6eab9a66f9cc7e4a5c5b27e4fcecc" origin="Generated by Gradle"/>
2930+
</artifact>
2931+
</component>
28772932
<component group="org.codehaus.woodstox" name="stax2-api" version="4.2.1">
28782933
<artifact name="stax2-api-4.2.1.jar">
28792934
<sha256 value="678567e48b51a42c65c699f266539ad3d676d4b1a5b0ad7d89ece8b9d5772579" origin="Generated by Gradle"/>
@@ -3199,6 +3254,11 @@
31993254
<sha256 value="1345f11ba606d15603d6740551a8c21947c0215640770ec67271fe78bea97cf5" origin="Generated by Gradle"/>
32003255
</artifact>
32013256
</component>
3257+
<component group="org.jdom" name="jdom2" version="2.0.6.1">
3258+
<artifact name="jdom2-2.0.6.1.jar">
3259+
<sha256 value="0b20f45e3a0fd8f0d12cdc5316b06776e902b1365db00118876f9175c60f302c" origin="Generated by Gradle"/>
3260+
</artifact>
3261+
</component>
32023262
<component group="org.jetbrains" name="annotations" version="13.0">
32033263
<artifact name="annotations-13.0.jar">
32043264
<sha256 value="ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478" origin="Generated by Gradle"/>
@@ -3619,6 +3679,11 @@
36193679
<sha256 value="be4ce53138a238bb522cd781cf91f3ba5ce2f6ca93ec62d46a162a127225e0a6" origin="Generated by Gradle"/>
36203680
</artifact>
36213681
</component>
3682+
<component group="org.ow2.asm" name="asm-commons" version="9.4">
3683+
<artifact name="asm-commons-9.4.jar">
3684+
<sha256 value="0c128a9ec3f33c98959272f6d16cf14247b508f58951574bcdbd2b56d6326364" origin="Generated by Gradle"/>
3685+
</artifact>
3686+
</component>
36223687
<component group="org.ow2.asm" name="asm-tree" version="7.2">
36233688
<artifact name="asm-tree-7.2.jar">
36243689
<sha256 value="c063f5a67fa03cdc9bd79fd1c2ea6816cc4a19473ecdfbd9e9153b408c6f2656" origin="Generated by Gradle"/>
@@ -3784,6 +3849,11 @@
37843849
<sha256 value="d63efd5746ff408943a7dd7ef85ae9f09aa7fb63bb2b16911427ce6c45b59fd0" origin="Generated by Gradle"/>
37853850
</artifact>
37863851
</component>
3852+
<component group="org.vafer" name="jdependency" version="2.8.0">
3853+
<artifact name="jdependency-2.8.0.jar">
3854+
<sha256 value="bfd2cc7e1bfc78aa83b44c0a54bf2cde38a4382ec24728af683d98dc6be78192" origin="Generated by Gradle"/>
3855+
</artifact>
3856+
</component>
37873857
<component group="org.xerial.snappy" name="snappy-java" version="1.0.4.1">
37883858
<artifact name="snappy-java-1.0.4.1.jar">
37893859
<sha256 value="52533e94f79beacb9862bac33fa2e2fc724a8cfb2a739c33ae4ea10515f2bb86" origin="Generated by Gradle"/>
@@ -3812,6 +3882,11 @@
38123882
<sha256 value="11ff459788f0a2d781f56a4a86d7e69202cebacd0273d5269c4ae9f02f3fd8f0" origin="Generated by Gradle"/>
38133883
</artifact>
38143884
</component>
3885+
<component group="org.yaml" name="snakeyaml" version="2.0">
3886+
<artifact name="snakeyaml-2.0.jar">
3887+
<sha256 value="880c9d896e4b74a06c549c15ca496450165d6909fa15d7e662bee8f6a66d7afa" origin="Generated by Gradle"/>
3888+
</artifact>
3889+
</component>
38153890
<component group="ua.net.nlp" name="morfologik-ukrainian-search" version="3.7.5">
38163891
<artifact name="morfologik-ukrainian-search-3.7.5.jar">
38173892
<sha256 value="1c7e5f7158e02bd35924a73a85958313c95a00d0973f830d0d19a8268a35a668" origin="Generated by Gradle"/>

‎libs/x-content/impl/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ apply plugin: 'elasticsearch.java'
1010

1111
archivesBaseName = "x-content-impl"
1212

13-
String jacksonVersion = "2.14.2"
13+
String jacksonVersion = "2.15.0"
1414

1515
dependencies {
1616
compileOnly project(':libs:elasticsearch-core')

0 commit comments

Comments
 (0)