From 6071cf515ac49e4108041409a9be7e77b21eb7c6 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sat, 13 Apr 2024 16:25:18 +0900 Subject: [PATCH 1/4] Formatting pom.xml --- pom.xml | 60 +++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index b181b718..972617ba 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 1.8 1.7.22 - + com/fasterxml/jackson/module/kotlin ${project.groupId}.kotlin @@ -219,11 +219,11 @@ com.fasterxml.jackson.module jackson-module-kotlin - - + + 2.17.0 jar @@ -237,21 +237,39 @@ true true - - - com.fasterxml.jackson.module.kotlin.KotlinModule#KotlinModule(int,boolean,boolean,boolean,com.fasterxml.jackson.module.kotlin.SingletonSupport,boolean,boolean,boolean) - com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#getNullIsSameAsDefault() - com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#nullIsSameAsDefault(boolean) - com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#getNullToEmptyCollection() - com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#nullToEmptyCollection(boolean) - com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#getNullToEmptyMap() - com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#nullToEmptyMap(boolean) - com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#getSingletonSupport() - com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#singletonSupport(com.fasterxml.jackson.module.kotlin.SingletonSupport) - com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#getStrictNullChecks() - com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#strictNullChecks(boolean) - com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#reflectionCacheSize(int) - + + + + com.fasterxml.jackson.module.kotlin.KotlinModule#KotlinModule(int,boolean,boolean,boolean,com.fasterxml.jackson.module.kotlin.SingletonSupport,boolean,boolean,boolean) + + com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#getNullIsSameAsDefault() + + + com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#nullIsSameAsDefault(boolean) + + + com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#getNullToEmptyCollection() + + + com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#nullToEmptyCollection(boolean) + + com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#getNullToEmptyMap() + + com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#nullToEmptyMap(boolean) + + com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#getSingletonSupport() + + + com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#singletonSupport(com.fasterxml.jackson.module.kotlin.SingletonSupport) + + com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#getStrictNullChecks() + + + com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#strictNullChecks(boolean) + + com.fasterxml.jackson.module.kotlin.KotlinModule$Builder#reflectionCacheSize(int) + + From b2f1c878b6a2c1dfe191749b99c2893175798f2c Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sun, 14 Apr 2024 13:51:19 +0900 Subject: [PATCH 2/4] Revised description to conform to 2.17 --- README.md | 11 ++++++----- pom.xml | 2 +- release-notes/CREDITS-2.x | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f8149d79..ea533ed6 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,8 @@ and those with secondary constructors or static factories are also supported. # Status -* release `2.16.0` (for Jackson `2.16.x`) [![GitHub Actions build](https://github.com/FasterXML/jackson-module-kotlin/actions/workflows/main.yml/badge.svg?branch=2.16)](https://github.com/FasterXML/jackson-module-kotlin/actions?query=branch%3A2.16) +* release `2.17.0` (for Jackson `2.17.x`) [![GitHub Actions build](https://github.com/FasterXML/jackson-module-kotlin/actions/workflows/main.yml/badge.svg?branch=2.16)](https://github.com/FasterXML/jackson-module-kotlin/actions?query=branch%3A2.16) +* release `2.16.2` (for Jackson `2.16.x`) [![GitHub Actions build](https://github.com/FasterXML/jackson-module-kotlin/actions/workflows/main.yml/badge.svg?branch=2.16)](https://github.com/FasterXML/jackson-module-kotlin/actions?query=branch%3A2.16) * release `2.15.3` (for Jackson `2.15.x`) [![GitHub Actions build](https://github.com/FasterXML/jackson-module-kotlin/actions/workflows/main.yml/badge.svg?branch=2.15)](https://github.com/FasterXML/jackson-module-kotlin/actions?query=branch%3A2.15) * release `2.14.3` (for Jackson `2.14.x`) [![GitHub Actions build](https://github.com/FasterXML/jackson-module-kotlin/actions/workflows/main.yml/badge.svg?branch=2.14)](https://github.com/FasterXML/jackson-module-kotlin/actions?query=branch%3A2.14) @@ -18,7 +19,7 @@ Releases require that you have included Kotlin stdlib and reflect libraries alre Gradle: ``` -implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.16.+" +implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.17.+" ``` Maven: @@ -26,7 +27,7 @@ Maven: com.fasterxml.jackson.module jackson-module-kotlin - 2.16.0 + 2.17.0 ``` @@ -252,8 +253,8 @@ See the [main Jackson contribution guidelines](https://github.com/FasterXML/jack If you are going to write code, choose the appropriate base branch: -- `2.15` for bugfixes against the current stable version -- `2.16` for additive functionality & features or [minor](https://semver.org), backwards compatible changes to existing behavior to be included in the next minor version release +- `2.16` for bugfixes against the current stable version +- `2.17` for additive functionality & features or [minor](https://semver.org), backwards compatible changes to existing behavior to be included in the next minor version release - `master` for significant changes to existing behavior, which will be part of Jackson 3.0 ### Failing tests diff --git a/pom.xml b/pom.xml index c581ee57..9bac4b03 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ scm:git:git@github.com:FasterXML/jackson-module-kotlin.git scm:git:git@github.com:FasterXML/jackson-module-kotlin.git https://github.com/FasterXML/jackson-module-kotlin - jackson-module-kotlin-2.16.0-rc1 + jackson-module-kotlin-2.17.1 diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x index d51a68d1..02b3db13 100644 --- a/release-notes/CREDITS-2.x +++ b/release-notes/CREDITS-2.x @@ -44,7 +44,7 @@ WrongWrong (@k163377) * #732: SequenceSerializer removed. * #727: Fixed overriding findCreatorAnnotation instead of hasCreatorAnnotation -# 2.16.1 (not yet released) +# 2.16.1 WrongWrong (@k163377) * #733: Fix problem with Serializable objects not implementing readResolve From e4b9eaeee6991dda4bb369af429a26b2d9eba2d1 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sun, 14 Apr 2024 14:01:43 +0900 Subject: [PATCH 3/4] Fix badge URL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ea533ed6..8bca56aa 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ and those with secondary constructors or static factories are also supported. # Status -* release `2.17.0` (for Jackson `2.17.x`) [![GitHub Actions build](https://github.com/FasterXML/jackson-module-kotlin/actions/workflows/main.yml/badge.svg?branch=2.16)](https://github.com/FasterXML/jackson-module-kotlin/actions?query=branch%3A2.16) +* release `2.17.0` (for Jackson `2.17.x`) [![GitHub Actions build](https://github.com/FasterXML/jackson-module-kotlin/actions/workflows/main.yml/badge.svg?branch=2.16)](https://github.com/FasterXML/jackson-module-kotlin/actions?query=branch%3A2.17) * release `2.16.2` (for Jackson `2.16.x`) [![GitHub Actions build](https://github.com/FasterXML/jackson-module-kotlin/actions/workflows/main.yml/badge.svg?branch=2.16)](https://github.com/FasterXML/jackson-module-kotlin/actions?query=branch%3A2.16) * release `2.15.3` (for Jackson `2.15.x`) [![GitHub Actions build](https://github.com/FasterXML/jackson-module-kotlin/actions/workflows/main.yml/badge.svg?branch=2.15)](https://github.com/FasterXML/jackson-module-kotlin/actions?query=branch%3A2.15) * release `2.14.3` (for Jackson `2.14.x`) [![GitHub Actions build](https://github.com/FasterXML/jackson-module-kotlin/actions/workflows/main.yml/badge.svg?branch=2.14)](https://github.com/FasterXML/jackson-module-kotlin/actions?query=branch%3A2.14) From 48b0b275c0bbf11717358adb32293c3cd06fd31c Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sun, 14 Apr 2024 14:05:49 +0900 Subject: [PATCH 4/4] Revised description to conform to 2.18 --- README.md | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8bca56aa..780a662c 100644 --- a/README.md +++ b/README.md @@ -253,8 +253,8 @@ See the [main Jackson contribution guidelines](https://github.com/FasterXML/jack If you are going to write code, choose the appropriate base branch: -- `2.16` for bugfixes against the current stable version -- `2.17` for additive functionality & features or [minor](https://semver.org), backwards compatible changes to existing behavior to be included in the next minor version release +- `2.17` for bugfixes against the current stable version +- `2.18` for additive functionality & features or [minor](https://semver.org), backwards compatible changes to existing behavior to be included in the next minor version release - `master` for significant changes to existing behavior, which will be part of Jackson 3.0 ### Failing tests diff --git a/pom.xml b/pom.xml index 659a1784..8087088d 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ scm:git:git@github.com:FasterXML/jackson-module-kotlin.git scm:git:git@github.com:FasterXML/jackson-module-kotlin.git https://github.com/FasterXML/jackson-module-kotlin - jackson-module-kotlin-2.17.1 + jackson-module-kotlin-2.18.0-rc1