Skip to content

Commit 7d9e373

Browse files
committed
Adopt Jackson 2.20.1
Signed-off-by: Maxim Nesen <senivam@gmail.com>
1 parent 897184a commit 7d9e373

6 files changed

Lines changed: 13 additions & 8 deletions

File tree

NOTICE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Javassist Version 3.30.2-GA
7070
* Project: http://www.javassist.org/
7171
* Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.
7272

73-
Jackson JAX-RS Providers Version 2.19.1
73+
Jackson JAX-RS Providers Version 2.20.1
7474
* License: Apache License, 2.0
7575
* Project: https://github.com/FasterXML/jackson-jaxrs-providers
7676
* Copyright: (c) 2009-2024 FasterXML, LLC. All rights reserved unless otherwise indicated.

examples/NOTICE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Javassist Version 3.30.2-GA
7171
* Project: http://www.javassist.org/
7272
* Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.
7373

74-
Jackson JAX-RS Providers Version 2.19.1
74+
Jackson JAX-RS Providers Version 2.20.1
7575
* License: Apache License, 2.0
7676
* Project: https://github.com/FasterXML/jackson-jaxrs-providers
7777
* Copyright: (c) 2009-2023 FasterXML, LLC. All rights reserved unless otherwise indicated.

media/json-jackson/src/main/java/org/glassfish/jersey/jackson/internal/jackson/jaxrs/base/ProviderBase.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import java.util.HashSet;
1717
import java.util.List;
1818

19+
import com.fasterxml.jackson.core.util.Instantiatable;
1920
import jakarta.ws.rs.core.MediaType;
2021
import jakarta.ws.rs.core.MultivaluedMap;
2122
import jakarta.ws.rs.core.NoContentException;
@@ -619,9 +620,13 @@ public void writeTo(Object value, Class<?> type, Type genericType, Annotation[]
619620
try {
620621
// Want indentation?
621622
if (writer.isEnabled(SerializationFeature.INDENT_OUTPUT)) {
622-
PrettyPrinter defaultPrettyPrinter = writer.getConfig().getDefaultPrettyPrinter();
623-
if (defaultPrettyPrinter != null) {
624-
g.setPrettyPrinter(defaultPrettyPrinter);
623+
PrettyPrinter defaultPP = writer.getConfig().getDefaultPrettyPrinter();
624+
if (defaultPP != null) {
625+
// 11-Jul-2025, tatu: need to create separate instance?
626+
if (defaultPP instanceof Instantiatable<?>) {
627+
defaultPP = (PrettyPrinter) ((Instantiatable<?>) defaultPP).createInstance();
628+
}
629+
g.setPrettyPrinter(defaultPP);
625630
} else {
626631
g.useDefaultPrettyPrinter();
627632
}

media/json-jackson/src/main/java/org/glassfish/jersey/jackson/internal/jackson/jaxrs/json/PackageVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212
public final class PackageVersion implements Versioned {
1313
public final static Version VERSION = VersionUtil.parseVersion(
14-
"2.19.1", "com.fasterxml.jackson.jaxrs", "jackson-jaxrs-json-provider");
14+
"2.20.1", "com.fasterxml.jackson.jaxrs", "jackson-jaxrs-json-provider");
1515

1616
@Override
1717
public Version version() {

media/json-jackson/src/main/resources/META-INF/NOTICE.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The project maintains the following source code repositories:
3131

3232
## Third-party Content
3333

34-
Jackson JAX-RS Providers version 2.19.1
34+
Jackson JAX-RS Providers version 2.20.1
3535
* License: Apache License, 2.0
3636
* Project: https://github.com/FasterXML/jackson-jaxrs-providers
3737
* Copyright: (c) 2009-2023 FasterXML, LLC. All rights reserved unless otherwise indicated.

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2254,7 +2254,7 @@
22542254
<xmlunit.version>2.10.3</xmlunit.version>
22552255
<httpclient.version>4.5.14</httpclient.version>
22562256
<httpclient5.version>5.5</httpclient5.version>
2257-
<jackson.version>2.19.1</jackson.version>
2257+
<jackson.version>2.20.1</jackson.version>
22582258
<jackson3.version>3.0.3</jackson3.version>
22592259
<jackson.annotation.version>2.20</jackson.annotation.version>
22602260
<javassist.version>3.30.2-GA</javassist.version>

0 commit comments

Comments
 (0)