[jackson-jaxrs-providers] 09/10: Build the jackson-jaxrs-yaml-provider module
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Dec 21 14:08:58 UTC 2016
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 397a258013bb5eecd8b1e7ad86bb96488f8697a9
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Dec 21 14:59:34 2016 +0100
Build the jackson-jaxrs-yaml-provider module
---
debian/changelog | 2 +-
debian/control | 1 +
debian/libjackson2-jaxrs-providers-java.poms | 2 +-
debian/maven.publishedRules | 1 +
debian/maven.rules | 2 ++
debian/patches/fix-bundle-dependencies.patch | 25 +++++++++++++++++++++++++
6 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 83a61fb..4bfa457 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-{cbor,xml}-provider modules
+ * Build the jackson-jaxrs-{cbor,xml,yaml}-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 fb6d90b..f6357a1 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends:
libjackson2-dataformat-cbor (>= 2.7.3),
libjackson2-dataformat-smile (>= 2.7.3),
libjackson2-dataformat-xml-java (>= 2.8.5),
+ libjackson2-dataformat-yaml (>= 2.8.5),
libjackson2-module-jaxb-annotations-java (>= 2.4),
libjaxrs-api-java,
libjsr311-api-java,
diff --git a/debian/libjackson2-jaxrs-providers-java.poms b/debian/libjackson2-jaxrs-providers-java.poms
index 9aa6067..bd82a4d 100644
--- a/debian/libjackson2-jaxrs-providers-java.poms
+++ b/debian/libjackson2-jaxrs-providers-java.poms
@@ -31,4 +31,4 @@ 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
-yaml/pom.xml --ignore
+yaml/pom.xml --has-package-version --java-lib
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
index bb1f616..e641419 100644
--- a/debian/maven.publishedRules
+++ b/debian/maven.publishedRules
@@ -5,3 +5,4 @@ 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/ * *
+com.fasterxml.jackson.jaxrs jackson-jaxrs-yaml-provider * s/2\..*/2.x/ * *
diff --git a/debian/maven.rules b/debian/maven.rules
index e02f8fe..b9e3828 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -5,6 +5,7 @@ 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/ * *
+com.fasterxml.jackson.jaxrs jackson-jaxrs-yaml-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/ * *
@@ -12,5 +13,6 @@ 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/ * *
+com.fasterxml.jackson.dataformat jackson-dataformat-yaml * 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 f9e9f03..9ae8c0b 100644
--- a/debian/patches/fix-bundle-dependencies.patch
+++ b/debian/patches/fix-bundle-dependencies.patch
@@ -52,3 +52,28 @@
</dependency>
<!-- Extends Jackson core, mapper, and also (sort of optionally) on JAXB annotation handler -->
<dependency>
+--- a/yaml/pom.xml
++++ b/yaml/pom.xml
+@@ -35,6 +35,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>
+@@ -64,12 +65,14 @@
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>${project.version}</version>
++ <type>bundle</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-smile-provider</artifactId>
+ <version>${project.version}</version>
++ <type>bundle</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
--
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