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 82c0315a21ecaa36028809d5db8c2adce502fc69 Author: Emmanuel Bourg <[email protected]> Date: Sun Apr 10 00:26:13 2016 +0200 Enabled the OSGi metadata --- debian/changelog | 1 + debian/control | 1 + debian/patches/fix-bundle-dependencies.patch | 20 +++++++++++++++++ debian/patches/fix-using-bundle.diff | 19 ++++++++++++++++ debian/patches/jar-instead-bundle.diff | 33 ---------------------------- debian/patches/series | 3 ++- 6 files changed, 43 insertions(+), 34 deletions(-) diff --git a/debian/changelog b/debian/changelog index 498f2e6..8a3a59b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ jackson-jaxrs-providers (2.7.3-1) UNRELEASED; urgency=medium - Updated the Maven rules - Ignore the new yaml module - Tightened the dependencies on the other Jackson libraries + * Enabled the OSGi metadata * Standards-Version updated to 3.9.8 (no changes) * Use secure Vcs-* URLs diff --git a/debian/control b/debian/control index 9105466..0c9e59c 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends-Indep: libjackson2-dataformat-smile (>= 2.7.3), libjackson2-module-jaxb-annotations-java (>= 2.4), libjsr311-api-java, + libmaven-bundle-plugin-java, Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-java/jackson-jaxrs-providers.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jackson-jaxrs-providers.git diff --git a/debian/patches/fix-bundle-dependencies.patch b/debian/patches/fix-bundle-dependencies.patch new file mode 100644 index 0000000..72a6947 --- /dev/null +++ b/debian/patches/fix-bundle-dependencies.patch @@ -0,0 +1,20 @@ +--- a/smile/pom.xml ++++ b/smile/pom.xml +@@ -34,6 +34,7 @@ + <artifactId>jackson-jaxrs-base</artifactId> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <version>2.7.3</version> ++ <type>bundle</type> + </dependency> + <!-- Extends Jackson core, mapper, and also (sort of optionally) on JAXB annotation handler --> + <dependency> +--- a/json/pom.xml ++++ b/json/pom.xml +@@ -34,6 +34,7 @@ + <artifactId>jackson-jaxrs-base</artifactId> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <version>2.7.3</version> ++ <type>bundle</type> + </dependency> + <!-- Extends Jackson core, mapper, and also (sort of optionally) on JAXB annotation handler --> + <dependency> diff --git a/debian/patches/fix-using-bundle.diff b/debian/patches/fix-using-bundle.diff new file mode 100644 index 0000000..e22e5be --- /dev/null +++ b/debian/patches/fix-using-bundle.diff @@ -0,0 +1,19 @@ +--- a/pom.xml ++++ b/pom.xml +@@ -109,4 +109,16 @@ + </dependency> + + </dependencies> ++ ++ <build> ++ <plugins> ++ <plugin> ++ <groupId>org.apache.felix</groupId> ++ <artifactId>maven-bundle-plugin</artifactId> ++ <version>2.3.5</version> ++ <extensions>true</extensions> ++ </plugin> ++ </plugins> ++ </build> ++ + </project> diff --git a/debian/patches/jar-instead-bundle.diff b/debian/patches/jar-instead-bundle.diff deleted file mode 100644 index 041efe0..0000000 --- a/debian/patches/jar-instead-bundle.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- a/base/pom.xml -+++ b/base/pom.xml -@@ -8,7 +8,7 @@ - </parent> - <artifactId>jackson-jaxrs-base</artifactId> - <name>Jackson-JAXRS-base</name> -- <packaging>bundle</packaging> -+ <packaging>jar</packaging> - <description>Pile of code that is shared by all Jackson-based JAX-RS - providers. - </description> ---- a/json/pom.xml -+++ b/json/pom.xml -@@ -8,7 +8,7 @@ - </parent> - <artifactId>jackson-jaxrs-json-provider</artifactId> - <name>Jackson-JAXRS-JSON</name> -- <packaging>bundle</packaging> -+ <packaging>jar</packaging> - <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> - diff --git a/debian/patches/series b/debian/patches/series index e91f522..3f8fc1e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ force-core-version.diff -jar-instead-bundle.diff +fix-using-bundle.diff +fix-bundle-dependencies.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-jaxrs-providers.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
