Tony Mancill pushed to branch master at Debian Java Maintainers / zookeeper


Commits:
ee158cb7 by tony mancill at 2026-06-20T13:21:28-07:00
Address FTBFS due to change in jackson-core 2.14.1-2 (Closes: #1139533)

- - - - -
77fafe17 by tony mancill at 2026-06-20T13:40:34-07:00
Prepare changelog for upload

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/41-jackson-ioexception-ftbfs.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+zookeeper (3.9.5-2) unstable; urgency=medium
+
+  * Address FTBFS due to change in jackson-core 2.14.1-2 (Closes: #1139533)
+
+ -- tony mancill <[email protected]>  Sat, 20 Jun 2026 13:00:56 -0700
+
 zookeeper (3.9.5-1) unstable; urgency=medium
 
   * New upstream version 3.9.5


=====================================
debian/patches/41-jackson-ioexception-ftbfs.patch
=====================================
@@ -0,0 +1,36 @@
+Description: Address FTBFS now that ObjectMapper throws IOException
+ The upload for jackson-core 2.14.1-2 changed the possible exceptions thrown
+ See https://security-tracker.debian.org/tracker/CVE-2025-52999 and
+ 
https://tracker.debian.org/news/1742191/accepted-jackson-core-2141-2-source-into-unstable/
+ .
+ This also builds against the libjackson2-core-java 2.14.1-1, so does not
+ require a versioned dependency and is suitable for backports.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1139533
+Author: tony mancill <[email protected]>
+Forwarded: not-needed
+
+--- 
a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/JsonGenerator.java
++++ 
b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/JsonGenerator.java
+@@ -17,12 +17,12 @@
+  */
+ package org.apache.zookeeper.graph;
+ 
+-import com.fasterxml.jackson.core.JsonProcessingException;
+ import com.fasterxml.jackson.core.util.MinimalPrettyPrinter;
+ import com.fasterxml.jackson.databind.JsonNode;
+ import com.fasterxml.jackson.databind.ObjectMapper;
+ import com.fasterxml.jackson.databind.node.ArrayNode;
+ import com.fasterxml.jackson.databind.node.ObjectNode;
++import java.io.IOException;
+ import java.util.regex.Pattern;
+ import java.util.regex.Matcher;
+ import java.util.HashSet;
+@@ -215,7 +215,7 @@
+               String jsonString = null;
+               try {
+                       jsonString = mapper.writer(new 
MinimalPrettyPrinter()).writeValueAsString(root);
+-              } catch (JsonProcessingException e) {
++              } catch (IOException e) {
+                       jsonString = "{\"ERR\", " + e.getMessage() + "}";
+               }
+               return jsonString;


=====================================
debian/patches/series
=====================================
@@ -34,3 +34,4 @@
 38-netty-4.1.114.patch
 39-iso-c23-const.patch
 40-default-zoocfg.patch
+41-jackson-ioexception-ftbfs.patch



View it on GitLab: 
https://salsa.debian.org/java-team/zookeeper/-/compare/0e24adbafbb163228e436b3bfefe89ffe15477b0...77fafe1765fda1d33676d84301d4606898f80184

-- 
View it on GitLab: 
https://salsa.debian.org/java-team/zookeeper/-/compare/0e24adbafbb163228e436b3bfefe89ffe15477b0...77fafe1765fda1d33676d84301d4606898f80184
You're receiving this email because of your account on salsa.debian.org. Manage 
all notifications: https://salsa.debian.org/-/profile/notifications | Help: 
https://salsa.debian.org/help


_______________________________________________
pkg-java-commits mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to