Skip to content

Commit 4131004

Browse files
committed
Merge remote-tracking branch 'FasterXML/2.19'
2 parents a3a0375 + 39a15a9 commit 4131004

File tree

3 files changed

+16
-19
lines changed

3 files changed

+16
-19
lines changed

pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,15 @@
169169
<plugin>
170170
<groupId>org.apache.maven.plugins</groupId>
171171
<artifactId>maven-surefire-plugin</artifactId>
172+
<configuration>
173+
<includes>
174+
<!--
175+
This setting is necessary because the project includes tests that do not match the default run target class name.
176+
https://maven.apache.org/surefire/maven-surefire-plugin/examples/inclusion-exclusion.html#inclusions
177+
-->
178+
<include>com.fasterxml.jackson.module.kotlin.**</include>
179+
</includes>
180+
</configuration>
172181
</plugin>
173182
<plugin>
174183
<!-- Inherited from oss-base. Generate PackageVersion.java.-->

release-notes/CREDITS-2.x

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ WrongWrong (@k163377)
2828
* #839: Remove useKotlinPropertyNameForGetter and unify with kotlinPropertyNameAsImplicitName
2929
* #835: Remove old SingletonSupport class and unified with KotlinFeature.SingletonSupport
3030

31+
# 2.18.3 (not yet released)
32+
33+
WrongWrong (@k163377)
34+
* #900: Fixed an issue where some tests were not running
35+
3136
# 2.18.0 (26-Sep-2024)
3237

3338
WrongWrong (@k163377)

src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub625.kt

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -48,26 +48,9 @@ class GitHub625 {
4848

4949
@Test
5050
fun failing() {
51-
val writer = jacksonObjectMapper().testPrettyWriter()
51+
val writer = jacksonObjectMapper()
5252
val json = writer.writeValueAsString(FailingDto())
5353

54-
assertNotEquals("{ }", json)
55-
assertEquals(
56-
"""
57-
{
58-
"nullableObject1" : null,
59-
"nullableObject2" : null,
60-
"map" : {
61-
"nullableObject" : null
62-
},
63-
"mapGetter" : {
64-
"nullableObject" : null
65-
},
66-
"nullableObjectGetter2" : null,
67-
"nullableObjectGetter1" : null
68-
}
69-
""".trimIndent(),
70-
json
71-
)
54+
assertNotEquals("{}", json)
7255
}
7356
}

0 commit comments

Comments
 (0)