[Git][java-team/jsap][master] 2 commits: Restore compatibility with xstream 1.4.18

[Markus Koschany (@apo)]

Markus Koschany pushed to branch master at Debian Java Maintainers / jsap


Commits:
eda2c311 by Markus Koschany at 2021-09-29T19:42:48+02:00
Restore compatibility with xstream 1.4.18

Closes: #995205

- - - - -
e587cd14 by Markus Koschany at 2021-09-29T19:44:17+02:00
Update changelog

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/series
- + debian/patches/xstream-1.4.18.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+jsap (2.1-5) unstable; urgency=medium
+
+  * Team upload.
+  * Restore compatibility with xstream 1.4.18. (Closes: #995205)
+
+ -- Markus Koschany <apo at debian.org>  Wed, 29 Sep 2021 19:44:01 +0200
+
 jsap (2.1-4) unstable; urgency=medium
 
   * Setting Salsa VCS paths


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+xstream-1.4.18.patch


=====================================
debian/patches/xstream-1.4.18.patch
=====================================
@@ -0,0 +1,24 @@
+From: Markus Koschany <apo at debian.org>
+Date: Mon, 27 Sep 2021 22:35:30 +0200
+Subject: xstream 1.4.18
+
+Update the xstream whitelist and allow the com.martiansoftware.jsap.xml package
+
+Debian-Bug: https://bugs.debian.org/995205
+Forwarded: no
+---
+ src/java/com/martiansoftware/jsap/xml/JSAPXStream.java | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/java/com/martiansoftware/jsap/xml/JSAPXStream.java b/src/java/com/martiansoftware/jsap/xml/JSAPXStream.java
+index 5f19a37..2206d63 100644
+--- a/src/java/com/martiansoftware/jsap/xml/JSAPXStream.java
++++ b/src/java/com/martiansoftware/jsap/xml/JSAPXStream.java
+@@ -19,6 +19,7 @@ class JSAPXStream extends XStream {
+ 
+ 	public JSAPXStream() {
+ 		super(new DomDriver());
++		allowTypesByWildcard(new String[] {JSAPXStream.class.getPackage().getName()+".*" });
+ 		alias("jsap", JSAPConfig.class);
+ 		alias("flaggedOption", FlaggedOptionConfig.class);
+ 		alias("unflaggedOption", UnflaggedOptionConfig.class);



View it on GitLab: https://salsa.debian.org/java-team/jsap/-/compare/1835cf8ea4b3049147e25b8a03999b8cf121987f...e587cd14799f9525da570e95868d6881772ba614

-- 
View it on GitLab: https://salsa.debian.org/java-team/jsap/-/compare/1835cf8ea4b3049147e25b8a03999b8cf121987f...e587cd14799f9525da570e95868d6881772ba614
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20210929/e6ab1618/attachment.htm>