Skip to content

Commit

Permalink
Merge branch '2.19' into 2.17
Browse files Browse the repository at this point in the history
  • Loading branch information
fxshlein authored Oct 17, 2024
2 parents 1ed23f2 + d5caa2e commit 16e5f7e
Show file tree
Hide file tree
Showing 120 changed files with 2,062 additions and 820 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cifuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
dry-run: false
language: jvm
- name: Upload Crash
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
if: failure() && steps.build.outcome == 'success'
with:
name: artifacts
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
uses: github/codeql-action/init@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
with:
languages: ${{ matrix.language }}

- name: Autobuild
uses: github/codeql-action/autobuild@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
uses: github/codeql-action/autobuild@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
uses: github/codeql-action/analyze@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
4 changes: 2 additions & 2 deletions .github/workflows/dep_build_v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
env:
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- name: Set up JDK
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
with:
distribution: 'temurin'
java-version: ${{ matrix.java_version }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dep_build_v3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
env:
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
with:
ref: master
- name: Set up JDK
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
with:
distribution: 'temurin'
java-version: ${{ matrix.java_version }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ on:
branches:
- master
- "3.0"
- "2.18"
- "2.19"
paths-ignore:
- "README.md"
- "release-notes/*"
pull_request:
branches:
- master
- "3.0"
- "2.18"
- "2.19"
paths-ignore:
- "README.md"
- "release-notes/*"
Expand All @@ -37,9 +37,9 @@ jobs:
env:
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- name: Set up JDK
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
with:
distribution: 'temurin'
java-version: ${{ matrix.java_version }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ ObjectMapper mapper = ...;
File jsonFile = new File("test.json");
// note: method added in Jackson 2.11 (earlier would need to use
// mapper.getFactory().createGenerator(...)
JsonGenerator g = f.createGenerator(jsonFile, JsonEncoding.UTF8);
JsonGenerator g = mapper.createGenerator(jsonFile, JsonEncoding.UTF8);
// write JSON: { "message" : "Hello world!" }
g.writeStartObject();
g.writeStringField("message", "Hello world!");
Expand Down
7 changes: 3 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<parent>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-base</artifactId>
<version>2.18.0-SNAPSHOT</version>
<version>2.19.0-SNAPSHOT</version>
</parent>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.18.0-SNAPSHOT</version>
<version>2.19.0-SNAPSHOT</version>
<name>jackson-databind</name>
<packaging>jar</packaging>
<description>General data-binding functionality for Jackson: works on core streaming API</description>
Expand Down Expand Up @@ -68,7 +68,7 @@
<packageVersion.package>com.fasterxml.jackson.databind.cfg</packageVersion.package>

<!-- for Reproducible Builds -->
<project.build.outputTimestamp>2024-08-30T18:18:56Z</project.build.outputTimestamp>
<project.build.outputTimestamp>2024-09-27T01:57:15Z</project.build.outputTimestamp>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -212,7 +212,6 @@
</classpathDependencyExcludes>
<excludes>
<exclude>com.fasterxml.jackson.databind.MapperFootprintTest</exclude>
<exclude>**/failing/**/*.java</exclude>
</excludes>
<!-- 26-Nov-2019, tatu: moar parallelism! Per-class basis, safe, efficient enough
... although not 100% sure this makes much difference TBH
Expand Down
30 changes: 30 additions & 0 deletions release-notes/CREDITS-2.x
Original file line number Diff line number Diff line change
Expand Up @@ -849,6 +849,8 @@ Carter Kozak (carterkozak@github)
* Contributed #3876: `TypeFactory` cache performance degradation with
`constructSpecializedType()`
(2.15.0)
* Contributed #4688: Should allow deserializing with no-arg `@JsonCreator(mode = DELEGATING)`
(2.18.0)

Reinhard Prechtl (dnno@github)
* Reported #2034: Serialization problem with type specialization of nested generic types
Expand Down Expand Up @@ -1668,6 +1670,9 @@ Antti Lampinen (arlampin@github)
* Reported #3897: 2.15.0 breaks deserialization when POJO/Record only has a single field
and is marked `Access.WRITE_ONLY`
(2.15.1)
* Reported #4724: Deserialization behavior change with Records, `@JsonCreator` and
`@JsonValue` between 2.17 and 2.18
(2.18.1)
Dmitry Bolotin (dbolotin@github)
* Reported #1172: `@JsonView` doesn't work with `@JsonCreator`
Expand Down Expand Up @@ -1827,3 +1832,28 @@ Eduard Gomoliako (Gems@github)
Mathijs Vogelzang (mathijs81@github)
* Reported #4678: Java records don't serialize with `MapperFeature.REQUIRE_SETTERS_FOR_GETTERS`
(2.18.0)

Rikkarth (rikkarth@github)
* Contributed #4709: Add `JacksonCollectors` with `toArrayNode()` implementation
(2.18.0)

Maxim Valeev (@MaximValeev)
* Reported #4508: Deserialized JsonAnySetter field in Kotlin data class is null
(2.18.1)

wrongwrong (@k163377)
* Contributed #4749: Fixed problem in StdDelegatingSerializer#serializeWithType where final serializer lookup was done
on the pre-converted value when _delegateSerializer was null
(2.18.1)

@SandeepGaur2016
* Contributed fix for #2461: Nested `@JsonUnwrapped` property names not correctly handled
(2.19.0)

Konstantin Maliuga (@badoken)
* Contributed #4674: Allow setting global enum naming strategy similar to property naming strategy
(2.19.0)

Lars Benedetto (@lbenedetto)
* Contributed #4676: Support other enum naming strategies than camelCase
(2.19.0)
50 changes: 49 additions & 1 deletion release-notes/VERSION-2.x
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,40 @@ Project: jackson-databind
=== Releases ===
------------------------------------------------------------------------

2.18.0 (not yet released)
2.19.0 (not yet released)

#2461: Nested `@JsonUnwrapped` property names not correctly handled
(reported by @plovell)
(fix contributed by @SandeepGaur2016)
#4674: Allow setting global enum naming strategy similar to property naming strategy
(requested by @hajdamak)
(contributed by Konstantin M)
#4676: Support other enum naming strategies than camelCase
(requested by @hajdamak)
(contributed by Lars

2.18.1 (WIP-2024)

#4741: When `Include.NON_DEFAULT` setting is used on POJO, empty values
are not included in json if default is `null`
(reported by @ragnhov)
(fix by Joo-Hyuk K)
#4749: Fixed a problem with `StdDelegatingSerializer#serializeWithType` looking up the serializer
with the wrong argument
(fix by wrongwrong)
#4508: Deserialized JsonAnySetter field in Kotlin data class is null
(reported by @MaximValeev)
(fix by Joo-Hyuk K)
#4639: @JsonAnySetter on field ignoring unrecognized properties if they are
declared before the last recognized properties in JSON
(reported by Sim Y-T)
(fix by Joo-Hyuk K)
#4718: Should not fail on trying to serialize `java.time.DateTimeException`
#4724: Deserialization behavior change with Records, `@JsonCreator` and
`@JsonValue` between 2.17 and 2.18
(reported by Antti L)

2.18.0 (26-Sep-2024)

#562: Allow `@JsonAnySetter` to flow through Creators
(reported by Benson M)
Expand All @@ -13,6 +46,9 @@ Project: jackson-databind
#2977: Incompatible `FAIL_ON_MISSING_PRIMITIVE_PROPERTIES` and
field level `@JsonProperty`
(reported by @GeorgiPetkov)
#3120: Return `ListIterator` from `ArrayNode.elements()`
(requested by @ludgerb)
(fix by Joo-Hyuk K)
#3241: `constructorDetector` seems to invalidate `defaultSetterInfo`
for nullability
(reported by @joca-bt)
Expand Down Expand Up @@ -70,6 +106,18 @@ Project: jackson-databind
(contributed by Sim Y-T)
#4678: Java records don't serialize with `MapperFeature.REQUIRE_SETTERS_FOR_GETTERS`
(reported by Mathijs V)
#4688: Should allow deserializing with no-arg `@JsonCreator(mode = DELEGATING)`
(contributed by Carter K)
#4694: Deserializing `BigDecimal` with large number of decimals result in incorrect value
(reported by @lnthai2002)
#4699: Add extra `writeNumber()` method in `TokenBuffer`
(contributed by @pjfanning)
#4709: Add `JacksonCollectors` with `toArrayNode()` implementation
(contributed by @rikkarth)
2.17.3 (not yet released)
#4718: Should not fail on trying to serialize `java.time.DateTimeException`
2.17.2 (05-Jul-2024)
Expand Down
Loading

0 comments on commit 16e5f7e

Please sign in to comment.