Tony Mancill pushed to branch master at Debian Java Maintainers / jackson-datatype-joda
Commits: d132b101 by Vladimir Petko at 2024-01-18T13:40:35+13:00 d/p/java21_replace_special_character.patch: cherry-pick upstream patch to resolve Java 21 FTBFS (Closes: #1057507). - - - - - 45271e40 by Vladimir Petko at 2024-01-18T13:41:31+13:00 changelog - - - - - cf79937e by Tony Mancill at 2024-01-18T03:23:32+00:00 Merge branch 'master' into 'master' Resolve Java 21 FTBFS See merge request java-team/jackson-datatype-joda!2 - - - - - 3 changed files: - debian/changelog - + debian/patches/java21_replace_special_character.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +jackson-datatype-joda (2.12.1-2) UNRELEASED; urgency=medium + + * d/p/java21_replace_special_character.patch: cherry-pick upstream + patch to resolve Java 21 FTBFS (Closes: #1057507). + + -- Vladimir Petko <vladimir.pe...@canonical.com> Thu, 18 Jan 2024 13:40:48 +1300 + jackson-datatype-joda (2.12.1-1) unstable; urgency=medium * Team upload. ===================================== debian/patches/java21_replace_special_character.patch ===================================== @@ -0,0 +1,25 @@ +Description: Replace the special character with a space + See https://bugs.openjdk.org/browse/JDK-8284840. For the assertion to succeed, + a special character is replaced by a normal space. +Author: Vladimir Petko <vladimir.pe...@canonical.com> +Origin: upstream, https://github.com/FasterXML/jackson-datatype-joda/commit/bc68eeb9154874ef8135d65317619a197eeb0ceb +Bug: https://github.com/FasterXML/jackson-datatype-joda/pull/133 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057507 +Applied-Upstream: bc68eeb9154874ef8135d65317619a197eeb0ceb +Last-Update: 2024-01-18 +diff --git a/src/test/java/com/fasterxml/jackson/datatype/joda/DateTimeTest.java b/src/test/java/com/fasterxml/jackson/datatype/joda/DateTimeTest.java +index 4d3d766..b9324aa 100644 +--- a/src/test/java/com/fasterxml/jackson/datatype/joda/DateTimeTest.java ++++ b/src/test/java/com/fasterxml/jackson/datatype/joda/DateTimeTest.java +@@ -129,6 +129,12 @@ public class DateTimeTest extends JodaTestBase + if (json.contains(",")) { + json = json.replace(", ", " "); + } ++ // https://bugs.openjdk.org/browse/JDK-8284840 ++ // Java 21 uses NBSP/NNBSP prefixed to AM/PM in time format, instead of a normal space ++ if (json.contains("\u202f")) { ++ json = json.replace("\u202f", " "); ++ } ++ + assertEquals(aposToQuotes("{'date':'1/1/70 12:00 AM'}"), json); + } ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ base-pom-version.patch +java21_replace_special_character.patch View it on GitLab: https://salsa.debian.org/java-team/jackson-datatype-joda/-/compare/11792ee2619214e682cee6e1561b8f1e2304a73b...cf79937e594dea6a47834b0d3dc8b6dbf701385c -- View it on GitLab: https://salsa.debian.org/java-team/jackson-datatype-joda/-/compare/11792ee2619214e682cee6e1561b8f1e2304a73b...cf79937e594dea6a47834b0d3dc8b6dbf701385c You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits