From 1ee82968a310f0389a22a5e84633d42399daf980 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Thu, 15 Feb 2024 09:18:48 -0800 Subject: [PATCH 1/6] Prepare for 2.15.4 release --- pom.xml | 2 +- release-notes/VERSION-2.x | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 748131c6..aaf97412 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.fasterxml.jackson jackson-base - 2.15.4-SNAPSHOT + 2.15.4 com.fasterxml.jackson.jr jackson-jr-parent diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x index efa08700..c9c32488 100644 --- a/release-notes/VERSION-2.x +++ b/release-notes/VERSION-2.x @@ -11,6 +11,10 @@ Modules: === Releases === ------------------------------------------------------------------------ +2.15.4 + +No changes since 2.15.3 + 2.15.3 (12-Oct-2023) #107: Cannot deserialize `byte[]` from JSON `null` value From c14dd952712abed27ce74c2c70a69ddbcfc58cc2 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Thu, 15 Feb 2024 09:28:30 -0800 Subject: [PATCH 2/6] Update Maven wrapper version --- .mvn/wrapper/maven-wrapper.properties | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 642d572c..528c20cd 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,18 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar From 1672890dac587545ba849b521455bf3ddef0099c Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Thu, 15 Feb 2024 09:32:50 -0800 Subject: [PATCH 3/6] Update shade plugin for 2.15 to unblock build --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index aaf97412..a3fe86c6 100644 --- a/pom.xml +++ b/pom.xml @@ -46,6 +46,9 @@ source + + 3.5.1 + 2023-10-12T22:52:57Z From 34531a3bcfb85815750691a4ef21b710345e0c44 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Thu, 15 Feb 2024 09:33:49 -0800 Subject: [PATCH 4/6] [maven-release-plugin] prepare release jackson-jr-parent-2.15.4 --- jr-all/pom.xml | 4 ++-- jr-annotation-support/pom.xml | 4 ++-- jr-objects/pom.xml | 4 ++-- jr-retrofit2/pom.xml | 4 ++-- jr-stree/pom.xml | 4 ++-- pom.xml | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/jr-all/pom.xml b/jr-all/pom.xml index eeb166ae..b24f8081 100644 --- a/jr-all/pom.xml +++ b/jr-all/pom.xml @@ -4,7 +4,7 @@ com.fasterxml.jackson.jr jackson-jr-parent - 2.15.4-SNAPSHOT + 2.15.4 jackson-jr-all jackson-jr-all @@ -23,7 +23,7 @@ Streaming, in a single jar. - 2023-10-12T22:52:57Z + 2024-02-15T17:33:27Z diff --git a/jr-annotation-support/pom.xml b/jr-annotation-support/pom.xml index efee8356..2f844552 100644 --- a/jr-annotation-support/pom.xml +++ b/jr-annotation-support/pom.xml @@ -8,7 +8,7 @@ com.fasterxml.jackson.jr jackson-jr-parent - 2.15.4-SNAPSHOT + 2.15.4 jackson-jr-annotation-support bundle @@ -33,7 +33,7 @@ ${project.groupId}.annotationsupport - 2023-10-12T22:52:57Z + 2024-02-15T17:33:27Z diff --git a/jr-objects/pom.xml b/jr-objects/pom.xml index 60e0b293..3cbca0c5 100644 --- a/jr-objects/pom.xml +++ b/jr-objects/pom.xml @@ -8,7 +8,7 @@ com.fasterxml.jackson.jr jackson-jr-parent - 2.15.4-SNAPSHOT + 2.15.4 jackson-jr-objects bundle @@ -31,7 +31,7 @@ has no other dependencies, and provides additional builder-style content generat ${generatedSourcesDir}/${packageVersion.dir}/PackageVersion.java - 2023-10-12T22:52:57Z + 2024-02-15T17:33:27Z diff --git a/jr-retrofit2/pom.xml b/jr-retrofit2/pom.xml index 335b8406..3159e3d9 100644 --- a/jr-retrofit2/pom.xml +++ b/jr-retrofit2/pom.xml @@ -8,7 +8,7 @@ com.fasterxml.jackson.jr jackson-jr-parent - 2.15.4-SNAPSHOT + 2.15.4 jackson-jr-retrofit2 bundle @@ -33,7 +33,7 @@ ${project.groupId}.retrofit2;version=${project.version} --> - 2023-10-12T22:52:57Z + 2024-02-15T17:33:27Z diff --git a/jr-stree/pom.xml b/jr-stree/pom.xml index 6a52b83e..789a3e85 100644 --- a/jr-stree/pom.xml +++ b/jr-stree/pom.xml @@ -8,7 +8,7 @@ com.fasterxml.jackson.jr jackson-jr-parent - 2.15.4-SNAPSHOT + 2.15.4 jackson-jr-stree bundle @@ -34,7 +34,7 @@ has no other dependencies. ${project.groupId}.stree - 2023-10-12T22:52:57Z + 2024-02-15T17:33:27Z diff --git a/pom.xml b/pom.xml index a3fe86c6..d7367ecf 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ com.fasterxml.jackson.jr jackson-jr-parent Parent pom for Jackson jr components - 2.15.4-SNAPSHOT + 2.15.4 pom Parent pom for Jackson jr components @@ -33,7 +33,7 @@ scm:git:git@github.com:FasterXML/jackson-jr.git scm:git:git@github.com:FasterXML/jackson-jr.git https://github.com/FasterXML/jackson-jr - HEAD + jackson-jr-parent-2.15.4 @@ -50,7 +50,7 @@ 3.5.1 - 2023-10-12T22:52:57Z + 2024-02-15T17:33:27Z - 2024-02-15T17:33:27Z + 2024-02-15T17:33:52Z diff --git a/jr-annotation-support/pom.xml b/jr-annotation-support/pom.xml index 2f844552..eb364edb 100644 --- a/jr-annotation-support/pom.xml +++ b/jr-annotation-support/pom.xml @@ -8,7 +8,7 @@ com.fasterxml.jackson.jr jackson-jr-parent - 2.15.4 + 2.15.5-SNAPSHOT jackson-jr-annotation-support bundle @@ -33,7 +33,7 @@ ${project.groupId}.annotationsupport - 2024-02-15T17:33:27Z + 2024-02-15T17:33:52Z diff --git a/jr-objects/pom.xml b/jr-objects/pom.xml index 3cbca0c5..32e508a6 100644 --- a/jr-objects/pom.xml +++ b/jr-objects/pom.xml @@ -8,7 +8,7 @@ com.fasterxml.jackson.jr jackson-jr-parent - 2.15.4 + 2.15.5-SNAPSHOT jackson-jr-objects bundle @@ -31,7 +31,7 @@ has no other dependencies, and provides additional builder-style content generat ${generatedSourcesDir}/${packageVersion.dir}/PackageVersion.java - 2024-02-15T17:33:27Z + 2024-02-15T17:33:52Z diff --git a/jr-retrofit2/pom.xml b/jr-retrofit2/pom.xml index 3159e3d9..67b8538d 100644 --- a/jr-retrofit2/pom.xml +++ b/jr-retrofit2/pom.xml @@ -8,7 +8,7 @@ com.fasterxml.jackson.jr jackson-jr-parent - 2.15.4 + 2.15.5-SNAPSHOT jackson-jr-retrofit2 bundle @@ -33,7 +33,7 @@ ${project.groupId}.retrofit2;version=${project.version} --> - 2024-02-15T17:33:27Z + 2024-02-15T17:33:52Z diff --git a/jr-stree/pom.xml b/jr-stree/pom.xml index 789a3e85..ce277010 100644 --- a/jr-stree/pom.xml +++ b/jr-stree/pom.xml @@ -8,7 +8,7 @@ com.fasterxml.jackson.jr jackson-jr-parent - 2.15.4 + 2.15.5-SNAPSHOT jackson-jr-stree bundle @@ -34,7 +34,7 @@ has no other dependencies. ${project.groupId}.stree - 2024-02-15T17:33:27Z + 2024-02-15T17:33:52Z diff --git a/pom.xml b/pom.xml index d7367ecf..395bfe88 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ com.fasterxml.jackson.jr jackson-jr-parent Parent pom for Jackson jr components - 2.15.4 + 2.15.5-SNAPSHOT pom Parent pom for Jackson jr components @@ -33,7 +33,7 @@ scm:git:git@github.com:FasterXML/jackson-jr.git scm:git:git@github.com:FasterXML/jackson-jr.git https://github.com/FasterXML/jackson-jr - jackson-jr-parent-2.15.4 + HEAD @@ -50,7 +50,7 @@ 3.5.1 - 2024-02-15T17:33:27Z + 2024-02-15T17:33:52Z