You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by rm...@apache.org on 2020/01/21 15:02:19 UTC

[johnzon] branch master updated: JOHNZON-301 avoid cdi and jaxrs to be requirements of jsonb modules

This is an automated email from the ASF dual-hosted git repository.

rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git


The following commit(s) were added to refs/heads/master by this push:
     new 413c673  JOHNZON-301 avoid cdi and jaxrs to be requirements of jsonb modules
413c673 is described below

commit 413c67332718c97f43a9e996230d7001e5e19f57
Author: Romain Manni-Bucau <rm...@gmail.com>
AuthorDate: Tue Jan 21 16:02:13 2020 +0100

    JOHNZON-301 avoid cdi and jaxrs to be requirements of jsonb modules
---
 johnzon-jsonb/pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml
index d799524..06be104 100644
--- a/johnzon-jsonb/pom.xml
+++ b/johnzon-jsonb/pom.xml
@@ -116,9 +116,14 @@
               javax.ws.rs.*;resolution:=optional,
               *
             </Import-Package>
-            <Require-Capability> <!-- todo: make JavaCDI and JavaJAXRS optional -->
+            <Require-Capability>
               osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)"
             </Require-Capability>
+            <_contract>
+              !JavaJAXRS,
+              !JavaCDI,
+              *
+            </_contract>
             <Provide-Capability>osgi.serviceloader;osgi.serviceloader=javax.json.bind.spi.JsonbProvider</Provide-Capability>
           </instructions>
         </configuration>