You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2018/08/17 16:05:39 UTC
[2/5] aries-jax-rs-whiteboard git commit: some cleanup
some cleanup
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/f29dcb53
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/f29dcb53
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/f29dcb53
Branch: refs/heads/apply.slm
Commit: f29dcb53ac3c24989e2cf97c8d4ce00203aa41f0
Parents: a88136a
Author: Raymond Auge <ro...@apache.org>
Authored: Fri Aug 17 10:23:45 2018 -0400
Committer: Raymond Auge <ro...@apache.org>
Committed: Fri Aug 17 11:58:04 2018 -0400
----------------------------------------------------------------------
jax-rs.itests/bnd.bnd | 2 --
jax-rs.whiteboard/bnd.bnd | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f29dcb53/jax-rs.itests/bnd.bnd
----------------------------------------------------------------------
diff --git a/jax-rs.itests/bnd.bnd b/jax-rs.itests/bnd.bnd
index dcb1245..589cfef 100644
--- a/jax-rs.itests/bnd.bnd
+++ b/jax-rs.itests/bnd.bnd
@@ -22,5 +22,3 @@ Test-Cases: \
${classes;CONCRETE;ANNOTATED;org.junit.Test}
-contract: JavaJAXRS
-
-Require-Capability: osgi.service;filter:="(objectClass=org.osgi.service.cm.ConfigurationAdmin)"
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f29dcb53/jax-rs.whiteboard/bnd.bnd
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/bnd.bnd b/jax-rs.whiteboard/bnd.bnd
index 38e940d..edfa076 100644
--- a/jax-rs.whiteboard/bnd.bnd
+++ b/jax-rs.whiteboard/bnd.bnd
@@ -70,12 +70,12 @@ Import-Package:\
!org.springframework.*,\
*
--contract: JavaAnnotation, JavaJAXRS, JavaServlet
+-contract: *
-exportcontents: org.apache.aries.jax.rs.whiteboard
-includeresource:\
- lib/component-dsl.jar=org.apache.aries.component-dsl.component-dsl-*.jar;lib:=true,\
+ lib/component-dsl.jar=org.apache.aries.component-dsl.component-dsl-*.jar;lib:=true,\
lib/cxf-core.jar=cxf-core-*.jar;lib:=true,\
lib/cxf-rt-frontend-jaxrs.jar=cxf-rt-frontend-jaxrs-*.jar;lib:=true,\
lib/cxf-rt-rs-client.jar=cxf-rt-rs-client-*.jar;lib:=true,\