From a97109b89bc01c9ecacdcc39edc46e4e3cce150c Mon Sep 17 00:00:00 2001 From: RanVaknin <50976344+RanVaknin@users.noreply.github.com> Date: Mon, 18 Aug 2025 14:05:33 -0700 Subject: [PATCH 1/3] Bump jackson to 2.19.0 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 746ea22ebce..4468a7a55bf 100644 --- a/pom.xml +++ b/pom.xml @@ -104,9 +104,9 @@ ${project.version} 2.32.26 2.32.25 - 2.15.2 - 2.15.2 - 2.17.3 + 2.19.0 + 2.19.0 + 2.19.0 1.0.1 3.14.0 2.32.0 From dbe886069d7ca1db55c2608576925344840114de Mon Sep 17 00:00:00 2001 From: RanVaknin <50976344+RanVaknin@users.noreply.github.com> Date: Mon, 18 Aug 2025 14:52:14 -0700 Subject: [PATCH 2/3] Add include source in location flag --- .../amazon/awssdk/protocols/jsoncore/JsonNodeParser.java | 2 ++ .../protocols/json/internal/AwsStructuredPlainJsonFactory.java | 1 + .../amazon/awssdk/protocols/json/SdkJsonGeneratorTest.java | 3 ++- 3 files changed, 5 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..b8f96af50ba 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 @@ -35,6 +35,7 @@ public final class AwsStructuredPlainJsonFactory { private static final JsonFactory JSON_FACTORY = JsonFactory.builder() .enable(StreamReadFeature.USE_FAST_BIG_NUMBER_PARSER) .enable(StreamReadFeature.USE_FAST_DOUBLE_PARSER) + .enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION) .enable(StreamWriteFeature.USE_FAST_DOUBLE_WRITER) .build(); 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..698ede937e0 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,7 @@ 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 c35006cb83cf954bb416a88efc9db7e7322f9b31 Mon Sep 17 00:00:00 2001 From: RanVaknin <50976344+RanVaknin@users.noreply.github.com> Date: Tue, 19 Aug 2025 13:29:43 -0700 Subject: [PATCH 3/3] Add changelog --- .changes/next-release/feature-AWSSDKforJavav2-9ffad97.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changes/next-release/feature-AWSSDKforJavav2-9ffad97.json diff --git a/.changes/next-release/feature-AWSSDKforJavav2-9ffad97.json b/.changes/next-release/feature-AWSSDKforJavav2-9ffad97.json new file mode 100644 index 00000000000..dc4b8839cd2 --- /dev/null +++ b/.changes/next-release/feature-AWSSDKforJavav2-9ffad97.json @@ -0,0 +1,6 @@ +{ + "type": "feature", + "category": "AWS SDK for Java v2", + "contributor": "", + "description": "Update Jackson and Jackson jr to 2.19.0" +}