From d918baa4ae93be24a7a4988226d23f07cd190599 Mon Sep 17 00:00:00 2001 From: Fabio Di Fabio Date: Fri, 12 Jan 2024 02:27:59 +0100 Subject: [PATCH] Upgrade `com.fasterxml.jackson` dependencies (#6378) Signed-off-by: Fabio Di Fabio --- CHANGELOG.md | 1 + gradle/verification-metadata.xml | 166 ++++++------------ gradle/versions.gradle | 2 +- .../besu/testutil/JsonTestParameters.java | 9 +- 4 files changed, 60 insertions(+), 118 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 912122e786..64aeb93ab0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Optimize RocksDB WAL files, allows for faster restart and a more linear disk space utilization [#6328](https://github.com/hyperledger/besu/pull/6328) - Disable transaction handling when the node is not in sync, to avoid unnecessary transaction validation work [#6302](https://github.com/hyperledger/besu/pull/6302) - Upgrade dependencies [#6377](https://github.com/hyperledger/besu/pull/6377) +- Upgrade `com.fasterxml.jackson` dependencies [#6378](https://github.com/hyperledger/besu/pull/6378) ### Bug fixes - INTERNAL_ERROR from `eth_estimateGas` JSON/RPC calls [#6344](https://github.com/hyperledger/besu/issues/6344) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index d0cfe4bd75..30d55eb684 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -131,14 +131,9 @@ - - - - - - - - + + + @@ -181,6 +176,11 @@ + + + + + @@ -225,20 +225,12 @@ - - - + + + - - - - - - - - - - + + @@ -273,20 +265,12 @@ - - - + + + - - - - - - - - - - + + @@ -318,84 +302,55 @@ - - - + + + - - + + - - - + + + - - - - - - - + + - - - - - - - - - - + + - - - + + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - + + + @@ -1392,14 +1347,6 @@ - - - - - - - - @@ -5301,11 +5248,6 @@ - - - - - @@ -5351,14 +5293,6 @@ - - - - - - - - diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 45626801fc..b497109d78 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -22,7 +22,7 @@ dependencyManagement { entry 'antlr4-runtime' } - dependencySet(group:'com.fasterxml.jackson.core', version:'2.14.2') { + dependencySet(group:'com.fasterxml.jackson.core', version:'2.16.1') { entry 'jackson-databind' entry 'jackson-datatype' entry 'jackson-datatype-jdk8' diff --git a/testutil/src/main/java/org/hyperledger/besu/testutil/JsonTestParameters.java b/testutil/src/main/java/org/hyperledger/besu/testutil/JsonTestParameters.java index f4fc7c49a3..69b21b37c8 100644 --- a/testutil/src/main/java/org/hyperledger/besu/testutil/JsonTestParameters.java +++ b/testutil/src/main/java/org/hyperledger/besu/testutil/JsonTestParameters.java @@ -37,6 +37,8 @@ import javax.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.core.JsonFactoryBuilder; +import com.fasterxml.jackson.core.StreamReadConstraints; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; @@ -121,7 +123,12 @@ public class JsonTestParameters { } private static final ObjectMapper objectMapper = - new ObjectMapper().registerModule(new Jdk8Module()); + new ObjectMapper( + new JsonFactoryBuilder() + .streamReadConstraints( + StreamReadConstraints.builder().maxStringLength(Integer.MAX_VALUE).build()) + .build()) + .registerModule(new Jdk8Module()); // The type to which the json file is directly mapped private final Class jsonFileMappedType;