From 5a912634198e8fbbf73fd8ca8721d9c8fce372e9 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Thu, 1 Apr 2021 17:13:17 -0700 Subject: [PATCH] Updated release notes wrt #131 --- .../jackson/datatype/jsr310/deser/InstantDeserializer.java | 5 ++--- release-notes/CREDITS-2.x | 3 +++ release-notes/VERSION-2.x | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/InstantDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/InstantDeserializer.java index cde87cac..f968f9aa 100644 --- a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/InstantDeserializer.java +++ b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/InstantDeserializer.java @@ -342,17 +342,16 @@ private String replaceZeroOffsetAsZIfNecessary(String text) return text; } + // @since 2.13 private String addInColonToOffsetIfMissing(String text) { - Matcher matcher = ISO8601_COLONLESS_OFFSET_REGEX.matcher(text); - + final Matcher matcher = ISO8601_COLONLESS_OFFSET_REGEX.matcher(text); if (matcher.find()){ StringBuilder sb = new StringBuilder(matcher.group(0)); sb.insert(3, ":"); return matcher.replaceFirst(sb.toString()); } - return text; } diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x index 9aaa0938..cd22d5a6 100644 --- a/release-notes/CREDITS-2.x +++ b/release-notes/CREDITS-2.x @@ -145,3 +145,6 @@ Gökhan Öner (gokhanoner@github) * Reported #207: Fail to serialize `TemporalAdjuster` type with 2.12 (2.12.3) +Øystein B. Huseby (oeystein@github) + * Contributed #131: Deserializing ZonedDateTime with basic TZ offset notation (0000) + (2.13.0) diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x index 418b43e1..a30d8fb3 100644 --- a/release-notes/VERSION-2.x +++ b/release-notes/VERSION-2.x @@ -10,6 +10,8 @@ Modules: 2.13.0 (not yet released) +#131: Deserializing ZonedDateTime with basic TZ offset notation (0000) + (contributed by Øystein H) #212: Make LocalDateDeserializer consider strict/lenient on accepting (or not) of "time" part