Merge branch '3.x' into tatu/3.0/887-use-module-info

Author: cowtowncoder

.github/workflows/dep_build_v3.yml

@@ -2,8 +2,6 @@ name: Re-build on jackson-databind v3 push
 on:
   repository_dispatch:
     types: [jackson-databind-pushed-v3]
-  # just for testing
-  workflow_dispatch:
 
 permissions:
   contents: read
@@ -22,7 +20,7 @@ jobs:
     steps:
     - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
       with:
-        ref: master
+        ref: 3.x
     - name: Set up JDK
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
@@ -31,5 +29,3 @@ jobs:
         cache: 'maven'
     - name: Build and test
       run: ./mvnw -B -ff -ntp -Dversion.kotlin=${{ matrix.kotlin_version }} clean verify
-
-# No recursive rebuild (yet?)

.github/workflows/main.yml

@@ -2,15 +2,13 @@ name: Build and Deploy Snapshot
 on:
   push:
     branches:
-    - master
-    - "3.0"
+    - 3.x
     paths-ignore:
     - "README.md"
     - "release-notes/*"
   pull_request:
     branches:
-    - master
-    - "3.0"
+    - 3.x
     paths-ignore:
     - "README.md"
     - "release-notes/*"

pom.xml

@@ -200,7 +200,7 @@
                         <dependency>
                             <groupId>tools.jackson.module</groupId>
                             <artifactId>jackson-module-kotlin</artifactId>
-                            <version>3.0.0-rc1-SNAPSHOT</version>
+                            <version>3.0.0-rc2</version>
                             <type>jar</type>
                         </dependency>
                     </oldVersion>

release-notes/VERSION

@@ -22,6 +22,10 @@ Former maintainers:
 === Releases ===
 ------------------------------------------------------------------------
 
+3.0.0-rc3 (not yet released)
+
+- Branch rename "master" -> "3.x" [JSTEP-12]
+
 3.0.0-rc2 (28-Mar-2025)
 
 #936: `StrictNullChecks` and `SingletonSupport` are now enabled by default

release-notes/VERSION-2.x

@@ -16,7 +16,7 @@ Co-maintainers:
 === Releases ===
 ------------------------------------------------------------------------
 
-2.19.0 (not yet released)
+2.19.0-rc2 (07-Apr-2025)
 
 #929: Added consideration of `JsonProperty.isRequired` added in `2.19` in `hasRequiredMarker` processing.
   Previously `JsonProperty.required` was defined as `Boolean` with default `false`,

src/test/kotlin/tools/jackson/module/kotlin/test/DurationTests.kt

@@ -3,12 +3,12 @@ package tools.jackson.module.kotlin.test
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonFormat
 import com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING
-import tools.jackson.databind.SerializationFeature
 import tools.jackson.databind.json.JsonMapper
 import tools.jackson.module.kotlin.KotlinFeature
 import tools.jackson.module.kotlin.kotlinModule
 import tools.jackson.module.kotlin.readValue
 import org.junit.jupiter.api.Test
+import tools.jackson.databind.cfg.DateTimeFeature
 import java.time.Instant
 import kotlin.test.assertContentEquals
 import kotlin.test.assertEquals
@@ -24,7 +24,7 @@ class DurationTests {
     @Test
     fun `should serialize Kotlin duration using Java time module`() {
         val mapper = mapperBuilder
-            .disable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
+            .disable(DateTimeFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
             .build()
 
         val result = mapper.writeValueAsString(1.hours)
@@ -44,7 +44,7 @@ class DurationTests {
     @Test
     fun `should serialize Kotlin duration inside list using Java time module`() {
         val mapper = mapperBuilder
-            .disable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
+            .disable(DateTimeFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
             .build()
 
         val result = mapper.writeValueAsString(listOf(1.hours, 2.hours, 3.hours))
@@ -64,7 +64,7 @@ class DurationTests {
     @Test
     fun `should serialize Kotlin duration inside map using Java time module`() {
         val mapper = mapperBuilder
-            .disable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
+            .disable(DateTimeFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
             .build()
 
         val result = mapper.writeValueAsString(
@@ -109,8 +109,8 @@ class DurationTests {
     @Test
     fun `should serialize Kotlin duration inside data class using Java time module`() {
         val mapper = mapperBuilder
-            .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
-            .disable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
+            .disable(DateTimeFeature.WRITE_DATES_AS_TIMESTAMPS)
+            .disable(DateTimeFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
             .build()
 
         val result = mapper.writeValueAsString(Meeting(Instant.parse("2023-06-20T14:00:00Z"), 1.5.hours))
@@ -143,7 +143,7 @@ class DurationTests {
     @Test
     fun `should serialize Kotlin duration inside data class using Java time module and mixin`() {
         val mapper = mapperBuilder
-            .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+            .disable(DateTimeFeature.WRITE_DATES_AS_TIMESTAMPS)
             .addMixIn(Meeting::class.java, MeetingMixin::class.java)
             .build()
 

src/test/kotlin/tools/jackson/module/kotlin/test/ParameterNameTests.kt

@@ -4,11 +4,11 @@ import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonProperty
 import tools.jackson.databind.PropertyNamingStrategies
-import tools.jackson.databind.SerializationFeature
 import tools.jackson.module.kotlin.*
 import tools.jackson.databind.MapperFeature
 import org.junit.jupiter.api.Test
 import tools.jackson.databind.DeserializationFeature
+import tools.jackson.databind.cfg.DateTimeFeature
 import java.io.StringWriter
 import java.util.*
 import kotlin.properties.Delegates
@@ -49,11 +49,11 @@ class ParameterNameTests {
 
     private val normalCasedMapper = jacksonMapperBuilder()
             .enable(MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS)
-            .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+            .disable(DateTimeFeature.WRITE_DATES_AS_TIMESTAMPS)
             .build()
 
     private val pascalCasedMapper = jacksonMapperBuilder()
-            .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+            .disable(DateTimeFeature.WRITE_DATES_AS_TIMESTAMPS)
             .propertyNamingStrategy(PropertyNamingStrategies.UPPER_CAMEL_CASE)
             .build()