Markus Koschany pushed to branch master at Debian Java Maintainers / jersey1
Commits: 789aa3b8 by Markus Koschany at 2022-12-31T11:57:37+01:00 Add libjettison-java-1.5.3.patch - - - - - 64755b38 by Markus Koschany at 2022-12-31T11:57:46+01:00 Declare compliance with Debian Policy 4.6.2. - - - - - e42dbf07 by Markus Koschany at 2022-12-31T11:58:56+01:00 Tighten build-dependency on libjettions-java - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/libjettison-java-1.5.3.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +jersey1 (1.19.3-8) unstable; urgency=medium + + * Team upload. + * Add libjettison-java-1.5.3.patch and fix FTBFS with libjettions-java 1.5.3. + * Declare compliance with Debian Policy 4.6.2. + + -- Markus Koschany <[email protected]> Sat, 31 Dec 2022 11:57:54 +0100 + jersey1 (1.19.3-7) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -19,14 +19,14 @@ Build-Depends: libjackson-json-java, libjaxb-java, libjdom1-java, - libjettison-java, + libjettison-java (>= 1.5.3), libjsr311-api-java, libmail-java, libmaven-bundle-plugin-java, libosgi-core-java, librome-java (>= 1.6), maven-debian-helper (>= 1.5) -Standards-Version: 4.6.0 +Standards-Version: 4.6.2 Vcs-Git: https://salsa.debian.org/java-team/jersey1.git Vcs-Browser: https://salsa.debian.org/java-team/jersey1 Homepage: https://jersey.java.net ===================================== debian/patches/libjettison-java-1.5.3.patch ===================================== @@ -0,0 +1,27 @@ +From: Markus Koschany <[email protected]> +Date: Sat, 31 Dec 2022 11:56:31 +0100 +Subject: libjettison-java 1.5.3 + +Fix FTBFS with libjettison-java 1.5.3. +--- + .../src/main/java/com/sun/jersey/json/impl/JSONTransformer.java | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/jersey-json/src/main/java/com/sun/jersey/json/impl/JSONTransformer.java b/jersey-json/src/main/java/com/sun/jersey/json/impl/JSONTransformer.java +index e7c001f..46c7361 100644 +--- a/jersey-json/src/main/java/com/sun/jersey/json/impl/JSONTransformer.java ++++ b/jersey-json/src/main/java/com/sun/jersey/json/impl/JSONTransformer.java +@@ -85,11 +85,11 @@ final class JSONTransformer { + return result; + } + +- static String asJsonArray(Collection<? extends Object> collection) { ++ static String asJsonArray(Collection<? extends Object> collection) throws JSONException { + return (null == collection) ? "[]" : (new JSONArray(collection)).toString(); + } + +- static String asJsonObject(Map map) { ++ static String asJsonObject(Map map) throws JSONException { + return (null == map) ? "{}" : (new JSONObject(map)).toString(); + } + } ===================================== debian/patches/series ===================================== @@ -2,3 +2,4 @@ 02-disable-moxy-support.patch 03-add-enterprise-dependencies.patch 04-rome-compatibility.patch +libjettison-java-1.5.3.patch View it on GitLab: https://salsa.debian.org/java-team/jersey1/-/compare/5e0d9497f82e1f39a0904fe763aa526204e8999c...e42dbf0707347ef521d172e6755a05dd26afbdc1 -- View it on GitLab: https://salsa.debian.org/java-team/jersey1/-/compare/5e0d9497f82e1f39a0904fe763aa526204e8999c...e42dbf0707347ef521d172e6755a05dd26afbdc1 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
