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 2021/12/11 19:49:44 UTC
[aries-jax-rs-whiteboard] 01/04: fix examples so they run without errors on versions Java 9+
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit be428ccdfe9f2faf4f85e4b510833d8ff680329e
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Fri Nov 26 16:39:54 2021 -0500
fix examples so they run without errors on versions Java 9+
Signed-off-by: Raymond Auge <ro...@apache.org>
---
jax-rs.example/aries-jaxrs-whiteboard-example.bndrun | 8 +++++++-
jax-rs.example/aries-jaxrs-whiteboard-only.bndrun | 8 +++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
index a5d6736..dc58766 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
@@ -35,10 +35,16 @@
-resolve.effective: resolve, active
--runrequires: \
+java.8.reqs: \
osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.example)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)'
+java.9.plus.reqs: \
+ ${java.8.reqs},\
+ osgi.identity;filter:='(osgi.identity=com.sun.xml.bind.jaxb-osgi)'
+
+-runrequires: ${if;${is;${def;-runee};JavaSE-1.8};${java.8.reqs};${java.9.plus.reqs}}
+
-runsystemcapabilities: ${native_capability}
-runproperties: \
logback.configurationFile=${fileuri;${.}/logback.xml},\
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
index cdfd3aa..aa10e87 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
@@ -35,9 +35,15 @@
-resolve.effective: resolve, active
--runrequires: \
+java.8.reqs: \
osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.whiteboard)'
+java.9.plus.reqs: \
+ ${java.8.reqs},\
+ osgi.identity;filter:='(osgi.identity=com.sun.xml.bind.jaxb-osgi)'
+
+-runrequires: ${if;${is;${def;-runee};JavaSE-1.8};${java.8.reqs};${java.9.plus.reqs}}
+
-runsystemcapabilities: ${native_capability}
-runproperties: \
logback.configurationFile=${fileuri;${.}/logback.xml},\