[jackson-jaxrs-providers] 08/10: Build the jackson-jaxrs-cbor-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 f9c6be7cc7ac1be1ccf5f312a0aaf8241b311de9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 21 14:53:32 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index bf238d8..83a61fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +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
+  * Build the jackson-jaxrs-{cbor,xml}-provider modules
   * 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 ca8b323..fb6d90b 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends:
  libbuild-helper-maven-plugin-java,
  libjackson2-core-java (>= 2.8.5),
  libjackson2-databind-java (>= 2.8.5),
+ libjackson2-dataformat-cbor (>= 2.7.3),
  libjackson2-dataformat-smile (>= 2.7.3),
  libjackson2-dataformat-xml-java (>= 2.8.5),
  libjackson2-module-jaxb-annotations-java (>= 2.4),
diff --git a/debian/libjackson2-jaxrs-providers-java.poms b/debian/libjackson2-jaxrs-providers-java.poms
index 8f430a6..9aa6067 100644
--- a/debian/libjackson2-jaxrs-providers-java.poms
+++ b/debian/libjackson2-jaxrs-providers-java.poms
@@ -27,7 +27,7 @@
 #
 pom.xml --has-package-version
 base/pom.xml --has-package-version --java-lib
-cbor/pom.xml --ignore
+cbor/pom.xml --has-package-version --java-lib
 json/pom.xml --has-package-version --java-lib
 smile/pom.xml --has-package-version --java-lib
 xml/pom.xml --has-package-version --java-lib
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 946c00c..c55af96 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,5 +1,4 @@
 
-com.fasterxml.jackson.jaxrs jackson-jaxrs-cbor-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 5445089..bb1f616 100644
--- a/debian/maven.publishedRules
+++ b/debian/maven.publishedRules
@@ -1,6 +1,7 @@
 
 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-cbor-provider * 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 927951d..e02f8fe 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,6 +1,7 @@
 
 com.fasterxml.jackson jackson-parent pom s/.*/debian/ * *
 com.fasterxml.jackson.jaxrs jackson-jaxrs-base * s/.*/2.x/ * *
+com.fasterxml.jackson.jaxrs jackson-jaxrs-cbor-provider * 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/ * *
@@ -8,6 +9,7 @@ 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-cbor * 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/ * *
diff --git a/debian/patches/fix-bundle-dependencies.patch b/debian/patches/fix-bundle-dependencies.patch
index 8a35a26..f9e9f03 100644
--- a/debian/patches/fix-bundle-dependencies.patch
+++ b/debian/patches/fix-bundle-dependencies.patch
@@ -42,3 +42,13 @@
      </dependency>
      <!-- Extends Jackson core, mapper, and also (sort of optionally) on JAXB annotation handler -->
      <dependency>
+--- a/cbor/pom.xml
++++ b/cbor/pom.xml
+@@ -34,6 +34,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