Skip to content

Commit d065d4b

Browse files
authored
Remove jackson override and upgrade to jackson to 2.14.2 (#93342)
before the jackson 2.14.2 elasticserach had to override the jackson locally to avoid a bug when filtering empty arrays. #92984 This commit reverts the local override and upgrades jackson to 2.14.2 which contain the fix to the bug
1 parent 2a6e521 commit d065d4b

File tree

6 files changed

+125
-1278
lines changed

6 files changed

+125
-1278
lines changed

gradle/verification-metadata.xml

Lines changed: 123 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,9 @@
274274
<sha256 value="4c2e043200edd9ee7ba6fc378bd5c17784a5bf2388e152d208068b51fd0839cf" origin="Generated by Gradle"/>
275275
</artifact>
276276
</component>
277-
<component group="com.fasterxml.jackson.core" name="jackson-core" version="2.14.1">
278-
<artifact name="jackson-core-2.14.1.jar">
279-
<sha256 value="0114187e296b34c931c1bf9e5a84152b62bfab7d182f5623f3982dc2da35e526" origin="Generated by Gradle"/>
277+
<component group="com.fasterxml.jackson.core" name="jackson-core" version="2.14.2">
278+
<artifact name="jackson-core-2.14.2.jar">
279+
<sha256 value="b5d37a77c88277b97e3593c8740925216c06df8e4172bbde058528df04ad3e7a" origin="Generated by Gradle"/>
280280
</artifact>
281281
</component>
282282
<component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.10.5.1">
@@ -319,19 +319,19 @@
319319
<sha256 value="8a6a687759739421b1f3c3f9678e7bc1cb37df5832e365996e2f412d7ca7e860" origin="Generated by Gradle"/>
320320
</artifact>
321321
</component>
322-
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-cbor" version="2.14.1">
323-
<artifact name="jackson-dataformat-cbor-2.14.1.jar">
324-
<sha256 value="aa491e4850fbf278d321d42e924e0471aa51666584baf200d1851bb1ce4562c1" origin="Generated by Gradle"/>
322+
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-cbor" version="2.14.2">
323+
<artifact name="jackson-dataformat-cbor-2.14.2.jar">
324+
<sha256 value="c942726863a8b7e0483d30d9213f9dadc8b07eadf0767003a4fe6dc56daa7135" origin="Generated by Gradle"/>
325325
</artifact>
326326
</component>
327327
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-smile" version="2.13.2">
328328
<artifact name="jackson-dataformat-smile-2.13.2.jar">
329329
<sha256 value="cc492aaeeb5cdb899d175c8433846eeddf2a52e92aee79e94ce6a34f86f38f98" origin="Generated by Gradle"/>
330330
</artifact>
331331
</component>
332-
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-smile" version="2.14.1">
333-
<artifact name="jackson-dataformat-smile-2.14.1.jar">
334-
<sha256 value="63dacc4cc9288b89ef9d3e664fed687ba296c9f808e674e95884aea387a9e552" origin="Generated by Gradle"/>
332+
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-smile" version="2.14.2">
333+
<artifact name="jackson-dataformat-smile-2.14.2.jar">
334+
<sha256 value="9c279bb29770de09289c14cf8862dd195112687cd7fde815919f54a9157ce213" origin="Generated by Gradle"/>
335335
</artifact>
336336
</component>
337337
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-xml" version="2.13.2">
@@ -349,9 +349,9 @@
349349
<sha256 value="e0a4d674e5aaf30ed3cd045e7fd94e9b82f0a7fbe94b25c8c496f70977966ba3" origin="Generated by Gradle"/>
350350
</artifact>
351351
</component>
352-
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-yaml" version="2.14.1">
353-
<artifact name="jackson-dataformat-yaml-2.14.1.jar">
354-
<sha256 value="9e157e2625ed855ab73af7915e256f6823993a30982f4923c9ca82bb752a0303" origin="Generated by Gradle"/>
352+
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-yaml" version="2.14.2">
353+
<artifact name="jackson-dataformat-yaml-2.14.2.jar">
354+
<sha256 value="5c3a0a71d0339529c80ae771497b20fdc0fa7cb67c772f99af5935927560006a" origin="Generated by Gradle"/>
355355
</artifact>
356356
</component>
357357
<component group="com.fasterxml.jackson.datatype" name="jackson-datatype-jsr310" version="2.13.2">
@@ -759,36 +759,31 @@
759759
<sha256 value="37f5216e14af2772930dff9b8734353f0a80e89ba3f33e065441de6537c5e842" origin="Generated by Gradle"/>
760760
</artifact>
761761
</component>
762-
<component group="com.ibm.icu" name="icu4j" version="61.1">
763-
<artifact name="icu4j-61.1.jar">
764-
<sha256 value="55c98eb1838b2a4bb9a07dc36bd378532d64d0cdcb7ceee914236866a7de4464"
765-
origin="Generated by Gradle"/>
766-
</artifact>
767-
</component>
768-
<component group="com.ibm.icu" name="icu4j" version="68.2">
769-
<artifact name="icu4j-68.2.jar">
770-
<sha256 value="9bd7bf869a44ba8aeb0cddd7e6616e88cd4795ba5bfce2230447cb0e185a646c"
771-
origin="Generated by Gradle"/>
772-
</artifact>
773-
</component>
774-
<component group="com.ibm.icu" name="icu4j" version="71.1">
775-
<artifact name="icu4j-71.1.jar">
776-
<sha256 value="91c4f8ebf0ceb489547098fe9d5c09a65eb419caea6ed714867f5280800bcf1a"
777-
origin="Generated by Gradle"/>
778-
</artifact>
779-
</component>
780-
<component group="com.jamesmurty.utils" name="java-xmlbuilder" version="0.4">
781-
<artifact name="java-xmlbuilder-0.4.jar">
782-
<sha256 value="681e53c4ffd59fa12068803b259e3a83d43f07a47c112e748a187dee179eb31f"
783-
origin="Generated by Gradle"/>
784-
</artifact>
785-
</component>
786-
<component group="com.jcraft" name="jsch" version="0.1.54">
787-
<artifact name="jsch-0.1.54.jar">
788-
<sha256 value="92eb273a3316762478fdd4fe03a0ce1842c56f496c9c12fe1235db80450e1fdb"
789-
origin="Generated by Gradle"/>
790-
</artifact>
791-
</component>
762+
<component group="com.ibm.icu" name="icu4j" version="61.1">
763+
<artifact name="icu4j-61.1.jar">
764+
<sha256 value="55c98eb1838b2a4bb9a07dc36bd378532d64d0cdcb7ceee914236866a7de4464" origin="Generated by Gradle"/>
765+
</artifact>
766+
</component>
767+
<component group="com.ibm.icu" name="icu4j" version="68.2">
768+
<artifact name="icu4j-68.2.jar">
769+
<sha256 value="9bd7bf869a44ba8aeb0cddd7e6616e88cd4795ba5bfce2230447cb0e185a646c" origin="Generated by Gradle"/>
770+
</artifact>
771+
</component>
772+
<component group="com.ibm.icu" name="icu4j" version="71.1">
773+
<artifact name="icu4j-71.1.jar">
774+
<sha256 value="91c4f8ebf0ceb489547098fe9d5c09a65eb419caea6ed714867f5280800bcf1a" origin="Generated by Gradle"/>
775+
</artifact>
776+
</component>
777+
<component group="com.jamesmurty.utils" name="java-xmlbuilder" version="0.4">
778+
<artifact name="java-xmlbuilder-0.4.jar">
779+
<sha256 value="681e53c4ffd59fa12068803b259e3a83d43f07a47c112e748a187dee179eb31f" origin="Generated by Gradle"/>
780+
</artifact>
781+
</component>
782+
<component group="com.jcraft" name="jsch" version="0.1.54">
783+
<artifact name="jsch-0.1.54.jar">
784+
<sha256 value="92eb273a3316762478fdd4fe03a0ce1842c56f496c9c12fe1235db80450e1fdb" origin="Generated by Gradle"/>
785+
</artifact>
786+
</component>
792787
<component group="com.jcraft" name="jsch" version="0.1.55">
793788
<artifact name="jsch-0.1.55.jar">
794789
<sha256 value="d492b15a6d2ea3f1cc39c422c953c40c12289073dbe8360d98c0f6f9ec74fc44" origin="Generated by Gradle"/>
@@ -1688,82 +1683,69 @@
16881683
<sha256 value="adb1a33c07b45c39b926bdeeadf800f701be9c3d04e0deb543069e5f09856185" origin="Generated by Gradle"/>
16891684
</artifact>
16901685
</component>
1691-
<component group="org.abego.treelayout" name="org.abego.treelayout.core" version="1.0.3">
1692-
<artifact name="org.abego.treelayout.core-1.0.3.jar">
1693-
<sha256 value="fa5e31395c39c2e7d46aca0f81f72060931607b2fa41bd36038eb2cb6fb93326"
1694-
origin="Generated by Gradle"/>
1695-
</artifact>
1696-
</component>
1697-
<component group="org.antlr" name="ST4" version="4.3">
1698-
<artifact name="ST4-4.3.jar">
1699-
<sha256 value="28547dba48cfceb77b6efbfe069aebe9ed3324ae60dbd52093d13a1d636ed069"
1700-
origin="Generated by Gradle"/>
1701-
</artifact>
1702-
</component>
1703-
<component group="org.antlr" name="ST4" version="4.3.4">
1704-
<artifact name="ST4-4.3.4.jar">
1705-
<sha256 value="f927ac384c46d749f8b5ec68972a53aed21e00313509299616edb73bfa15ff33"
1706-
origin="Generated by Gradle"/>
1707-
</artifact>
1708-
</component>
1709-
<component group="org.antlr" name="antlr-runtime" version="3.4">
1710-
<artifact name="antlr-runtime-3.4.jar">
1711-
<sha256 value="5b7cf53b7b30b034023f58030c8147c433f2bee0fe7dec8fae6bebf3708c5a63"
1712-
origin="Generated by Gradle"/>
1713-
</artifact>
1714-
</component>
1715-
<component group="org.antlr" name="antlr-runtime" version="3.5.2">
1716-
<artifact name="antlr-runtime-3.5.2.jar">
1717-
<sha256 value="ce3fc8ecb10f39e9a3cddcbb2ce350d272d9cd3d0b1e18e6fe73c3b9389c8734"
1718-
origin="Generated by Gradle"/>
1719-
</artifact>
1720-
</component>
1721-
<component group="org.antlr" name="antlr-runtime" version="3.5.3">
1722-
<artifact name="antlr-runtime-3.5.3.jar">
1723-
<sha256 value="68bf9f5a33dfcb34033495c587e6236bef4e37aa6612919f5b1e843b90669fb9"
1724-
origin="Generated by Gradle"/>
1725-
</artifact>
1726-
</component>
1727-
<component group="org.antlr" name="antlr4" version="4.11.1">
1728-
<artifact name="antlr4-4.11.1.jar">
1729-
<sha256 value="e9686e8a663ca512afe3a2eeb6f6ad3f303abb46188991f19ebc6a0fd9c1c14f"
1730-
origin="Generated by Gradle"/>
1731-
</artifact>
1732-
</component>
1733-
<component group="org.antlr" name="antlr4" version="4.5.3">
1734-
<artifact name="antlr4-4.5.3.jar">
1735-
<sha256 value="a32de739cfdf515774e696f91aa9697d2e7731e5cb5045ca8a4b657f8b1b4fb4"
1736-
origin="Generated by Gradle"/>
1737-
</artifact>
1738-
</component>
1739-
<component group="org.antlr" name="antlr4" version="4.9.2">
1740-
<artifact name="antlr4-4.9.2.jar">
1741-
<sha256 value="7d66253762da7c8c7ab6ac05da1471aeeb3cb8e92310ecfb08f939306b4c7dae"
1742-
origin="Generated by Gradle"/>
1743-
</artifact>
1744-
</component>
1745-
<component group="org.antlr" name="antlr4-runtime" version="4.10.1">
1746-
<artifact name="antlr4-runtime-4.10.1.jar">
1747-
<sha256 value="da66be0c98acfb29bc708300d05f1a3269c40f9984a4cb9251cf2ba1898d1334"
1748-
origin="Generated by Gradle"/>
1749-
</artifact>
1750-
</component>
1751-
<component group="org.antlr" name="antlr4-runtime" version="4.11.1">
1752-
<artifact name="antlr4-runtime-4.11.1.jar">
1753-
<sha256 value="e06c6553c1ccc14d36052ec4b0fc6f13b808cf957b5b1dc3f61bf401996ada59"
1754-
origin="Generated by Gradle"/>
1755-
</artifact>
1756-
</component>
1757-
<component group="org.antlr" name="antlr4-runtime" version="4.5.1-1">
1758-
<artifact name="antlr4-runtime-4.5.1-1.jar">
1759-
<sha256 value="ffca72bc2a25bb2b0c80a58cee60530a78be17da739bb6c91a8c2e3584ca099e"
1760-
origin="Generated by Gradle"/>
1761-
</artifact>
1762-
</component>
1763-
<component group="org.antlr" name="antlr4-runtime" version="4.5.3">
1764-
<artifact name="antlr4-runtime-4.5.3.jar">
1765-
<sha256 value="93bca08ec995caeaaf60bdf80035a0be8507fcdabd3c2618fd8c5aab4444a752"
1766-
origin="Generated by Gradle"/>
1686+
<component group="org.abego.treelayout" name="org.abego.treelayout.core" version="1.0.3">
1687+
<artifact name="org.abego.treelayout.core-1.0.3.jar">
1688+
<sha256 value="fa5e31395c39c2e7d46aca0f81f72060931607b2fa41bd36038eb2cb6fb93326" origin="Generated by Gradle"/>
1689+
</artifact>
1690+
</component>
1691+
<component group="org.antlr" name="ST4" version="4.3">
1692+
<artifact name="ST4-4.3.jar">
1693+
<sha256 value="28547dba48cfceb77b6efbfe069aebe9ed3324ae60dbd52093d13a1d636ed069" origin="Generated by Gradle"/>
1694+
</artifact>
1695+
</component>
1696+
<component group="org.antlr" name="ST4" version="4.3.4">
1697+
<artifact name="ST4-4.3.4.jar">
1698+
<sha256 value="f927ac384c46d749f8b5ec68972a53aed21e00313509299616edb73bfa15ff33" origin="Generated by Gradle"/>
1699+
</artifact>
1700+
</component>
1701+
<component group="org.antlr" name="antlr-runtime" version="3.4">
1702+
<artifact name="antlr-runtime-3.4.jar">
1703+
<sha256 value="5b7cf53b7b30b034023f58030c8147c433f2bee0fe7dec8fae6bebf3708c5a63" origin="Generated by Gradle"/>
1704+
</artifact>
1705+
</component>
1706+
<component group="org.antlr" name="antlr-runtime" version="3.5.2">
1707+
<artifact name="antlr-runtime-3.5.2.jar">
1708+
<sha256 value="ce3fc8ecb10f39e9a3cddcbb2ce350d272d9cd3d0b1e18e6fe73c3b9389c8734" origin="Generated by Gradle"/>
1709+
</artifact>
1710+
</component>
1711+
<component group="org.antlr" name="antlr-runtime" version="3.5.3">
1712+
<artifact name="antlr-runtime-3.5.3.jar">
1713+
<sha256 value="68bf9f5a33dfcb34033495c587e6236bef4e37aa6612919f5b1e843b90669fb9" origin="Generated by Gradle"/>
1714+
</artifact>
1715+
</component>
1716+
<component group="org.antlr" name="antlr4" version="4.11.1">
1717+
<artifact name="antlr4-4.11.1.jar">
1718+
<sha256 value="e9686e8a663ca512afe3a2eeb6f6ad3f303abb46188991f19ebc6a0fd9c1c14f" origin="Generated by Gradle"/>
1719+
</artifact>
1720+
</component>
1721+
<component group="org.antlr" name="antlr4" version="4.5.3">
1722+
<artifact name="antlr4-4.5.3.jar">
1723+
<sha256 value="a32de739cfdf515774e696f91aa9697d2e7731e5cb5045ca8a4b657f8b1b4fb4" origin="Generated by Gradle"/>
1724+
</artifact>
1725+
</component>
1726+
<component group="org.antlr" name="antlr4" version="4.9.2">
1727+
<artifact name="antlr4-4.9.2.jar">
1728+
<sha256 value="7d66253762da7c8c7ab6ac05da1471aeeb3cb8e92310ecfb08f939306b4c7dae" origin="Generated by Gradle"/>
1729+
</artifact>
1730+
</component>
1731+
<component group="org.antlr" name="antlr4-runtime" version="4.10.1">
1732+
<artifact name="antlr4-runtime-4.10.1.jar">
1733+
<sha256 value="da66be0c98acfb29bc708300d05f1a3269c40f9984a4cb9251cf2ba1898d1334" origin="Generated by Gradle"/>
1734+
</artifact>
1735+
</component>
1736+
<component group="org.antlr" name="antlr4-runtime" version="4.11.1">
1737+
<artifact name="antlr4-runtime-4.11.1.jar">
1738+
<sha256 value="e06c6553c1ccc14d36052ec4b0fc6f13b808cf957b5b1dc3f61bf401996ada59" origin="Generated by Gradle"/>
1739+
</artifact>
1740+
</component>
1741+
<component group="org.antlr" name="antlr4-runtime" version="4.5.1-1">
1742+
<artifact name="antlr4-runtime-4.5.1-1.jar">
1743+
<sha256 value="ffca72bc2a25bb2b0c80a58cee60530a78be17da739bb6c91a8c2e3584ca099e" origin="Generated by Gradle"/>
1744+
</artifact>
1745+
</component>
1746+
<component group="org.antlr" name="antlr4-runtime" version="4.5.3">
1747+
<artifact name="antlr4-runtime-4.5.3.jar">
1748+
<sha256 value="93bca08ec995caeaaf60bdf80035a0be8507fcdabd3c2618fd8c5aab4444a752" origin="Generated by Gradle"/>
17671749
</artifact>
17681750
</component>
17691751
<component group="org.antlr" name="antlr4-runtime" version="4.9.2">
@@ -3492,34 +3474,29 @@
34923474
<sha256 value="6cd91991323dd7b2fb28ca93d7ac12af5a86a2f53279e2b35827b30313fd0b9f" origin="Generated by Gradle"/>
34933475
</artifact>
34943476
</component>
3495-
<component group="org.fusesource.leveldbjni" name="leveldbjni-all" version="1.8">
3496-
<artifact name="leveldbjni-all-1.8.jar">
3497-
<sha256 value="c297213b0e6f9392305952753f3099a4c02e70b3656266fe01867e7b6c160ffe"
3498-
origin="Generated by Gradle"/>
3499-
</artifact>
3500-
</component>
3501-
<component group="org.glassfish" name="javax.json" version="1.0.4">
3502-
<artifact name="javax.json-1.0.4.jar">
3503-
<sha256 value="0e1dec40a1ede965941251eda968aeee052cc4f50378bc316cc48e8159bdbeb4"
3504-
origin="Generated by Gradle"/>
3505-
</artifact>
3506-
</component>
3507-
<component group="org.glassfish" name="javax.json" version="1.1.4">
3508-
<artifact name="javax.json-1.1.4.jar">
3509-
<sha256 value="17fdeb7e22375a7fb40bb0551306f6dcf2b5743078668adcdf6c642c9a9ec955"
3510-
origin="Generated by Gradle"/>
3511-
</artifact>
3512-
</component>
3513-
<component group="org.hamcrest" name="hamcrest" version="2.1">
3514-
<artifact name="hamcrest-2.1.jar">
3515-
<sha256 value="ba93b2e3a562322ba432f0a1b53addcc55cb188253319a020ed77f824e692050"
3516-
origin="Generated by Gradle"/>
3517-
</artifact>
3518-
</component>
3519-
<component group="org.hamcrest" name="hamcrest" version="2.2">
3520-
<artifact name="hamcrest-2.2.jar">
3521-
<sha256 value="5e62846a89f05cd78cd9c1a553f340d002458380c320455dd1f8fc5497a8a1c1"
3522-
origin="Generated by Gradle"/>
3477+
<component group="org.fusesource.leveldbjni" name="leveldbjni-all" version="1.8">
3478+
<artifact name="leveldbjni-all-1.8.jar">
3479+
<sha256 value="c297213b0e6f9392305952753f3099a4c02e70b3656266fe01867e7b6c160ffe" origin="Generated by Gradle"/>
3480+
</artifact>
3481+
</component>
3482+
<component group="org.glassfish" name="javax.json" version="1.0.4">
3483+
<artifact name="javax.json-1.0.4.jar">
3484+
<sha256 value="0e1dec40a1ede965941251eda968aeee052cc4f50378bc316cc48e8159bdbeb4" origin="Generated by Gradle"/>
3485+
</artifact>
3486+
</component>
3487+
<component group="org.glassfish" name="javax.json" version="1.1.4">
3488+
<artifact name="javax.json-1.1.4.jar">
3489+
<sha256 value="17fdeb7e22375a7fb40bb0551306f6dcf2b5743078668adcdf6c642c9a9ec955" origin="Generated by Gradle"/>
3490+
</artifact>
3491+
</component>
3492+
<component group="org.hamcrest" name="hamcrest" version="2.1">
3493+
<artifact name="hamcrest-2.1.jar">
3494+
<sha256 value="ba93b2e3a562322ba432f0a1b53addcc55cb188253319a020ed77f824e692050" origin="Generated by Gradle"/>
3495+
</artifact>
3496+
</component>
3497+
<component group="org.hamcrest" name="hamcrest" version="2.2">
3498+
<artifact name="hamcrest-2.2.jar">
3499+
<sha256 value="5e62846a89f05cd78cd9c1a553f340d002458380c320455dd1f8fc5497a8a1c1" origin="Generated by Gradle"/>
35233500
</artifact>
35243501
</component>
35253502
<component group="org.hamcrest" name="hamcrest-core" version="1.3">

libs/x-content/impl/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ apply plugin: 'elasticsearch.java'
1010

1111
archivesBaseName = "x-content-impl"
1212

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

1515
dependencies {
1616
compileOnly project(':libs:elasticsearch-core')
1717
compileOnly project(':libs:elasticsearch-x-content')
18-
implementation project(path: ':libs:x-content:impl:es-jackson-core', configuration: 'shadow')
18+
implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
1919
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jacksonVersion}"
2020
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonVersion}"
2121
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}"

0 commit comments

Comments
 (0)