Skip to content

Commit bb84827

Browse files
authored
Bump jackson version to 2.19.4 (#6534)
* Bump jackson version * Add INCLUDE_SOURCE_IN_LOCATION option from 2.16.0 * Add changelog
1 parent ffaad9d commit bb84827

File tree

5 files changed

+16
-4
lines changed

5 files changed

+16
-4
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"type": "feature",
3+
"category": "AWS SDK for Java v2",
4+
"contributor": "",
5+
"description": "Update Jackson and Jackson jr to 2.19.4"
6+
}

core/json-utils/src/main/java/software/amazon/awssdk/protocols/jsoncore/JsonNodeParser.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import software.amazon.awssdk.thirdparty.jackson.core.JsonParseException;
3232
import software.amazon.awssdk.thirdparty.jackson.core.JsonParser;
3333
import software.amazon.awssdk.thirdparty.jackson.core.JsonToken;
34+
import software.amazon.awssdk.thirdparty.jackson.core.StreamReadFeature;
3435
import software.amazon.awssdk.thirdparty.jackson.core.json.JsonReadFeature;
3536

3637
/**
@@ -46,6 +47,7 @@ public final class JsonNodeParser {
4647
*/
4748
public static final JsonFactory DEFAULT_JSON_FACTORY =
4849
JsonFactory.builder()
50+
.enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION)
4951
.configure(JsonReadFeature.ALLOW_JAVA_COMMENTS, true)
5052
.build();
5153

core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/AwsStructuredPlainJsonFactory.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public final class AwsStructuredPlainJsonFactory {
3333
* Recommended to share JsonFactory instances per http://wiki.fasterxml.com/JacksonBestPracticesPerformance
3434
*/
3535
private static final JsonFactory JSON_FACTORY = JsonFactory.builder()
36+
.enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION)
3637
.enable(StreamReadFeature.USE_FAST_BIG_NUMBER_PARSER)
3738
.enable(StreamReadFeature.USE_FAST_DOUBLE_PARSER)
3839
.enable(StreamWriteFeature.USE_FAST_DOUBLE_WRITER)

core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/SdkJsonGeneratorTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.junit.jupiter.api.Test;
2929
import software.amazon.awssdk.protocols.jsoncore.JsonNode;
3030
import software.amazon.awssdk.thirdparty.jackson.core.JsonFactory;
31+
import software.amazon.awssdk.thirdparty.jackson.core.StreamReadFeature;
3132
import software.amazon.awssdk.utils.BinaryUtils;
3233

3334
public class SdkJsonGeneratorTest {
@@ -40,7 +41,9 @@ public class SdkJsonGeneratorTest {
4041

4142
@BeforeEach
4243
public void setup() {
43-
jsonGenerator = new SdkJsonGenerator(JsonFactory.builder().build(), "application/json");
44+
jsonGenerator = new SdkJsonGenerator(JsonFactory.builder()
45+
.enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION)
46+
.build(), "application/json");
4447
}
4548

4649
@Test

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@
105105
<awsjavasdk.version>${project.version}</awsjavasdk.version>
106106
<awsjavasdk.previous.version>2.37.3</awsjavasdk.previous.version>
107107
<awsjavasdk.previous-previous.version>2.37.2</awsjavasdk.previous-previous.version>
108-
<jackson.version>2.15.2</jackson.version>
109-
<jackson.databind.version>2.15.2</jackson.databind.version>
110-
<jacksonjr.version>2.17.3</jacksonjr.version>
108+
<jackson.version>2.19.4</jackson.version>
109+
<jackson.databind.version>2.19.4</jackson.databind.version>
110+
<jacksonjr.version>2.19.4</jacksonjr.version>
111111
<eventstream.version>1.0.1</eventstream.version>
112112
<commons.lang.version>3.14.0</commons.lang.version>
113113
<wiremock.version>2.32.0</wiremock.version>

0 commit comments

Comments
 (0)