[jackson-jaxrs-providers] 07/10: Build the jackson-jaxrs-xml-provider module

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jackson-jaxrs-providers.

commit 0cad99438ffa43d40be0503c87780dfc4575e124
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 21 14:47:00 2016 +0100

    Build the jackson-jaxrs-xml-provider module
---
 debian/changelog                             |  1 +
 debian/control                               |  2 ++
 debian/libjackson2-jaxrs-providers-java.poms |  2 +-
 debian/maven.ignoreRules                     |  1 -
 debian/maven.publishedRules                  |  1 +
 debian/maven.rules                           |  3 +++
 debian/patches/fix-bundle-dependencies.patch | 10 ++++++++++
 7 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ecffc45..bf238d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ jackson-jaxrs-providers (2.8.5-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - New build dependency on libjaxrs-api-java
+  * Build the jackson-jaxrs-xml-provider module
   * Inherit from the parent POM and simplified the packaging
   * Merged the Build-Depends-Indep field into Build-Depends
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index 14ede32..ca8b323 100644
--- a/debian/control
+++ b/debian/control
@@ -10,11 +10,13 @@ Build-Depends:
  libjackson2-core-java (>= 2.8.5),
  libjackson2-databind-java (>= 2.8.5),
  libjackson2-dataformat-smile (>= 2.7.3),
+ libjackson2-dataformat-xml-java (>= 2.8.5),
  libjackson2-module-jaxb-annotations-java (>= 2.4),
  libjaxrs-api-java,
  libjsr311-api-java,
  libmaven-bundle-plugin-java,
  libreplacer-java,
+ libwoodstox-java,
  maven-debian-helper (>= 1.5),
  xmlstarlet
 Standards-Version: 3.9.8
diff --git a/debian/libjackson2-jaxrs-providers-java.poms b/debian/libjackson2-jaxrs-providers-java.poms
index 70e77ce..8f430a6 100644
--- a/debian/libjackson2-jaxrs-providers-java.poms
+++ b/debian/libjackson2-jaxrs-providers-java.poms
@@ -30,5 +30,5 @@ base/pom.xml --has-package-version --java-lib
 cbor/pom.xml --ignore
 json/pom.xml --has-package-version --java-lib
 smile/pom.xml --has-package-version --java-lib
-xml/pom.xml --ignore
+xml/pom.xml --has-package-version --java-lib
 yaml/pom.xml --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 43051e2..946c00c 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,6 +1,5 @@
 
 com.fasterxml.jackson.jaxrs jackson-jaxrs-cbor-provider bundle * * *
-com.fasterxml.jackson.jaxrs jackson-jaxrs-xml-provider bundle * * *
 com.sun.jersey jersey-core * * * *
 com.sun.jersey jersey-server * * * *
 com.sun.jersey jersey-servlet * * * *
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
index c85023a..5445089 100644
--- a/debian/maven.publishedRules
+++ b/debian/maven.publishedRules
@@ -3,3 +3,4 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-providers pom s/2\..*/2.x/ * *
 com.fasterxml.jackson.jaxrs jackson-jaxrs-base * s/2\..*/2.x/ * *
 com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider * s/2\..*/2.x/ * *
 com.fasterxml.jackson.jaxrs jackson-jaxrs-smile-provider * s/2\..*/2.x/ * *
+com.fasterxml.jackson.jaxrs jackson-jaxrs-xml-provider * s/2\..*/2.x/ * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 923e194..927951d 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -3,9 +3,12 @@ com.fasterxml.jackson jackson-parent pom s/.*/debian/ * *
 com.fasterxml.jackson.jaxrs jackson-jaxrs-base * s/.*/2.x/ * *
 com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider * s/.*/2.x/ * *
 com.fasterxml.jackson.jaxrs jackson-jaxrs-smile-provider * s/.*/2.x/ * *
+com.fasterxml.jackson.jaxrs jackson-jaxrs-xml-provider * s/.*/2.x/ * *
 com.fasterxml.jackson.jaxrs jackson-jaxrs-providers pom s/.*/2.x/ * *
 com.fasterxml.jackson.core jackson-core * s/.*/2.x/ * *
 com.fasterxml.jackson.core jackson-databind * s/.*/2.x/ * *
 com.fasterxml.jackson.module jackson-module-jaxb-annotations * s/.*/2.x/ * *
 com.fasterxml.jackson.dataformat jackson-dataformat-smile * s/.*/2.x/ * *
+com.fasterxml.jackson.dataformat jackson-dataformat-xml * s/.*/2.x/ * *
 junit junit * s/.*/4.x/ * *
+org.codehaus.woodstox s/woodstox-core-asl/woodstox-core-lgpl/ * s/.*/debian/ * *
diff --git a/debian/patches/fix-bundle-dependencies.patch b/debian/patches/fix-bundle-dependencies.patch
index 392debb..8a35a26 100644
--- a/debian/patches/fix-bundle-dependencies.patch
+++ b/debian/patches/fix-bundle-dependencies.patch
@@ -32,3 +32,13 @@
      </dependency>
      <dependency>
        <groupId>com.fasterxml.jackson.core</groupId>
+--- a/xml/pom.xml
++++ b/xml/pom.xml
+@@ -33,6 +33,7 @@
+       <artifactId>jackson-jaxrs-base</artifactId>
+       <groupId>${project.groupId}</groupId>
+       <version>${project.version}</version>
++      <type>bundle</type>
+     </dependency>
+     <!-- Extends Jackson core, mapper, and also (sort of optionally) on JAXB annotation handler -->
+     <dependency>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-jaxrs-providers.git