[Git][java-team/jackson-dataformat-xml][master] 9 commits: Switch to debhelper-compat = 12.
Markus Koschany
gitlab at salsa.debian.org
Sun Jul 21 23:15:02 BST 2019
Markus Koschany pushed to branch master at Debian Java Maintainers / jackson-dataformat-xml
Commits:
f5f922ac by Markus Koschany at 2019-07-21T21:57:15Z
Switch to debhelper-compat = 12.
- - - - -
d47237e5 by Markus Koschany at 2019-07-21T21:57:34Z
Declare compliance with Debian Policy 4.4.0.
- - - - -
d354b9fa by Markus Koschany at 2019-07-21T21:57:51Z
Update copyright years.
- - - - -
2d1db602 by Markus Koschany at 2019-07-21T21:58:27Z
Remove get-orig-source target.
- - - - -
b3f67074 by Markus Koschany at 2019-07-21T22:01:26Z
New upstream version 2.9.9
- - - - -
336ca91a by Markus Koschany at 2019-07-21T22:01:30Z
Update upstream source from tag 'upstream/2.9.9'
Update to upstream version '2.9.9'
with Debian dir fbf77a66a95a63a558e9ec40bc9cc8543dc7ee71
- - - - -
4ccd810a by Markus Koschany at 2019-07-21T22:02:46Z
Update changelog
- - - - -
84572083 by Markus Koschany at 2019-07-21T22:03:21Z
Update jackson-base-version.patch
- - - - -
78bc1f79 by Markus Koschany at 2019-07-21T22:07:27Z
Use canonical VCS URI
- - - - -
9 changed files:
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- debian/patches/jackson-base-version.patch
- debian/rules
- pom.xml
- release-notes/VERSION-2.x
- src/main/java/com/fasterxml/jackson/dataformat/xml/XmlFactory.java
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+jackson-dataformat-xml (2.9.9-1) unstable; urgency=medium
+
+ * New upstream version 2.9.9.
+ * Switch to debhelper-compat = 12.
+ * Declare compliance with Debian Policy 4.4.0.
+ * Remove get-orig-source target.
+
+ -- Markus Koschany <apo at debian.org> Mon, 22 Jul 2019 00:01:49 +0200
+
jackson-dataformat-xml (2.9.8-1) unstable; urgency=medium
* New upstream version 2.9.8
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders:
Markus Koschany <apo at debian.org>
Build-Depends:
- debhelper (>= 11),
+ debhelper-compat (= 12),
default-jdk,
default-jdk-doc,
libbuild-helper-maven-plugin-java,
@@ -25,9 +25,9 @@ Build-Depends:
libstax2-api-java (>= 3.1.1),
maven-debian-helper (>= 1.5),
xmlstarlet
-Standards-Version: 4.2.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/jackson-dataformat-xml.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jackson-dataformat-xml.git
+Standards-Version: 4.4.0
+Vcs-Git: https://salsa.debian.org/java-team/jackson-dataformat-xml.git
+Vcs-Browser: https://salsa.debian.org/java-team/jackson-dataformat-xml
Homepage: https://github.com/FasterXML/jackson-dataformat-xml
Package: libjackson2-dataformat-xml-java
=====================================
debian/copyright
=====================================
@@ -12,7 +12,7 @@ Comment:
http://wiki.fasterxml.com/JacksonLicensing
Files: debian/*
-Copyright: 2015-2018, Markus Koschany <apo at debian.org>
+Copyright: 2015-2019, Markus Koschany <apo at debian.org>
License: Apache-2.0
License: Apache-2.0
=====================================
debian/patches/jackson-base-version.patch
=====================================
@@ -14,7 +14,7 @@ index b72dfa1..3264169 100644
<parent>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-base</artifactId>
-- <version>2.9.8</version>
+- <version>2.9.9</version>
+ <version>debian</version>
</parent>
<groupId>com.fasterxml.jackson.dataformat</groupId>
=====================================
debian/rules
=====================================
@@ -5,6 +5,3 @@
override_dh_installchangelogs:
dh_installchangelogs release-notes/VERSION-2.x
-
-get-orig-source:
- uscan --download-current-version --force-download --repack --compression xz
=====================================
pom.xml
=====================================
@@ -4,11 +4,11 @@
<parent>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-base</artifactId>
- <version>2.9.8</version>
+ <version>2.9.9</version>
</parent>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
- <version>2.9.8</version>
+ <version>2.9.9</version>
<name>Jackson-dataformat-XML</name>
<packaging>bundle</packaging>
<description>Data format extension for Jackson (http://jackson.codehaus.org) to offer
@@ -21,7 +21,7 @@ Some data-binding types overridden as well (ObjectMapper sub-classed as XmlMappe
<connection>scm:git:git at github.com:FasterXML/jackson-dataformat-xml.git</connection>
<developerConnection>scm:git:git at github.com:FasterXML/jackson-dataformat-xml.git</developerConnection>
<url>http://github.com/FasterXML/jackson-dataformat-xml</url>
- <tag>jackson-dataformat-xml-2.9.8</tag>
+ <tag>jackson-dataformat-xml-2.9.9</tag>
</scm>
<properties>
<packageVersion.dir>com/fasterxml/jackson/dataformat/xml</packageVersion.dir>
@@ -82,7 +82,7 @@ Some data-binding types overridden as well (ObjectMapper sub-classed as XmlMappe
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
- <version>5.0.3</version>
+ <version>5.1.0</version>
</dependency>
<!-- 04-Feb-2018, tatu: Finally, Java 9 does not bundle JAXB, not even API;
=====================================
release-notes/VERSION-2.x
=====================================
@@ -4,6 +4,11 @@ Project: jackson-dataformat-xml
= Releases
------------------------------------------------------------------------
+2.9.9 (16-May-2019)
+
+#333: `OutputDecorator` not called with `XmlMapper`
+ (reported by Nelson D)
+
2.9.8 (15-Dec-2018)
#270: Add support for `writeBinary()` with `InputStream` to `ToXMLGenerator`
=====================================
src/main/java/com/fasterxml/jackson/dataformat/xml/XmlFactory.java
=====================================
@@ -448,19 +448,20 @@ public class XmlFactory extends JsonFactory
public ToXmlGenerator createGenerator(OutputStream out, JsonEncoding enc) throws IOException
{
// false -> we won't manage the stream unless explicitly directed to
- IOContext ctxt = _createContext(out, false);
+ final IOContext ctxt = _createContext(out, false);
ctxt.setEncoding(enc);
return new ToXmlGenerator(ctxt,
_generatorFeatures, _xmlGeneratorFeatures,
- _objectCodec, _createXmlWriter(out));
+ _objectCodec, _createXmlWriter(ctxt, out));
}
@Override
public ToXmlGenerator createGenerator(Writer out) throws IOException
{
- return new ToXmlGenerator(_createContext(out, false),
+ final IOContext ctxt = _createContext(out, false);
+ return new ToXmlGenerator(ctxt,
_generatorFeatures, _xmlGeneratorFeatures,
- _objectCodec, _createXmlWriter(out));
+ _objectCodec, _createXmlWriter(ctxt, out));
}
@SuppressWarnings("resource")
@@ -469,10 +470,10 @@ public class XmlFactory extends JsonFactory
{
OutputStream out = new FileOutputStream(f);
// true -> yes, we have to manage the stream since we created it
- IOContext ctxt = _createContext(out, true);
+ final IOContext ctxt = _createContext(out, true);
ctxt.setEncoding(enc);
return new ToXmlGenerator(ctxt, _generatorFeatures, _xmlGeneratorFeatures,
- _objectCodec, _createXmlWriter(out));
+ _objectCodec, _createXmlWriter(ctxt, out));
}
/*
@@ -580,7 +581,7 @@ public class XmlFactory extends JsonFactory
}
return xp;
}
-
+
@Override
protected FromXmlParser _createParser(byte[] data, int offset, int len, IOContext ctxt) throws IOException
{
@@ -612,22 +613,22 @@ public class XmlFactory extends JsonFactory
/**********************************************************************
*/
- protected XMLStreamWriter _createXmlWriter(OutputStream out) throws IOException
+ protected XMLStreamWriter _createXmlWriter(IOContext ctxt, OutputStream out) throws IOException
{
XMLStreamWriter sw;
try {
- sw = _xmlOutputFactory.createXMLStreamWriter(out, "UTF-8");
+ sw = _xmlOutputFactory.createXMLStreamWriter(_decorate(ctxt, out), "UTF-8");
} catch (XMLStreamException e) {
return StaxUtil.throwAsGenerationException(e, null);
}
return _initializeXmlWriter(sw);
}
- protected XMLStreamWriter _createXmlWriter(Writer w) throws IOException
+ protected XMLStreamWriter _createXmlWriter(IOContext ctxt, Writer w) throws IOException
{
XMLStreamWriter sw;
try {
- sw = _xmlOutputFactory.createXMLStreamWriter(w);
+ sw = _xmlOutputFactory.createXMLStreamWriter(_decorate(ctxt, w));
} catch (XMLStreamException e) {
return StaxUtil.throwAsGenerationException(e, null);
}
@@ -820,4 +821,31 @@ public class XmlFactory extends JsonFactory
}
}
+ /*
+ /**********************************************************
+ /* Decorators, output
+ /**********************************************************
+ */
+
+ protected OutputStream _decorate(IOContext ioCtxt, OutputStream out) throws IOException
+ {
+ if (_outputDecorator != null) {
+ OutputStream out2 = _outputDecorator.decorate(ioCtxt, out);
+ if (out2 != null) {
+ return out2;
+ }
+ }
+ return out;
+ }
+
+ protected Writer _decorate(IOContext ioCtxt, Writer out) throws IOException
+ {
+ if (_outputDecorator != null) {
+ Writer out2 = _outputDecorator.decorate(ioCtxt, out);
+ if (out2 != null) {
+ return out2;
+ }
+ }
+ return out;
+ }
}
View it on GitLab: https://salsa.debian.org/java-team/jackson-dataformat-xml/compare/5e8e24078b22b5446e434a066548ef274778f67a...78bc1f79fd7bec40f6e5bf9b59145b3901f512cf
--
View it on GitLab: https://salsa.debian.org/java-team/jackson-dataformat-xml/compare/5e8e24078b22b5446e434a066548ef274778f67a...78bc1f79fd7bec40f6e5bf9b59145b3901f512cf
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/20190721/144d105d/attachment.html>
More information about the pkg-java-commits
mailing list