Skip to content

Commit 57ee5f3

Browse files
committed
Merge branch '3.x' of github.com:FasterXML/jackson-databind into 3.x
2 parents f59dfa2 + b610fc7 commit 57ee5f3

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/main/java/tools/jackson/databind/DatabindContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/**
2424
* Shared base class for {@link DeserializationContext} and
2525
* {@link SerializationContext}, context objects passed through data-binding
26-
* process. Designed so that some of implementations can rely on shared
26+
* process. Designed so that some of the implementations can rely on shared
2727
* aspects like access to secondary contextual objects like type factories
2828
* or handler instantiators.
2929
*/

src/test/java/tools/jackson/databind/tofix/JsonIgnoreProperties2803Test.java renamed to src/test/java/tools/jackson/databind/deser/JsonIgnoreProperties2803Test.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package tools.jackson.databind.tofix;
1+
package tools.jackson.databind.deser;
22

33
import org.junit.jupiter.api.Test;
44

@@ -10,8 +10,12 @@
1010

1111
import static org.junit.jupiter.api.Assertions.assertNotNull;
1212

13-
// 04-Sep-2024, tatu: Passes on 3.0 somehow; fails on 2.18
14-
class JsonIgnoreProperties2803Test extends DatabindTestUtil {
13+
// 04-Sep-2024, tatu: Passes on 3.0 but fails on 2.18+ (due to some
14+
// ordering difference)
15+
// Not "properly" fixed, but there's [databind#1622] at least with
16+
// failing reproduction even for 3.0
17+
class JsonIgnoreProperties2803Test extends DatabindTestUtil
18+
{
1519
// [databind#2803]
1620
static class Building2803 {
1721
@JsonIgnoreProperties({"something"})

0 commit comments

Comments
 (0)