Skip to content

Commit d918baa

Browse files
fab-10fab-10
authored
Upgrade com.fasterxml.jackson dependencies (#6378)
 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
1 parent c660546 commit d918baa

File tree

4 files changed

+60
-118
lines changed

4 files changed

+60
-118
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
- Optimize RocksDB WAL files, allows for faster restart and a more linear disk space utilization [#6328](https://github.com/hyperledger/besu/pull/6328)
1313
- Disable transaction handling when the node is not in sync, to avoid unnecessary transaction validation work [#6302](https://github.com/hyperledger/besu/pull/6302)
1414
- Upgrade dependencies [#6377](https://github.com/hyperledger/besu/pull/6377)
15+
- Upgrade `com.fasterxml.jackson` dependencies [#6378](https://github.com/hyperledger/besu/pull/6378)
1516

1617
### Bug fixes
1718
- INTERNAL_ERROR from `eth_estimateGas` JSON/RPC calls [#6344](https://github.com/hyperledger/besu/issues/6344)

‎gradle/verification-metadata.xml‎

Lines changed: 50 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,9 @@
131131
<sha256 value="18015d1bacba9a14625a8bf19411f5bfad82d0060df37b27bd02e78132c4676e" origin="Generated by Gradle"/>
132132
</artifact>
133133
</component>
134-
<component group="com.fasterxml.jackson" name="jackson-base" version="2.14.2">
135-
<artifact name="jackson-base-2.14.2.pom">
136-
<sha256 value="3ae245b9df95127321f1f905f703bd32774fe557158a9d3a9e507d82b2bc4ed4" origin="Generated by Gradle"/>
137-
</artifact>
138-
</component>
139-
<component group="com.fasterxml.jackson" name="jackson-base" version="2.15.3">
140-
<artifact name="jackson-base-2.15.3.pom">
141-
<sha256 value="4290342abf0b0e4567322ffb2d0c36e25b0a87a217bb56b35680a8dd8f8d66e4" origin="Generated by Gradle"/>
134+
<component group="com.fasterxml.jackson" name="jackson-base" version="2.16.1">
135+
<artifact name="jackson-base-2.16.1.pom">
136+
<sha256 value="8e2385161197c9fe12dc9965b4c8b57f3d103217512205b5b60b9dc675bcea8d" origin="Generated by Gradle"/>
142137
</artifact>
143138
</component>
144139
<component group="com.fasterxml.jackson" name="jackson-bom" version="2.13.1">
@@ -181,6 +176,11 @@
181176
<sha256 value="5aaa28874405bf04fba8e2c57159227824461ba6f7d552abdb8e8d3a0ba6f8bf" origin="Generated by Gradle"/>
182177
</artifact>
183178
</component>
179+
<component group="com.fasterxml.jackson" name="jackson-bom" version="2.16.1">
180+
<artifact name="jackson-bom-2.16.1.pom">
181+
<sha256 value="69d8bf9b2a7d42c9cf1d70ad82be42f6ac6fd788918a6e1d75792ecdcc117a0b" origin="Generated by Gradle"/>
182+
</artifact>
183+
</component>
184184
<component group="com.fasterxml.jackson" name="jackson-parent" version="2.13">
185185
<artifact name="jackson-parent-2.13.pom">
186186
<sha256 value="2bba89978172af1effcb4d143d09921a3f3082ca4dcf122b1ded98bf55b2ad57" origin="Generated by Gradle"/>
@@ -225,20 +225,12 @@
225225
<sha256 value="267a680bb72cbd752c76b79eb908ae0c0abeb114fcb1c20a9678f0378898b9eb" origin="Generated by Gradle"/>
226226
</artifact>
227227
</component>
228-
<component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.14.2">
229-
<artifact name="jackson-annotations-2.14.2.jar">
230-
<sha256 value="2c6869d505cf60dc066734b7d50339f975bd3adc635e26a78abb71acb4473c0d" origin="Generated by Gradle"/>
228+
<component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.16.1">
229+
<artifact name="jackson-annotations-2.16.1.jar">
230+
<sha256 value="a4730771e6a495dd3793a42cdb8ce6bddb96c77e15f40c98fd8d9a7ae09e7286" origin="Generated by Gradle"/>
231231
</artifact>
232-
<artifact name="jackson-annotations-2.14.2.module">
233-
<sha256 value="b014a64cc1844949f824d34671293541fab723223ac8b83222b5772113bdec17" origin="Generated by Gradle"/>
234-
</artifact>
235-
</component>
236-
<component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.15.3">
237-
<artifact name="jackson-annotations-2.15.3.jar">
238-
<sha256 value="aae865c3d88256d61b11523cb1e88bd48d5b9ad5855fa1fc859504fd2204708a" origin="Generated by Gradle"/>
239-
</artifact>
240-
<artifact name="jackson-annotations-2.15.3.module">
241-
<sha256 value="6410c94b393e494d53d569dc4193a79187848ddb6ee3c2ee1f392477a21059cb" origin="Generated by Gradle"/>
232+
<artifact name="jackson-annotations-2.16.1.module">
233+
<sha256 value="a0104105b8579a4ac52b14c7fb6a8b3f13df53d88f4fc942a19ac9cbfe84f59a" origin="Generated by Gradle"/>
242234
</artifact>
243235
</component>
244236
<component group="com.fasterxml.jackson.core" name="jackson-core" version="2.13.2">
@@ -273,20 +265,12 @@
273265
<sha256 value="7c8b8035f900f3f1cbdb06b8c79dc2b18b11f6afa13b0b74719cee349ff4c329" origin="Generated by Gradle"/>
274266
</artifact>
275267
</component>
276-
<component group="com.fasterxml.jackson.core" name="jackson-core" version="2.14.2">
277-
<artifact name="jackson-core-2.14.2.jar">
278-
<sha256 value="b5d37a77c88277b97e3593c8740925216c06df8e4172bbde058528df04ad3e7a" origin="Generated by Gradle"/>
268+
<component group="com.fasterxml.jackson.core" name="jackson-core" version="2.16.1">
269+
<artifact name="jackson-core-2.16.1.jar">
270+
<sha256 value="f5f8ef90609e64fec82eb908e497dc7d81b2eb983fe509b870292a193cde4dfb" origin="Generated by Gradle"/>
279271
</artifact>
280-
<artifact name="jackson-core-2.14.2.module">
281-
<sha256 value="92739e3bcbe09b2649e187eb7ed25ac252b587707cd922ab95badcde8aea12dc" origin="Generated by Gradle"/>
282-
</artifact>
283-
</component>
284-
<component group="com.fasterxml.jackson.core" name="jackson-core" version="2.15.3">
285-
<artifact name="jackson-core-2.15.3.jar">
286-
<sha256 value="51fab7aad51ed588482edc507fd542747936c5094d1ab76ed21ddb63b96b610d" origin="Generated by Gradle"/>
287-
</artifact>
288-
<artifact name="jackson-core-2.15.3.module">
289-
<sha256 value="138029bcb32b0bfa7010d3f646632bde5c98c187e2f1aa120a1cd413f23a6c28" origin="Generated by Gradle"/>
272+
<artifact name="jackson-core-2.16.1.module">
273+
<sha256 value="4ba080b7b79a231a09bfb0284c2c94449eceba6433265591c1ed820d6073a6e2" origin="Generated by Gradle"/>
290274
</artifact>
291275
</component>
292276
<component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.13.1">
@@ -318,84 +302,55 @@
318302
<sha256 value="d817977c8a6b0aaeda519fb2a7b8dcba02b38c3c272024fada32c5cce7e3d3cb" origin="Generated by Gradle"/>
319303
</artifact>
320304
</component>
321-
<component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.14.2">
322-
<artifact name="jackson-databind-2.14.2.jar">
323-
<sha256 value="501d3abce4d18dcc381058ec593c5b94477906bba6efbac14dae40a642f77424" origin="Generated by Gradle"/>
305+
<component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.16.1">
306+
<artifact name="jackson-databind-2.16.1.jar">
307+
<sha256 value="baf8a8ebee8f45ef68cdd5e2dd3923b3e296c0937b96ec0b4806aa3a31bccd1d" origin="Generated by Gradle"/>
324308
</artifact>
325-
<artifact name="jackson-databind-2.14.2.module">
326-
<sha256 value="6130ca9b95707ccd4f80f6258569990a7ce40039aa353c4635c900d36beec705" origin="Generated by Gradle"/>
309+
<artifact name="jackson-databind-2.16.1.module">
310+
<sha256 value="b43cb5bf29f3545b96e905748f25391695c6207130327c45193fd1dc3748d9ff" origin="Generated by Gradle"/>
327311
</artifact>
328312
</component>
329-
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-yaml" version="2.14.2">
330-
<artifact name="jackson-dataformat-yaml-2.14.2.jar">
331-
<sha256 value="5c3a0a71d0339529c80ae771497b20fdc0fa7cb67c772f99af5935927560006a" origin="Generated by Gradle"/>
313+
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-yaml" version="2.16.1">
314+
<artifact name="jackson-dataformat-yaml-2.16.1.jar">
315+
<sha256 value="fd67e0fafe368ad3dfc1b545eb8fe084a5c64628fb71ef70bd94a4dab27aefff" origin="Generated by Gradle"/>
332316
</artifact>
333-
<artifact name="jackson-dataformat-yaml-2.14.2.module">
334-
<sha256 value="b3266f32ee9753725812fe59ec629610e2698ba443ff80de9df653fef84c7e79" origin="Generated by Gradle"/>
335-
</artifact>
336-
</component>
337-
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-yaml" version="2.15.3">
338-
<artifact name="jackson-dataformat-yaml-2.15.3.jar">
339-
<sha256 value="2dd70a080e8542dc5ee727387abed963fc24122cd784ab38355f87d0e08d9772" origin="Generated by Gradle"/>
317+
<artifact name="jackson-dataformat-yaml-2.16.1.module">
318+
<sha256 value="24b25795a2a9a119bf9fc145984bf59e287f397395e010bad3cb86cc21093622" origin="Generated by Gradle"/>
340319
</artifact>
341-
<artifact name="jackson-dataformat-yaml-2.15.3.module">
342-
<sha256 value="e99e72f8a0f9c94cc53ea9edacd410797bcbf41aa3b0422acb14256b85722636" origin="Generated by Gradle"/>
343-
</artifact>
344-
<artifact name="jackson-dataformat-yaml-2.15.3.pom">
345-
<sha256 value="e478c2a69e4283d8b5ef6145d1c461ecb85451e577588c600dd997e2ff27c747" origin="Generated by Gradle"/>
346-
</artifact>
347-
</component>
348-
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformats-text" version="2.14.2">
349-
<artifact name="jackson-dataformats-text-2.14.2.pom">
350-
<sha256 value="53ffbb4c50e7702c0c9c28a16dfded0b7b6bee960bd5d2b008c3ac89fc37ccf0" origin="Generated by Gradle"/>
320+
<artifact name="jackson-dataformat-yaml-2.16.1.pom">
321+
<sha256 value="f08b667fa3459ea2d4cd19b79469480943ed932311da011e63c2052bb23b1bfd" origin="Generated by Gradle"/>
351322
</artifact>
352323
</component>
353-
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformats-text" version="2.15.3">
354-
<artifact name="jackson-dataformats-text-2.15.3.pom">
355-
<sha256 value="84f5361665b2d477851f02bd70ea9ce507d498cb555bba8c7acd49b43df07152" origin="Generated by Gradle"/>
324+
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformats-text" version="2.16.1">
325+
<artifact name="jackson-dataformats-text-2.16.1.pom">
326+
<sha256 value="d43bac7d647c083f172383fc6229e400e48963a4ee09f4ea0f62d9032495bc94" origin="Generated by Gradle"/>
356327
</artifact>
357328
</component>
358-
<component group="com.fasterxml.jackson.datatype" name="jackson-datatype-jdk8" version="2.14.2">
359-
<artifact name="jackson-datatype-jdk8-2.14.2.jar">
360-
<sha256 value="aa55d3d545e02d959a6e8c83927acc55c9937d717d4d3fd962d27ec7b431b8c4" origin="Generated by Gradle"/>
329+
<component group="com.fasterxml.jackson.datatype" name="jackson-datatype-jdk8" version="2.16.1">
330+
<artifact name="jackson-datatype-jdk8-2.16.1.jar">
331+
<sha256 value="a9aa5c80f8dda77ad8f03500a5c021abf720acd60aae4e293a9e8c2885d6dc2b" origin="Generated by Gradle"/>
361332
</artifact>
362-
<artifact name="jackson-datatype-jdk8-2.14.2.module">
363-
<sha256 value="d7704d01aed2d2a3c2f3bf05b68c5c3a217ef85133e44a11ed7ea87473c3d445" origin="Generated by Gradle"/>
333+
<artifact name="jackson-datatype-jdk8-2.16.1.module">
334+
<sha256 value="8b1501f4ce7af47c1498765504fce15e169476e609af50e7c69c662cc3e4f992" origin="Generated by Gradle"/>
364335
</artifact>
365-
<artifact name="jackson-datatype-jdk8-2.14.2.pom">
366-
<sha256 value="f0e68e3a6f6caddb5f00dd527056e5cb2a4280696291a8504b1e3ebc08cc4ede" origin="Generated by Gradle"/>
336+
<artifact name="jackson-datatype-jdk8-2.16.1.pom">
337+
<sha256 value="f2cfc0a69a6065c635c5fcc1af6193cbf1d0aabaa58eb4cada4d2ed65ac61415" origin="Generated by Gradle"/>
367338
</artifact>
368339
</component>
369-
<component group="com.fasterxml.jackson.datatype" name="jackson-datatype-jdk8" version="2.15.3">
370-
<artifact name="jackson-datatype-jdk8-2.15.3.jar">
371-
<sha256 value="29995d3677f72dde74bf32bbf268b96beb952492b742d93f4c70af6c44b2156e" origin="Generated by Gradle"/>
340+
<component group="com.fasterxml.jackson.datatype" name="jackson-datatype-jsr310" version="2.16.1">
341+
<artifact name="jackson-datatype-jsr310-2.16.1.jar">
342+
<sha256 value="6281970682a8da3ddbac54bb203c9badf1c26f507f3ecaa48ef10318579bc9ad" origin="Generated by Gradle"/>
372343
</artifact>
373-
<artifact name="jackson-datatype-jdk8-2.15.3.module">
374-
<sha256 value="055c428c52e2e9aa8fb9d6fe824507430c51eb44aa0f690b3dbe1e34aa481316" origin="Generated by Gradle"/>
344+
<artifact name="jackson-datatype-jsr310-2.16.1.module">
345+
<sha256 value="91472952c0f29b73faa0235e317ceb69b5f2fb07beb614444abba4476b0af98c" origin="Generated by Gradle"/>
375346
</artifact>
376-
<artifact name="jackson-datatype-jdk8-2.15.3.pom">
377-
<sha256 value="49ef185dc3929346af2ddfb544de921a71abea68e800e31c39947bf89ef962c5" origin="Generated by Gradle"/>
347+
<artifact name="jackson-datatype-jsr310-2.16.1.pom">
348+
<sha256 value="c9de2b863dd13e46237d185c1e6604984f6e63471859ea0da2dfc4e9f2f08ff1" origin="Generated by Gradle"/>
378349
</artifact>
379350
</component>
380-
<component group="com.fasterxml.jackson.datatype" name="jackson-datatype-jsr310" version="2.15.3">
381-
<artifact name="jackson-datatype-jsr310-2.15.3.jar">
382-
<sha256 value="bea1d78009ebc4e5d54918a3f7aec5da9fbd09f662c191a217ffcf37e8527c5e" origin="Generated by Gradle"/>
383-
</artifact>
384-
<artifact name="jackson-datatype-jsr310-2.15.3.module">
385-
<sha256 value="9a29faca1b14d0abffb6a8a4261a2fa170f169473e79c2488f6c817dab6e4bf2" origin="Generated by Gradle"/>
386-
</artifact>
387-
<artifact name="jackson-datatype-jsr310-2.15.3.pom">
388-
<sha256 value="2aa68a9c65bb9c2213f0e1dbde3bfbe4a6c8e8d01b68515fcf0ad326877a3864" origin="Generated by Gradle"/>
389-
</artifact>
390-
</component>
391-
<component group="com.fasterxml.jackson.module" name="jackson-modules-java8" version="2.14.2">
392-
<artifact name="jackson-modules-java8-2.14.2.pom">
393-
<sha256 value="36ea7dadcb10c7153ef65a75e169b1b7f937ded09a18450e0f10fe202df2adcd" origin="Generated by Gradle"/>
394-
</artifact>
395-
</component>
396-
<component group="com.fasterxml.jackson.module" name="jackson-modules-java8" version="2.15.3">
397-
<artifact name="jackson-modules-java8-2.15.3.pom">
398-
<sha256 value="3efc5c6fea09105da6fe4a8d610cf550e0828982dfd3aafc01bb569d89b6cea0" origin="Generated by Gradle"/>
351+
<component group="com.fasterxml.jackson.module" name="jackson-modules-java8" version="2.16.1">
352+
<artifact name="jackson-modules-java8-2.16.1.pom">
353+
<sha256 value="188722535859efcae5ab75c3062dc32e0dde8e1eaa6c1821f59052c4203c44a5" origin="Generated by Gradle"/>
399354
</artifact>
400355
</component>
401356
<component group="com.github.ben-manes" name="gradle-versions-plugin" version="0.50.0">
@@ -1392,14 +1347,6 @@
13921347
<sha256 value="61b4d7c515a0894ffad925fd7052620c1425a86433fd35113b5fab0de890a57f" origin="Generated by Gradle"/>
13931348
</artifact>
13941349
</component>
1395-
<component group="commons-codec" name="commons-codec" version="1.15">
1396-
<artifact name="commons-codec-1.15.jar">
1397-
<sha256 value="b3e9f6d63a790109bf0d056611fbed1cf69055826defeb9894a71369d246ed63" origin="Generated by Gradle"/>
1398-
</artifact>
1399-
<artifact name="commons-codec-1.15.pom">
1400-
<sha256 value="c86ee198a35a3715487860f419cbf642e7e4d9e8714777947dbe6a4e3a20ab58" origin="Generated by Gradle"/>
1401-
</artifact>
1402-
</component>
14031350
<component group="commons-codec" name="commons-codec" version="1.16.0">
14041351
<artifact name="commons-codec-1.16.0.jar">
14051352
<sha256 value="56595fb20b0b85bc91d0d503dad50bb7f1b9afc0eed5dffa6cbb25929000484d" origin="Generated by Gradle"/>
@@ -5301,11 +5248,6 @@
53015248
<sha256 value="2d4b95555c21e085ebc1ddbdf42d79eb1d55640dc193b1b7e6100240fd2f189f" origin="Generated by Gradle"/>
53025249
</artifact>
53035250
</component>
5304-
<component group="org.junit.platform" name="junit-platform-engine" version="1.9.2">
5305-
<artifact name="junit-platform-engine-1.9.2.module">
5306-
<sha256 value="1de85141af9f58153e24575069a1375fbbedd7af5d844cbe3287965349cba1f7" origin="Generated by Gradle"/>
5307-
</artifact>
5308-
</component>
53095251
<component group="org.junit.platform" name="junit-platform-launcher" version="1.10.1">
53105252
<artifact name="junit-platform-launcher-1.10.1.jar">
53115253
<sha256 value="ded414c504e88d02270331071969084e1b2fd9bcf8443f35d44da2c6e3301bc2" origin="Generated by Gradle"/>
@@ -5351,14 +5293,6 @@
53515293
<sha256 value="7aac894933943af601fcde32e34a9825732e204d09d48b2b3b5cb086dc736b8d" origin="Generated by Gradle"/>
53525294
</artifact>
53535295
</component>
5354-
<component group="org.junit.vintage" name="junit-vintage-engine" version="5.9.2">
5355-
<artifact name="junit-vintage-engine-5.9.2.jar">
5356-
<sha256 value="41e16dd32c8f462bbc032b2b79f23944191b32ec398d05858badb5dabffd0612" origin="Generated by Gradle"/>
5357-
</artifact>
5358-
<artifact name="junit-vintage-engine-5.9.2.module">
5359-
<sha256 value="8cccfddd645d0ce77216678984eb6a12bb9725093449580e7a92314c8c63d2a4" origin="Generated by Gradle"/>
5360-
</artifact>
5361-
</component>
53625296
<component group="org.jupnp" name="jupnp" version="2.7.1">
53635297
<artifact name="jupnp-2.7.1.pom">
53645298
<sha256 value="63c07981afa0051dfd687bb30cc54c04783f1e176e8e19fdde53a8c35514f2e8" origin="Generated by Gradle"/>

‎gradle/versions.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencyManagement {
2222
entry 'antlr4-runtime'
2323
}
2424

25-
dependencySet(group:'com.fasterxml.jackson.core', version:'2.14.2') {
25+
dependencySet(group:'com.fasterxml.jackson.core', version:'2.16.1') {
2626
entry 'jackson-databind'
2727
entry 'jackson-datatype'
2828
entry 'jackson-datatype-jdk8'

‎testutil/src/main/java/org/hyperledger/besu/testutil/JsonTestParameters.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737

3838
import com.fasterxml.jackson.annotation.JsonCreator;
3939
import com.fasterxml.jackson.annotation.JsonProperty;
40+
import com.fasterxml.jackson.core.JsonFactoryBuilder;
41+
import com.fasterxml.jackson.core.StreamReadConstraints;
4042
import com.fasterxml.jackson.databind.JavaType;
4143
import com.fasterxml.jackson.databind.ObjectMapper;
4244
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
@@ -121,7 +123,12 @@ public interface Generator<S, T> {
121123
}
122124

123125
private static final ObjectMapper objectMapper =
124-
new ObjectMapper().registerModule(new Jdk8Module());
126+
new ObjectMapper(
127+
new JsonFactoryBuilder()
128+
.streamReadConstraints(
129+
StreamReadConstraints.builder().maxStringLength(Integer.MAX_VALUE).build())
130+
.build())
131+
.registerModule(new Jdk8Module());
125132

126133
// The type to which the json file is directly mapped
127134
private final Class<S> jsonFileMappedType;

0 commit comments

Comments
 (0)