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 fef3a1b86b133f00c4ee0e85e2187aae8bc25aaa Author: Lars Pfannenschmidt <[email protected]> Date: Sat Dec 7 17:56:10 2013 +0100 Enables jackson to use the jax-rs 2.0 api within OSGi --- base/pom.xml | 6 +++--- json/pom.xml | 6 +++--- pom.xml | 5 ++++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/base/pom.xml b/base/pom.xml index a84861e..c2d984d 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -31,9 +31,9 @@ ${project.groupId}.annotation.*;version=${project.version} ,com.fasterxml.jackson.databind.introspect ,com.fasterxml.jackson.databind.type ,com.fasterxml.jackson.databind.util -,javax.ws.rs -,javax.ws.rs.core -,javax.ws.rs.ext +,javax.ws.rs;version="${javax.ws.rs.version}" +,javax.ws.rs.core;version="${javax.ws.rs.version}" +,javax.ws.rs.ext;version="${javax.ws.rs.version}" </osgi.import> </properties> diff --git a/json/pom.xml b/json/pom.xml index 09fb82b..5aa208e 100644 --- a/json/pom.xml +++ b/json/pom.xml @@ -22,9 +22,9 @@ <!-- NOTE: JAXB annotations module is optional dependency, need to try to mark as such here. --> - <osgi.import>javax.ws.rs -,javax.ws.rs.core -,javax.ws.rs.ext + <osgi.import>javax.ws.rs;version="${javax.ws.rs.version}" +,javax.ws.rs.core;version="${javax.ws.rs.version}" +,javax.ws.rs.ext;version="${javax.ws.rs.version}" ,com.fasterxml.jackson.annotation ,com.fasterxml.jackson.core ,com.fasterxml.jackson.core.type diff --git a/pom.xml b/pom.xml index ec2b00d..fbebc64 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,10 @@ <!-- Need Jersey+Jetty for testing --> <version.jersey>1.17.1</version.jersey> - <version.jetty>8.1.10.v20130312</version.jetty> + <version.jetty>8.1.10.v20130312</version.jetty> + + <!-- Needed to enable jax-rs 2.0 usage under OSGi --> + <javax.ws.rs.version>[1.1.1,2.1)</javax.ws.rs.version> </properties> <dependencies> -- 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
