[jackson-jaxrs-providers] 05/05: enable smile provider

Timo Aaltonen tjaalton at moszumanska.debian.org
Tue Sep 9 10:33:08 UTC 2014 

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

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

commit 376ab24f69eae9e551e2094c15b4212e07933eb6
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Tue Sep 9 13:20:59 2014 +0300

    enable smile provider
---
 debian/control                               | 11 ++++----
 debian/libjackson2-jaxrs-providers-java.poms |  2 +-
 debian/maven.ignoreRules                     |  1 -
 debian/maven.publishedRules                  |  1 +
 debian/maven.rules                           |  2 ++
 debian/patches/force-core-version.diff       | 39 ++++++++++++++++++++++++++++
 debian/patches/jar-instead-bundle.diff       | 11 ++++++++
 7 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 945cf4f..4bae77d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5),
 Build-Depends-Indep:
  libjackson2-core-java (>= 2.4.2),
  libjackson2-databind-java (>= 2.4.2),
+ libjackson2-dataformat-smile (>= 2.4.2),
  libjackson2-parent-java (>= 2.4),
  libjackson2-module-jaxb-annotations-java (>= 2.4),
  libjsr311-api-java,
@@ -24,9 +25,9 @@ Description: Jackson JAX-RS providers
  This is a multi-module project that contains Jackson-based JAX-RS providers for
  following data formats:
  .
- * JSON (https://github.com/FasterXML/jackson-core)
- * Smile (https://github.com/FasterXML/jackson-dataformat-smile)
- * XML (https://github.com/FasterXML/jackson-dataformat-xml)
- * CBOR (https://github.com/FasterXML/jackson-dataformat-cbor)
+   * JSON (https://github.com/FasterXML/jackson-core)
+   * Smile (https://github.com/FasterXML/jackson-dataformat-smile)
+   * XML (https://github.com/FasterXML/jackson-dataformat-xml)
+   * CBOR (https://github.com/FasterXML/jackson-dataformat-cbor)
  .
- Only JSON is enabled at this time.
+ Only JSON and Smile providers are built in this package for now.
diff --git a/debian/libjackson2-jaxrs-providers-java.poms b/debian/libjackson2-jaxrs-providers-java.poms
index 284ba10..4659549 100644
--- a/debian/libjackson2-jaxrs-providers-java.poms
+++ b/debian/libjackson2-jaxrs-providers-java.poms
@@ -29,5 +29,5 @@ pom.xml --has-package-version
 base/pom.xml --has-package-version
 cbor/pom.xml --ignore
 json/pom.xml --has-package-version
-smile/pom.xml --ignore
+smile/pom.xml --has-package-version
 xml/pom.xml --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 156dd9e..f96b231 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-smile-provider bundle * * *
 com.fasterxml.jackson.jaxrs jackson-jaxrs-xml-provider bundle * * *
 com.google.code.maven-replacer-plugin replacer * * * *
 com.sun.jersey jersey-core * * * *
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
index cf672d5..c85023a 100644
--- a/debian/maven.publishedRules
+++ b/debian/maven.publishedRules
@@ -2,3 +2,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/ * *
diff --git a/debian/maven.rules b/debian/maven.rules
index c162a69..f8b998c 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -2,7 +2,9 @@
 com.fasterxml.jackson jackson-parent 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-providers pom s/2\..*/2.x/ * *
 com.fasterxml.jackson.core jackson-core * s/2\..*/2.x/ * *
 com.fasterxml.jackson.core jackson-databind * s/2\..*/2.x/ * *
 com.fasterxml.jackson.module jackson-module-jaxb-annotations * s/2\..*/2.x/ * *
+com.fasterxml.jackson.dataformat jackson-dataformat-smile * s/2\..*/2.x/ * *
diff --git a/debian/patches/force-core-version.diff b/debian/patches/force-core-version.diff
index 15e571b..bada909 100644
--- a/debian/patches/force-core-version.diff
+++ b/debian/patches/force-core-version.diff
@@ -48,3 +48,42 @@
      </dependency>
  
      <!-- test deps should mostly come from parent, including jersey -->
+--- a/smile/pom.xml
++++ b/smile/pom.xml
+@@ -42,30 +42,30 @@
+     <!-- builds on shared base JAX-RS handling code... -->
+     <dependency>
+       <artifactId>jackson-jaxrs-base</artifactId>
+-      <groupId>${project.groupId}</groupId>
+-      <version>${project.version}</version>
++      <groupId>com.fasterxml.jackson.jaxrs</groupId>
++      <version>2.4.2</version>
+     </dependency>
+     <!-- Extends Jackson core, mapper, and also (sort of optionally) on JAXB annotation handler -->
+     <dependency>
+       <groupId>com.fasterxml.jackson.core</groupId>
+       <artifactId>jackson-core</artifactId>
+-      <version>${version.jackson.core}</version>
++      <version>2.4.2</version>
+     </dependency>
+     <dependency>
+       <groupId>com.fasterxml.jackson.core</groupId>
+       <artifactId>jackson-databind</artifactId>
+-      <version>${version.jackson.core}</version>
++      <version>2.4.2</version>
+     </dependency>
+     <dependency>
+       <groupId>com.fasterxml.jackson.dataformat</groupId>
+       <artifactId>jackson-dataformat-smile</artifactId>
+-      <version>${version.jackson.smile}</version>
++      <version>2.4.2</version>
+     </dependency>
+     <!-- may also need JAXB annotation support -->
+     <dependency> 
+       <groupId>com.fasterxml.jackson.module</groupId>
+       <artifactId>jackson-module-jaxb-annotations</artifactId>
+-      <version>${version.jackson.jaxb}</version>
++      <version>2.4.2</version>
+     </dependency>
+   </dependencies>
+   <build>
diff --git a/debian/patches/jar-instead-bundle.diff b/debian/patches/jar-instead-bundle.diff
index 6a1af25..041efe0 100644
--- a/debian/patches/jar-instead-bundle.diff
+++ b/debian/patches/jar-instead-bundle.diff
@@ -20,3 +20,14 @@
    <description>Functionality to handle JSON input/output for JAX-RS implementations (like Jersey and RESTeasy) using standard Jackson data binding.
    </description>
  
+--- a/smile/pom.xml
++++ b/smile/pom.xml
+@@ -8,7 +8,7 @@
+   </parent>
+   <artifactId>jackson-jaxrs-smile-provider</artifactId>
+   <name>Jackson-JAXRS-Smile</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+   <description>Functionality to handle Smile (binary JSON) input/output for JAX-RS implementations (like Jersey and RESTeasy) using standard Jackson data binding.
+   </description>
+ 

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

More information about the pkg-java-commits mailing list