From 56bc483d91168f19a7125a703e67de933b7f8ae7 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 15 Nov 2023 14:55:46 -0800 Subject: [PATCH 1/6] Prepare for 2.16.0 release --- pom.xml | 2 +- release-notes/VERSION-2.x | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 21d2ce33..a2a1848c 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.fasterxml.jackson jackson-base - 2.16.0-SNAPSHOT + 2.16.0 com.fasterxml.jackson.module jackson-modules-base diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x index 19fb4f3a..f0852a0a 100644 --- a/release-notes/VERSION-2.x +++ b/release-notes/VERSION-2.x @@ -23,13 +23,7 @@ Active maintainers: === Releases === ------------------------------------------------------------------------ -#223: IncompatibleClassChangeError when deserializing a class implementing - an interface with default get/set implementations - (reported by @avnersin) -#227: Add `jackson-module-android-record - (contributed by Eran L) - -2.16.0-rc1 (20-Oct-2023) +2.16.0 (15-Nov-2023) #181: (blackbird) BlackBird proxy object error in Java 17 (fix by Steven S) @@ -40,6 +34,11 @@ Active maintainers: #219: (jakarta-xmlbind) Using `jackson-module-jakarta-xmlbind-annotations` 2.15.2 fails in OSGi Environment with JAXB 4 (fix contributed by Marco D) +#223: (mrbean) IncompatibleClassChangeError when deserializing a class implementing + an interface with default get/set implementations + (reported by @avnersin) +#227: Add `jackson-module-android-record` + (contributed by Eran L) - Update `asm` version 9.5 -> 9.6 2.15.3 (12-Oct-2023) From 8aec482ba9989691c6da42d110f049707bb02914 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 15 Nov 2023 15:05:20 -0800 Subject: [PATCH 2/6] [maven-release-plugin] prepare release jackson-modules-base-2.16.0 --- afterburner/pom.xml | 2 +- android-record/pom.xml | 2 +- blackbird/pom.xml | 2 +- guice/pom.xml | 2 +- guice7/pom.xml | 2 +- jakarta-xmlbind/pom.xml | 2 +- jaxb/pom.xml | 2 +- mrbean/pom.xml | 2 +- no-ctor-deser/pom.xml | 2 +- osgi/pom.xml | 2 +- paranamer/pom.xml | 2 +- pom.xml | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/afterburner/pom.xml b/afterburner/pom.xml index 20210007..2daad8d6 100644 --- a/afterburner/pom.xml +++ b/afterburner/pom.xml @@ -8,7 +8,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0-SNAPSHOT + 2.16.0 jackson-module-afterburner Jackson module: Afterburner diff --git a/android-record/pom.xml b/android-record/pom.xml index c5d313c9..71d6539c 100644 --- a/android-record/pom.xml +++ b/android-record/pom.xml @@ -7,7 +7,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0-SNAPSHOT + 2.16.0 4.0.0 diff --git a/blackbird/pom.xml b/blackbird/pom.xml index c181869d..dc2fbed4 100644 --- a/blackbird/pom.xml +++ b/blackbird/pom.xml @@ -8,7 +8,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0-SNAPSHOT + 2.16.0 jackson-module-blackbird Jackson module: Blackbird diff --git a/guice/pom.xml b/guice/pom.xml index 215a02bd..e2c0c2be 100644 --- a/guice/pom.xml +++ b/guice/pom.xml @@ -9,7 +9,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0-SNAPSHOT + 2.16.0 jackson-module-guice Jackson module: Guice (javax.inject) diff --git a/guice7/pom.xml b/guice7/pom.xml index 729520a5..6680d5b6 100644 --- a/guice7/pom.xml +++ b/guice7/pom.xml @@ -9,7 +9,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0-SNAPSHOT + 2.16.0 jackson-module-guice7 Jackson module: Guice 7+ (jakarta.inject) diff --git a/jakarta-xmlbind/pom.xml b/jakarta-xmlbind/pom.xml index 477aaafe..4f4dba88 100644 --- a/jakarta-xmlbind/pom.xml +++ b/jakarta-xmlbind/pom.xml @@ -9,7 +9,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0-SNAPSHOT + 2.16.0 jackson-module-jakarta-xmlbind-annotations Jackson module: Jakarta XML Bind Annotations (jakarta.xml.bind) diff --git a/jaxb/pom.xml b/jaxb/pom.xml index a36075f3..730486f2 100644 --- a/jaxb/pom.xml +++ b/jaxb/pom.xml @@ -9,7 +9,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0-SNAPSHOT + 2.16.0 jackson-module-jaxb-annotations Jackson module: Old JAXB Annotations (javax.xml.bind) diff --git a/mrbean/pom.xml b/mrbean/pom.xml index 4f4dc80a..6218b199 100644 --- a/mrbean/pom.xml +++ b/mrbean/pom.xml @@ -9,7 +9,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0-SNAPSHOT + 2.16.0 jackson-module-mrbean Jackson module: Mr Bean diff --git a/no-ctor-deser/pom.xml b/no-ctor-deser/pom.xml index 48684c30..1255a5b0 100644 --- a/no-ctor-deser/pom.xml +++ b/no-ctor-deser/pom.xml @@ -7,7 +7,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0-SNAPSHOT + 2.16.0 4.0.0 diff --git a/osgi/pom.xml b/osgi/pom.xml index 7de95469..b24c01b4 100644 --- a/osgi/pom.xml +++ b/osgi/pom.xml @@ -9,7 +9,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0-SNAPSHOT + 2.16.0 jackson-module-osgi bundle diff --git a/paranamer/pom.xml b/paranamer/pom.xml index 726884af..a919f0e8 100644 --- a/paranamer/pom.xml +++ b/paranamer/pom.xml @@ -9,7 +9,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0-SNAPSHOT + 2.16.0 jackson-module-paranamer Jackson module: Paranamer diff --git a/pom.xml b/pom.xml index a2a1848c..7707fb3e 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ com.fasterxml.jackson.module jackson-modules-base Jackson modules: Base - 2.16.0-SNAPSHOT + 2.16.0 pom Parent pom for Jackson "base" modules: modules that build directly on databind, and are not datatype, data format, or JAX-RS provider modules. @@ -42,7 +42,7 @@ not datatype, data format, or JAX-RS provider modules. scm:git:git@github.com:FasterXML/jackson-modules-base.git scm:git:git@github.com:FasterXML/jackson-modules-base.git https://github.com/FasterXML/jackson-modules-base - HEAD + jackson-modules-base-2.16.0 https://github.com/FasterXML/jackson-modules-base/issues From d58c41966b3a3fc57aecc0f01da68f9ba39375ae Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 15 Nov 2023 15:05:23 -0800 Subject: [PATCH 3/6] [maven-release-plugin] prepare for next development iteration --- afterburner/pom.xml | 2 +- android-record/pom.xml | 2 +- blackbird/pom.xml | 2 +- guice/pom.xml | 2 +- guice7/pom.xml | 2 +- jakarta-xmlbind/pom.xml | 2 +- jaxb/pom.xml | 2 +- mrbean/pom.xml | 2 +- no-ctor-deser/pom.xml | 2 +- osgi/pom.xml | 2 +- paranamer/pom.xml | 2 +- pom.xml | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/afterburner/pom.xml b/afterburner/pom.xml index 2daad8d6..6a04b89c 100644 --- a/afterburner/pom.xml +++ b/afterburner/pom.xml @@ -8,7 +8,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0 + 2.16.1-SNAPSHOT jackson-module-afterburner Jackson module: Afterburner diff --git a/android-record/pom.xml b/android-record/pom.xml index 71d6539c..d9121531 100644 --- a/android-record/pom.xml +++ b/android-record/pom.xml @@ -7,7 +7,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/blackbird/pom.xml b/blackbird/pom.xml index dc2fbed4..1baefec6 100644 --- a/blackbird/pom.xml +++ b/blackbird/pom.xml @@ -8,7 +8,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0 + 2.16.1-SNAPSHOT jackson-module-blackbird Jackson module: Blackbird diff --git a/guice/pom.xml b/guice/pom.xml index e2c0c2be..44ce8010 100644 --- a/guice/pom.xml +++ b/guice/pom.xml @@ -9,7 +9,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0 + 2.16.1-SNAPSHOT jackson-module-guice Jackson module: Guice (javax.inject) diff --git a/guice7/pom.xml b/guice7/pom.xml index 6680d5b6..4e7275d5 100644 --- a/guice7/pom.xml +++ b/guice7/pom.xml @@ -9,7 +9,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0 + 2.16.1-SNAPSHOT jackson-module-guice7 Jackson module: Guice 7+ (jakarta.inject) diff --git a/jakarta-xmlbind/pom.xml b/jakarta-xmlbind/pom.xml index 4f4dba88..c0729c68 100644 --- a/jakarta-xmlbind/pom.xml +++ b/jakarta-xmlbind/pom.xml @@ -9,7 +9,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0 + 2.16.1-SNAPSHOT jackson-module-jakarta-xmlbind-annotations Jackson module: Jakarta XML Bind Annotations (jakarta.xml.bind) diff --git a/jaxb/pom.xml b/jaxb/pom.xml index 730486f2..388d8f65 100644 --- a/jaxb/pom.xml +++ b/jaxb/pom.xml @@ -9,7 +9,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0 + 2.16.1-SNAPSHOT jackson-module-jaxb-annotations Jackson module: Old JAXB Annotations (javax.xml.bind) diff --git a/mrbean/pom.xml b/mrbean/pom.xml index 6218b199..8f9bf7b1 100644 --- a/mrbean/pom.xml +++ b/mrbean/pom.xml @@ -9,7 +9,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0 + 2.16.1-SNAPSHOT jackson-module-mrbean Jackson module: Mr Bean diff --git a/no-ctor-deser/pom.xml b/no-ctor-deser/pom.xml index 1255a5b0..a5aed025 100644 --- a/no-ctor-deser/pom.xml +++ b/no-ctor-deser/pom.xml @@ -7,7 +7,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/osgi/pom.xml b/osgi/pom.xml index b24c01b4..bc58f357 100644 --- a/osgi/pom.xml +++ b/osgi/pom.xml @@ -9,7 +9,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0 + 2.16.1-SNAPSHOT jackson-module-osgi bundle diff --git a/paranamer/pom.xml b/paranamer/pom.xml index a919f0e8..dd1b922b 100644 --- a/paranamer/pom.xml +++ b/paranamer/pom.xml @@ -9,7 +9,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.0 + 2.16.1-SNAPSHOT jackson-module-paranamer Jackson module: Paranamer diff --git a/pom.xml b/pom.xml index 7707fb3e..127bab72 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ com.fasterxml.jackson.module jackson-modules-base Jackson modules: Base - 2.16.0 + 2.16.1-SNAPSHOT pom Parent pom for Jackson "base" modules: modules that build directly on databind, and are not datatype, data format, or JAX-RS provider modules. @@ -42,7 +42,7 @@ not datatype, data format, or JAX-RS provider modules. scm:git:git@github.com:FasterXML/jackson-modules-base.git scm:git:git@github.com:FasterXML/jackson-modules-base.git https://github.com/FasterXML/jackson-modules-base - jackson-modules-base-2.16.0 + HEAD https://github.com/FasterXML/jackson-modules-base/issues From d222304b9643e730d85328424a01678d3a46d873 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 15 Nov 2023 15:08:35 -0800 Subject: [PATCH 4/6] Back to snapshot deps --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 127bab72..6febd10f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.fasterxml.jackson jackson-base - 2.16.0 + 2.16.1-SNAPSHOT com.fasterxml.jackson.module jackson-modules-base From 32a7c22a2dc91d32816c07dc1313b20acae6d860 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 15 Nov 2023 15:12:32 -0800 Subject: [PATCH 5/6] Start 2.17 branch --- .github/workflows/main.yml | 4 ++-- pom.xml | 2 +- release-notes/VERSION-2.x | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3d966085..a127fa7b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: branches: - master - "3.0" - - "2.16" + - "2.17" paths-ignore: - "README.md" - "release-notes/*" @@ -12,7 +12,7 @@ on: branches: - master - "3.0" - - "2.16" + - "2.17" paths-ignore: - "README.md" - "release-notes/*" diff --git a/pom.xml b/pom.xml index 6febd10f..d5d314e3 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.fasterxml.jackson jackson-base - 2.16.1-SNAPSHOT + 2.17.0-SNAPSHOT com.fasterxml.jackson.module jackson-modules-base diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x index f0852a0a..a8a1ea31 100644 --- a/release-notes/VERSION-2.x +++ b/release-notes/VERSION-2.x @@ -23,6 +23,10 @@ Active maintainers: === Releases === ------------------------------------------------------------------------ +2.17.0 (not yet released) + +- + 2.16.0 (15-Nov-2023) #181: (blackbird) BlackBird proxy object error in Java 17 From 2024cb7673c10a5efcad05aa17a154c1dd2fc188 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 15 Nov 2023 15:13:04 -0800 Subject: [PATCH 6/6] update 2.17 version too --- afterburner/pom.xml | 2 +- android-record/pom.xml | 2 +- blackbird/pom.xml | 2 +- guice/pom.xml | 2 +- guice7/pom.xml | 2 +- jakarta-xmlbind/pom.xml | 2 +- jaxb/pom.xml | 2 +- mrbean/pom.xml | 2 +- no-ctor-deser/pom.xml | 2 +- osgi/pom.xml | 2 +- paranamer/pom.xml | 2 +- pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/afterburner/pom.xml b/afterburner/pom.xml index 6a04b89c..d026a034 100644 --- a/afterburner/pom.xml +++ b/afterburner/pom.xml @@ -8,7 +8,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.1-SNAPSHOT + 2.17.0-SNAPSHOT jackson-module-afterburner Jackson module: Afterburner diff --git a/android-record/pom.xml b/android-record/pom.xml index d9121531..f530f438 100644 --- a/android-record/pom.xml +++ b/android-record/pom.xml @@ -7,7 +7,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.1-SNAPSHOT + 2.17.0-SNAPSHOT 4.0.0 diff --git a/blackbird/pom.xml b/blackbird/pom.xml index 1baefec6..6024e06f 100644 --- a/blackbird/pom.xml +++ b/blackbird/pom.xml @@ -8,7 +8,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.1-SNAPSHOT + 2.17.0-SNAPSHOT jackson-module-blackbird Jackson module: Blackbird diff --git a/guice/pom.xml b/guice/pom.xml index 44ce8010..066377c4 100644 --- a/guice/pom.xml +++ b/guice/pom.xml @@ -9,7 +9,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.1-SNAPSHOT + 2.17.0-SNAPSHOT jackson-module-guice Jackson module: Guice (javax.inject) diff --git a/guice7/pom.xml b/guice7/pom.xml index 4e7275d5..4a2b6b57 100644 --- a/guice7/pom.xml +++ b/guice7/pom.xml @@ -9,7 +9,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.1-SNAPSHOT + 2.17.0-SNAPSHOT jackson-module-guice7 Jackson module: Guice 7+ (jakarta.inject) diff --git a/jakarta-xmlbind/pom.xml b/jakarta-xmlbind/pom.xml index c0729c68..a4b0ab2a 100644 --- a/jakarta-xmlbind/pom.xml +++ b/jakarta-xmlbind/pom.xml @@ -9,7 +9,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.1-SNAPSHOT + 2.17.0-SNAPSHOT jackson-module-jakarta-xmlbind-annotations Jackson module: Jakarta XML Bind Annotations (jakarta.xml.bind) diff --git a/jaxb/pom.xml b/jaxb/pom.xml index 388d8f65..df932982 100644 --- a/jaxb/pom.xml +++ b/jaxb/pom.xml @@ -9,7 +9,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.1-SNAPSHOT + 2.17.0-SNAPSHOT jackson-module-jaxb-annotations Jackson module: Old JAXB Annotations (javax.xml.bind) diff --git a/mrbean/pom.xml b/mrbean/pom.xml index 8f9bf7b1..22e1e6ba 100644 --- a/mrbean/pom.xml +++ b/mrbean/pom.xml @@ -9,7 +9,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.1-SNAPSHOT + 2.17.0-SNAPSHOT jackson-module-mrbean Jackson module: Mr Bean diff --git a/no-ctor-deser/pom.xml b/no-ctor-deser/pom.xml index a5aed025..f98373d7 100644 --- a/no-ctor-deser/pom.xml +++ b/no-ctor-deser/pom.xml @@ -7,7 +7,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.1-SNAPSHOT + 2.17.0-SNAPSHOT 4.0.0 diff --git a/osgi/pom.xml b/osgi/pom.xml index bc58f357..7e175f1a 100644 --- a/osgi/pom.xml +++ b/osgi/pom.xml @@ -9,7 +9,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.1-SNAPSHOT + 2.17.0-SNAPSHOT jackson-module-osgi bundle diff --git a/paranamer/pom.xml b/paranamer/pom.xml index dd1b922b..19afabe6 100644 --- a/paranamer/pom.xml +++ b/paranamer/pom.xml @@ -9,7 +9,7 @@ com.fasterxml.jackson.module jackson-modules-base - 2.16.1-SNAPSHOT + 2.17.0-SNAPSHOT jackson-module-paranamer Jackson module: Paranamer diff --git a/pom.xml b/pom.xml index d5d314e3..b30e0918 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ com.fasterxml.jackson.module jackson-modules-base Jackson modules: Base - 2.16.1-SNAPSHOT + 2.17.0-SNAPSHOT pom Parent pom for Jackson "base" modules: modules that build directly on databind, and are not datatype, data format, or JAX-RS provider modules.