[Git][java-team/libpicocontainer1-java][master] 5 commits: Switch to debhelper-compat = 13.
Markus Koschany (@apo)
gitlab at salsa.debian.org
Sat Nov 13 17:40:29 GMT 2021
Markus Koschany pushed to branch master at Debian Java Maintainers / libpicocontainer1-java
Commits:
0e54f421 by Markus Koschany at 2021-11-13T15:38:07+01:00
Switch to debhelper-compat = 13.
- - - - -
fdc56786 by Markus Koschany at 2021-11-13T16:43:42+01:00
Depend on xpp3 artifact instead of xpp3_min.
- - - - -
f4ea28f0 by Markus Koschany at 2021-11-13T18:01:05+01:00
Extend the xstream whitelist to prevent a ForbiddenClassException.
- - - - -
f1f0ac97 by Markus Koschany at 2021-11-13T18:34:30+01:00
Update changelog
- - - - -
bb1ca0ec by Markus Koschany at 2021-11-13T18:37:20+01:00
Declare compliance with Debian Policy 4.6.0.
- - - - -
5 changed files:
- debian/changelog
- debian/control
- debian/maven.rules
- + debian/patches/extend-the-xstream-whitelist.patch
- + debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+libpicocontainer1-java (1.3-3) unstable; urgency=medium
+
+ * Team upload.
+ * Switch to debhelper-compat = 13.
+ * Declare compliance with Debian Policy 4.6.0.
+ * Depend on xpp3 artifact instead of xpp3_min.
+ * Extend the xstream whitelist to prevent a ForbiddenClassException.
+ (Closes: #997580)
+
+ -- Markus Koschany <apo at debian.org> Sat, 13 Nov 2021 18:01:32 +0100
+
libpicocontainer1-java (1.3-2) unstable; urgency=medium
* No change rebuild.
=====================================
debian/control
=====================================
@@ -6,14 +6,14 @@ Uploaders:
Emmanuel Bourg <ebourg at apache.org>,
Saif Abdul Cassim <saif.15 at cse.mrt.ac.lk>
Build-Depends:
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
default-jdk,
junit,
libjmock-java,
libxpp3-java,
libxstream-java,
maven-debian-helper
-Standards-Version: 4.4.0
+Standards-Version: 4.6.0
Vcs-Git: https://salsa.debian.org/java-team/libpicocontainer1-java.git
Vcs-Browser: https://salsa.debian.org/java-team/libpicocontainer1-java
Homepage: http://www.picocontainer.org
=====================================
debian/maven.rules
=====================================
@@ -1,2 +1,3 @@
junit junit jar s/3\..*/3.x/ * *
org.picocontainer picocontainer * s/.*/1.x/ * *
+xpp3 s/xpp3_min/xpp3/ * s/.*/debian/ * *
=====================================
debian/patches/extend-the-xstream-whitelist.patch
=====================================
@@ -0,0 +1,91 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 13 Nov 2021 18:00:25 +0100
+Subject: extend the xstream whitelist
+
+Extend the xstream whitelist.
+
+Forwarded: not-needed
+---
+ .../org/picocontainer/defaults/XStreamSerialisationTestCase.java | 5 ++++-
+ .../org/picocontainer/doc/advanced/CollectionDemoClasses.java | 4 ++--
+ .../org/picocontainer/tck/AbstractComponentAdapterTestCase.java | 8 +++++---
+ 3 files changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/container/src/test/org/picocontainer/defaults/XStreamSerialisationTestCase.java b/container/src/test/org/picocontainer/defaults/XStreamSerialisationTestCase.java
+index 17eb3a1..d11c102 100644
+--- a/container/src/test/org/picocontainer/defaults/XStreamSerialisationTestCase.java
++++ b/container/src/test/org/picocontainer/defaults/XStreamSerialisationTestCase.java
+@@ -19,6 +19,7 @@ public class XStreamSerialisationTestCase extends TestCase {
+ public void testShouldBeAbleToSerialiseEmptyPico() {
+ if (JVM.is14()) {
+ MutablePicoContainer pico = new DefaultPicoContainer();
++ xStream.allowTypesByWildcard(new String[]{"org.picocontainer.**"});
+ String picoXml = xStream.toXML(pico);
+ PicoContainer serializedPico = (PicoContainer) xStream.fromXML(picoXml);
+
+@@ -31,6 +32,7 @@ public class XStreamSerialisationTestCase extends TestCase {
+ MutablePicoContainer pico = new DefaultPicoContainer();
+ pico.registerComponentImplementation(SimpleTouchable.class);
+ pico.registerComponentImplementation(DependsOnTouchable.class);
++ xStream.allowTypesByWildcard(new String[]{"org.picocontainer.**"});
+ String picoXml = xStream.toXML(pico);
+ PicoContainer serializedPico = (PicoContainer) xStream.fromXML(picoXml);
+
+@@ -44,10 +46,11 @@ public class XStreamSerialisationTestCase extends TestCase {
+ pico.registerComponentImplementation(SimpleTouchable.class);
+ pico.registerComponentImplementation(DependsOnTouchable.class);
+ pico.getComponentInstances();
++ xStream.allowTypesByWildcard(new String[]{"org.picocontainer.**"});
+ String picoXml = xStream.toXML(pico);
+ PicoContainer serializedPico = (PicoContainer) xStream.fromXML(picoXml);
+
+ assertEquals(2, serializedPico.getComponentInstances().size());
+ }
+ }
+-}
+\ No newline at end of file
++}
+diff --git a/container/src/test/org/picocontainer/doc/advanced/CollectionDemoClasses.java b/container/src/test/org/picocontainer/doc/advanced/CollectionDemoClasses.java
+index 0d26e57..86c5deb 100644
+--- a/container/src/test/org/picocontainer/doc/advanced/CollectionDemoClasses.java
++++ b/container/src/test/org/picocontainer/doc/advanced/CollectionDemoClasses.java
+@@ -1,6 +1,6 @@
+ /*
+- * Copyright (C) 2004 Jrg Schaible
+- * Created on 24.10.2004 by Jrg Schaible
++ * Copyright (C) 2004 Joerg Schaible
++ * Created on 24.10.2004 by Joerg Schaible
+ */
+ package org.picocontainer.doc.advanced;
+
+diff --git a/container/src/test/org/picocontainer/tck/AbstractComponentAdapterTestCase.java b/container/src/test/org/picocontainer/tck/AbstractComponentAdapterTestCase.java
+index fbaab45..aa3e034 100644
+--- a/container/src/test/org/picocontainer/tck/AbstractComponentAdapterTestCase.java
++++ b/container/src/test/org/picocontainer/tck/AbstractComponentAdapterTestCase.java
+@@ -235,7 +235,8 @@ public abstract class AbstractComponentAdapterTestCase extends MockObjectTestCas
+ assertSame(getComponentAdapterType(), componentAdapter.getClass());
+ final Object instance = componentAdapter.getComponentInstance(picoContainer);
+ assertNotNull(instance);
+- final XStream xstream = new XStream(new PureJavaReflectionProvider(), new XppDriver());
++ XStream xstream = new XStream(new PureJavaReflectionProvider(), new XppDriver());
++ xstream.allowTypesByWildcard(new String[]{"org.picocontainer.**"});
+ final String xml = xstream.toXML(componentAdapter);
+ final ComponentAdapter serializedComponentAdapter = (ComponentAdapter)xstream.fromXML(xml);
+ assertEquals(componentAdapter.getComponentKey(), serializedComponentAdapter.getComponentKey());
+@@ -252,7 +253,8 @@ public abstract class AbstractComponentAdapterTestCase extends MockObjectTestCas
+ assertSame(getComponentAdapterType(), componentAdapter.getClass());
+ final Object instance = componentAdapter.getComponentInstance(picoContainer);
+ assertNotNull(instance);
+- final XStream xstream = new XStream(new XppDriver());
++ XStream xstream = new XStream(new XppDriver());
++ xstream.allowTypesByWildcard(new String[]{"org.picocontainer.**"});
+ final String xml = xstream.toXML(componentAdapter);
+ final ComponentAdapter serializedComponentAdapter = (ComponentAdapter)xstream.fromXML(xml);
+ assertEquals(componentAdapter.getComponentKey(), serializedComponentAdapter.getComponentKey());
+@@ -649,4 +651,4 @@ public abstract class AbstractComponentAdapterTestCase extends MockObjectTestCas
+ }
+ return hasParameters;
+ }
+-}
+\ No newline at end of file
++}
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+extend-the-xstream-whitelist.patch
View it on GitLab: https://salsa.debian.org/java-team/libpicocontainer1-java/-/compare/fb12965316bf5889f104cf4a97ed7028257aa63f...bb1ca0ecb08160751c32b97bb890e2e10617eb4f
--
View it on GitLab: https://salsa.debian.org/java-team/libpicocontainer1-java/-/compare/fb12965316bf5889f104cf4a97ed7028257aa63f...bb1ca0ecb08160751c32b97bb890e2e10617eb4f
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/20211113/52fa7b63/attachment.htm>
More information about the pkg-java-commits
mailing list