From e394f03db504bf89db118d69e7cf0cffe5f074d5 Mon Sep 17 00:00:00 2001 From: RanVaknin <50976344+RanVaknin@users.noreply.github.com> Date: Thu, 30 Oct 2025 15:33:10 -0700 Subject: [PATCH 1/3] Bump jackson version --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 39b88cf4fe9..c7494b43e7f 100644 --- a/pom.xml +++ b/pom.xml @@ -105,9 +105,9 @@ ${project.version} 2.37.3 2.37.2 - 2.15.2 - 2.15.2 - 2.17.3 + 2.19.4 + 2.19.4 + 2.19.4 1.0.1 3.14.0 2.32.0 From dcd630f215783d333937929bf64f99de02de8072 Mon Sep 17 00:00:00 2001 From: RanVaknin <50976344+RanVaknin@users.noreply.github.com> Date: Thu, 30 Oct 2025 15:42:06 -0700 Subject: [PATCH 2/3] Add INCLUDE_SOURCE_IN_LOCATION option from 2.16.0 --- .../amazon/awssdk/protocols/jsoncore/JsonNodeParser.java | 2 ++ .../json/internal/AwsStructuredPlainJsonFactory.java | 1 + .../amazon/awssdk/protocols/json/SdkJsonGeneratorTest.java | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/json-utils/src/main/java/software/amazon/awssdk/protocols/jsoncore/JsonNodeParser.java b/core/json-utils/src/main/java/software/amazon/awssdk/protocols/jsoncore/JsonNodeParser.java index d85e1efbfad..0b897ef3bb4 100644 --- a/core/json-utils/src/main/java/software/amazon/awssdk/protocols/jsoncore/JsonNodeParser.java +++ b/core/json-utils/src/main/java/software/amazon/awssdk/protocols/jsoncore/JsonNodeParser.java @@ -31,6 +31,7 @@ import software.amazon.awssdk.thirdparty.jackson.core.JsonParseException; import software.amazon.awssdk.thirdparty.jackson.core.JsonParser; import software.amazon.awssdk.thirdparty.jackson.core.JsonToken; +import software.amazon.awssdk.thirdparty.jackson.core.StreamReadFeature; import software.amazon.awssdk.thirdparty.jackson.core.json.JsonReadFeature; /** @@ -46,6 +47,7 @@ public final class JsonNodeParser { */ public static final JsonFactory DEFAULT_JSON_FACTORY = JsonFactory.builder() + .enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION) .configure(JsonReadFeature.ALLOW_JAVA_COMMENTS, true) .build(); diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/AwsStructuredPlainJsonFactory.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/AwsStructuredPlainJsonFactory.java index f9a751f094c..d47fdafaa26 100644 --- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/AwsStructuredPlainJsonFactory.java +++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/AwsStructuredPlainJsonFactory.java @@ -33,6 +33,7 @@ public final class AwsStructuredPlainJsonFactory { * Recommended to share JsonFactory instances per http://wiki.fasterxml.com/JacksonBestPracticesPerformance */ private static final JsonFactory JSON_FACTORY = JsonFactory.builder() + .enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION) .enable(StreamReadFeature.USE_FAST_BIG_NUMBER_PARSER) .enable(StreamReadFeature.USE_FAST_DOUBLE_PARSER) .enable(StreamWriteFeature.USE_FAST_DOUBLE_WRITER) diff --git a/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/SdkJsonGeneratorTest.java b/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/SdkJsonGeneratorTest.java index 5dd5bb32aa7..bba1caedfb0 100644 --- a/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/SdkJsonGeneratorTest.java +++ b/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/SdkJsonGeneratorTest.java @@ -28,6 +28,7 @@ import org.junit.jupiter.api.Test; import software.amazon.awssdk.protocols.jsoncore.JsonNode; import software.amazon.awssdk.thirdparty.jackson.core.JsonFactory; +import software.amazon.awssdk.thirdparty.jackson.core.StreamReadFeature; import software.amazon.awssdk.utils.BinaryUtils; public class SdkJsonGeneratorTest { @@ -40,7 +41,9 @@ public class SdkJsonGeneratorTest { @BeforeEach public void setup() { - jsonGenerator = new SdkJsonGenerator(JsonFactory.builder().build(), "application/json"); + jsonGenerator = new SdkJsonGenerator(JsonFactory.builder() + .enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION) + .build(), "application/json"); } @Test From f11ca49ac770fffb082a97e527c7fa671fdaacce Mon Sep 17 00:00:00 2001 From: RanVaknin <50976344+RanVaknin@users.noreply.github.com> Date: Thu, 30 Oct 2025 15:46:41 -0700 Subject: [PATCH 3/3] Add changelog --- .changes/next-release/feature-AWSSDKforJavav2-e90b57c.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changes/next-release/feature-AWSSDKforJavav2-e90b57c.json diff --git a/.changes/next-release/feature-AWSSDKforJavav2-e90b57c.json b/.changes/next-release/feature-AWSSDKforJavav2-e90b57c.json new file mode 100644 index 00000000000..c067a78acf3 --- /dev/null +++ b/.changes/next-release/feature-AWSSDKforJavav2-e90b57c.json @@ -0,0 +1,6 @@ +{ + "type": "feature", + "category": "AWS SDK for Java v2", + "contributor": "", + "description": "Update Jackson and Jackson jr to 2.19.4" +}