[jackson-dataformat-xml] 01/01: Import Debian patch 2.8.5-1
Markus Koschany
apo at moszumanska.debian.org
Sun Dec 18 01:11:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository jackson-dataformat-xml.
commit 6318bc94d6dac6ddb30d2756607b1d5c5e8cd143
Merge: f35f971 73de5fd
Author: Markus Koschany <apo at debian.org>
Date: Sun Dec 18 00:45:26 2016 +0100
Import Debian patch 2.8.5-1
.github/ISSUE_TEMPLATE.md | 6 +
debian/changelog | 13 ++
debian/compat | 2 +-
debian/control | 11 +-
debian/copyright | 4 +-
debian/libjackson2-dataformat-xml-java-doc.install | 1 -
debian/maven.ignoreRules | 1 +
debian/patches/fix-bundle-build.patch | 6 +-
debian/patches/fix-wrong-parameters.patch | 6 +-
.../jackson-annotations-dependency-version.patch | 20 +++
debian/patches/series | 1 +
debian/rules | 2 +-
pom.xml | 22 +--
release-notes/VERSION | 36 ++++-
.../jackson/dataformat/xml/JacksonXmlModule.java | 2 +-
.../jackson/dataformat/xml/XmlFactory.java | 2 +
.../jackson/dataformat/xml/XmlMapper.java | 8 +-
.../dataformat/xml/XmlTypeResolverBuilder.java | 17 +--
.../dataformat/xml/deser/FromXmlParser.java | 25 +++-
.../dataformat/xml/deser/XmlTokenStream.java | 48 ++++++-
.../jackson/dataformat/xml/ser/ToXmlGenerator.java | 40 +++---
.../xml/ser/UnwrappingXmlBeanSerializer.java | 11 +-
.../dataformat/xml/ser/XmlBeanSerializer.java | 7 +-
.../dataformat/xml/ser/XmlBeanSerializerBase.java | 3 +-
.../dataformat/xml/ser/XmlSerializerProvider.java | 17 ++-
.../xml/failing/EmptyListDeser124Test.java | 30 ++++
.../xml/failing/SupportDTDDefaultsTest.java | 23 +++
.../xml/failing/TestUnwrappedDeserIssue86.java | 4 +
.../jackson/dataformat/xml/misc/RootNameTest.java | 83 +++++++++++
.../dataformat/xml/misc/UnwrappingWithXMLTest.java | 2 +-
.../jackson/dataformat/xml/misc/XmlTextTest.java | 54 ++++++-
.../dataformat/xml/ser/TestSerialization.java | 78 ++--------
.../xml/stream/XmlParserNextXxxTest.java | 55 +++++++
.../dataformat/xml/stream/XmlParserTest.java | 160 +++++++++++----------
34 files changed, 558 insertions(+), 242 deletions(-)
diff --cc debian/changelog
index 6919019,0000000..48a27cc
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,0 +1,37 @@@
++jackson-dataformat-xml (2.8.5-1) unstable; urgency=medium
++
++ * New upstream version 2.8.5.
++ * debian/copyright: Remove Files-Excluded paragraph.
++ The copyright issue was clarified by upstream.
++ * Update my email address.
++ * Switch to compat level 10.
++ * debian/control: Use only Build-Depends field.
++ * Add jackson-annotations-dependency-version.patch and fix a FTBFS due to a
++ missing version of jackson-annotations in pom.xml.
++
++ -- Markus Koschany <apo at debian.org> Sun, 18 Dec 2016 00:45:26 +0100
++
+jackson-dataformat-xml (2.7.4-1) unstable; urgency=high
+
+ * Team upload.
+ * New upstream release
+ - Fixes CVE-2016-3720: XXE vulnerability in XmlMapper (Closes: #823703)
+
+ -- Emmanuel Bourg <ebourg at apache.org> Sat, 07 May 2016 23:38:14 +0200
+
+jackson-dataformat-xml (2.7.3-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ - Refreshed the patches
+ - Updated the Maven rules
+ * Standards-Version updated to 3.9.8 (no changes)
+ * Use a secure Vcs-Git URL
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 08 Apr 2016 17:28:38 +0200
+
+jackson-dataformat-xml (2.5.3+dfsg-1) unstable; urgency=medium
+
+ * Initial release. (Closes: #785131)
+
+ -- Markus Koschany <apo at gambaru.de> Sat, 23 May 2015 13:24:23 +0200
diff --cc debian/compat
index ec63514,0000000..f599e28
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 9
++10
diff --cc debian/control
index f6ea068,0000000..55953cf
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,57 -1,0 +1,56 @@@
+Source: jackson-dataformat-xml
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders:
+ Markus Koschany <apo at debian.org>
+Build-Depends:
- debhelper (>= 9),
++ debhelper (>= 10),
+ default-jdk,
- maven-debian-helper (>= 1.5),
- xmlstarlet
- Build-Depends-Indep:
+ default-jdk-doc,
+ libjackson2-annotations-java,
+ libjackson2-annotations-java-doc,
+ libjackson2-core-java,
+ libjackson2-core-java-doc,
+ libjackson2-databind-java,
+ libjackson2-databind-java-doc,
+ libjackson2-module-jaxb-annotations-java,
- libmaven-javadoc-plugin-java,
+ libmaven-bundle-plugin-java,
- libstax2-api-java (>= 3.1.1)
++ libmaven-javadoc-plugin-java,
++ libstax2-api-java (>= 3.1.1),
++ maven-debian-helper (>= 1.5),
++ xmlstarlet
+Standards-Version: 3.9.8
+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
+Homepage: http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding
+
+Package: libjackson2-dataformat-xml-java
+Architecture: all
+Depends:
+ ${maven:Depends},
+ ${misc:Depends}
+Suggests:
+ libjackson2-dataformat-xml-java-doc,
+ ${maven:OptionalDepends}
+Description: fast and powerful JSON library for Java -- XML dataformat
+ Data format extension for Jackson to offer alternative support for serializing
+ POJOs (Plain Old Java Objects) as XML and deserializing XML as POJOs. Support
+ was implemented on top of Stax API (javax.xml.stream) by implementing core
+ Jackson Streaming API types like JsonGenerator, JsonParser and JsonFactory.
+
+Package: libjackson2-dataformat-xml-java-doc
+Architecture: all
+Section: doc
+Depends:
+ ${misc:Depends}
+Recommends:
+ ${maven:DocDepends},
+ ${maven:DocOptionalDepends}
+Suggests:
+ libjackson2-dataformat-xml-java
+Description: Documentation for Jackson-dataformat-XML
+ Data format extension for Jackson to offer alternative support for serializing
+ POJOs as XML and deserializing XML as POJOs.
+ .
+ This package contains the API documentation of libjackson2-dataformat-xml-java.
diff --cc debian/copyright
index 77c8640,0000000..6200482
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,20 -1,0 +1,18 @@@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Jackson-dataformat-XML
+Source: http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding
- Files-Excluded:
- src/test/java/com/fasterxml/jackson/dataformat/xml/failing/Issue97Test.java
+
+Files: *
+Copyright: 2015-2016, FasterXML, LLC, Seattle, USA <info at fasterxml.com>
+License: Apache-2.0
+Comment:
+ See src/main/resources/META-INF/LICENSE and
+ http://wiki.fasterxml.com/JacksonLicensing
+
+Files: debian/*
- Copyright: 2015, Markus Koschany <apo at debian.org>
++Copyright: 2015-2016, Markus Koschany <apo at debian.org>
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian systems, the full text of the Apache-2.0 license
+ can be found in the file '/usr/share/common-licenses/Apache-2.0'
diff --cc debian/libjackson2-dataformat-xml-java-doc.install
index d4d2be6,0000000..86838b7
mode 100644,000000..100644
--- a/debian/libjackson2-dataformat-xml-java-doc.install
+++ b/debian/libjackson2-dataformat-xml-java-doc.install
@@@ -1,2 -1,0 +1,1 @@@
-
+target/apidocs/* usr/share/doc/libjackson2-dataformat-xml-java/api
diff --cc debian/maven.ignoreRules
index 8d90588,0000000..e7a7cf2
mode 100644,000000..100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@@ -1,4 -1,0 +1,5 @@@
+
+com.google.code.maven-replacer-plugin replacer * * * *
+javax.xml.stream stax-api * * * *
+com.fasterxml.woodstox woodstox-core * * * *
++junit junit * * * *
diff --cc debian/patches/fix-bundle-build.patch
index 18d2c04,0000000..741e755
mode 100644,000000..100644
--- a/debian/patches/fix-bundle-build.patch
+++ b/debian/patches/fix-bundle-build.patch
@@@ -1,23 -1,0 +1,25 @@@
- From: Markus Koschany <apo at gambaru.de>
++From: Markus Koschany <apo at debian.org>
+Date: Mon, 11 May 2015 15:00:53 +0200
+Subject: fix bundle build
+
+---
+ pom.xml | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
++diff --git a/pom.xml b/pom.xml
++index e7b35dc..79147fd 100644
+--- a/pom.xml
++++ b/pom.xml
- @@ -122,6 +122,12 @@
++@@ -126,6 +126,12 @@ Some data-binding types overridden as well (ObjectMapper sub-classed as XmlMappe
+ </includes>
+ </configuration>
+ </plugin>
++ <plugin>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
++ <version>2.3.5</version>
++ <extensions>true</extensions>
++ </plugin>
+ </plugins>
+ </build>
+
diff --cc debian/patches/fix-wrong-parameters.patch
index 46d0c80,0000000..03b68bb
mode 100644,000000..100644
--- a/debian/patches/fix-wrong-parameters.patch
+++ b/debian/patches/fix-wrong-parameters.patch
@@@ -1,19 -1,0 +1,21 @@@
- From: Markus Koschany <apo at gambaru.de>
++From: Markus Koschany <apo at debian.org>
+Date: Tue, 12 May 2015 00:02:26 +0200
+Subject: fix wrong parameters
+
+---
+ .../com/fasterxml/jackson/dataformat/xml/ser/XmlBeanPropertyWriter.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
++diff --git a/src/main/java/com/fasterxml/jackson/dataformat/xml/ser/XmlBeanPropertyWriter.java b/src/main/java/com/fasterxml/jackson/dataformat/xml/ser/XmlBeanPropertyWriter.java
++index 8d2301e..7393812 100644
+--- a/src/main/java/com/fasterxml/jackson/dataformat/xml/ser/XmlBeanPropertyWriter.java
++++ b/src/main/java/com/fasterxml/jackson/dataformat/xml/ser/XmlBeanPropertyWriter.java
- @@ -119,7 +119,7 @@
++@@ -119,7 +119,7 @@ public class XmlBeanPropertyWriter
+ // and then see if we must suppress certain values (default, empty)
+ if (_suppressableValue != null) {
+ if (MARKER_FOR_EMPTY == _suppressableValue) {
+- if (ser.isEmpty(prov, value)) {
++ if (ser.isEmpty(value)) {
+ return;
+ }
+ } else if (_suppressableValue.equals(value)) {
diff --cc debian/patches/jackson-annotations-dependency-version.patch
index 0000000,0000000..410d39a
new file mode 100644
--- /dev/null
+++ b/debian/patches/jackson-annotations-dependency-version.patch
@@@ -1,0 -1,0 +1,20 @@@
++From: Markus Koschany <apo at debian.org>
++Date: Sun, 18 Dec 2016 01:39:29 +0100
++Subject: jackson annotations dependency version
++
++---
++ pom.xml | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/pom.xml b/pom.xml
++index 79147fd..d6d615d 100644
++--- a/pom.xml
+++++ b/pom.xml
++@@ -46,6 +46,7 @@ Some data-binding types overridden as well (ObjectMapper sub-classed as XmlMappe
++ <dependency>
++ <groupId>com.fasterxml.jackson.core</groupId>
++ <artifactId>jackson-annotations</artifactId>
+++ <version>2.8.5</version>
++ </dependency>
++ <dependency>
++ <groupId>com.fasterxml.jackson.core</groupId>
diff --cc debian/patches/series
index 404e708,0000000..47dbb92
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
+fix-bundle-build.patch
+fix-wrong-parameters.patch
++jackson-annotations-dependency-version.patch
diff --cc debian/rules
index 38ce494,0000000..428eda4
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,20 -1,0 +1,20 @@@
+#!/usr/bin/make -f
+export JAVA_HOME=/usr/lib/jvm/default-java
+VERSION_FILE=src/main/java/com/fasterxml/jackson/dataformat/xml/PackageVersion.java
+
+%:
- dh $@ --parallel --buildsystem=maven
++ dh $@ --buildsystem=maven
+
+override_dh_auto_configure:
+ sh debian/replace-generate.sh $(VERSION_FILE)
+ dh_auto_configure
+
+override_dh_auto_clean:
+ rm -f $(VERSION_FILE)
+ dh_auto_clean
+
+override_dh_installchangelogs:
+ dh_installchangelogs release-notes/VERSION
+
+get-orig-source:
+ uscan --download-current-version --force-download --repack
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-dataformat-xml.git
More information about the pkg-java-commits
mailing list