You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jb...@apache.org on 2020/11/26 17:44:06 UTC
[aries-cdi] branch master updated: Improvide Karaf features
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git
The following commit(s) were added to refs/heads/master by this push:
new dea3060 Improvide Karaf features
dea3060 is described below
commit dea3060da67881cb31bb8f3a263988aa3784f3b6
Author: jbonofre <jb...@apache.org>
AuthorDate: Thu Nov 26 18:43:53 2020 +0100
Improvide Karaf features
---
cdi-executable/owb-executable.bndrun | 8 ++++----
cdi-executable/weld-executable.bndrun | 10 ++++++----
cdi-itests/owb-itest.bndrun | 25 +++++++++++++++----------
cdi-itests/weld-itest.bndrun | 25 +++++++++++++++----------
karaf/src/main/resources/feature.xml | 13 ++++++++-----
5 files changed, 48 insertions(+), 33 deletions(-)
diff --git a/cdi-executable/owb-executable.bndrun b/cdi-executable/owb-executable.bndrun
index 6da9958..4174b28 100644
--- a/cdi-executable/owb-executable.bndrun
+++ b/cdi-executable/owb-executable.bndrun
@@ -23,10 +23,10 @@
-runbundles: \
openwebbeans-impl;version='[2.0.13,2.0.14)',\
openwebbeans-spi;version='[2.0.13,2.0.14)',\
- org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.owb;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extender;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.extension.spi;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.owb;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.spi;version='[1.1.3,1.1.4)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
org.apache.felix.configadmin;version='[1.9.10,1.9.11)',\
org.apache.felix.converter;version='[1.0.12,1.0.13)',\
diff --git a/cdi-executable/weld-executable.bndrun b/cdi-executable/weld-executable.bndrun
index eab0c6a..b16a8be 100644
--- a/cdi-executable/weld-executable.bndrun
+++ b/cdi-executable/weld-executable.bndrun
@@ -22,11 +22,12 @@
osgi.identity;filter:='(osgi.identity=*owb*)'
-runbundles: \
+ jakarta.xml.soap-api;version='[1.4.1,1.4.2)',\
jboss-classfilewriter;version='[1.2.4,1.2.5)',\
- org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.weld;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extender;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.extension.spi;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.spi;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.weld;version='[1.1.3,1.1.4)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
org.apache.felix.configadmin;version='[1.9.10,1.9.11)',\
org.apache.felix.converter;version='[1.0.12,1.0.13)',\
@@ -34,6 +35,7 @@
org.apache.felix.gogo.runtime;version='[1.1.2,1.1.3)',\
org.apache.felix.gogo.shell;version='[1.1.2,1.1.3)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
+ org.apache.geronimo.specs.geronimo-activation_1.1_spec;version='[1.1.0,1.1.1)',\
org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.3.0,1.3.1)',\
org.apache.geronimo.specs.geronimo-atinject_1.0_spec;version='[1.1.0,1.1.1)',\
org.apache.geronimo.specs.geronimo-el_2.2_spec;version='[1.1.0,1.1.1)',\
diff --git a/cdi-itests/owb-itest.bndrun b/cdi-itests/owb-itest.bndrun
index 8457665..276e4a9 100644
--- a/cdi-itests/owb-itest.bndrun
+++ b/cdi-itests/owb-itest.bndrun
@@ -19,21 +19,25 @@
-runblacklist: \
osgi.identity;filter:='(osgi.identity=*weld*)'
-runbundles: \
+ assertj-core;version='[3.16.1,3.16.2)',\
biz.aQute.junit;version='[5.1.0,5.1.1)',\
+ jakarta.xml.bind-api;version='[2.3.2,2.3.3)',\
+ jakarta.xml.soap-api;version='[1.4.1,1.4.2)',\
+ jakarta.xml.ws-api;version='[2.3.2,2.3.3)',\
javax.servlet.jsp-api;version='[2.3.3,2.3.4)',\
openwebbeans-impl;version='[2.0.13,2.0.14)',\
openwebbeans-spi;version='[2.0.13,2.0.14)',\
openwebbeans-web;version='[2.0.13,2.0.14)',\
- org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.extension.jaxrs;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.extension.jndi;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.extension.servlet.common;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.extension.servlet.owb;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.extra;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.itests;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.owb;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extender;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.extension.jaxrs;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.extension.jndi;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.extension.servlet.common;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.extension.servlet.owb;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.extension.spi;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.extra;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.itests;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.owb;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.spi;version='[1.1.3,1.1.4)',\
org.apache.aries.jax.rs.whiteboard;version='[1.0.6,1.0.7)',\
org.apache.aries.jndi.api;version='[1.1.0,1.1.1)',\
org.apache.aries.jndi.core;version='[1.0.2,1.0.3)',\
@@ -47,6 +51,7 @@
org.apache.felix.gogo.shell;version='[1.1.2,1.1.3)',\
org.apache.felix.http.jetty;version='[4.0.14,4.0.15)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
+ org.apache.geronimo.specs.geronimo-activation_1.1_spec;version='[1.1.0,1.1.1)',\
org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.3.0,1.3.1)',\
org.apache.geronimo.specs.geronimo-atinject_1.0_spec;version='[1.1.0,1.1.1)',\
org.apache.geronimo.specs.geronimo-el_2.2_spec;version='[1.1.0,1.1.1)',\
diff --git a/cdi-itests/weld-itest.bndrun b/cdi-itests/weld-itest.bndrun
index 9fcb296..3d4d948 100644
--- a/cdi-itests/weld-itest.bndrun
+++ b/cdi-itests/weld-itest.bndrun
@@ -20,18 +20,22 @@
-runblacklist: \
osgi.identity;filter:='(osgi.identity=*owb*)'
-runbundles: \
+ assertj-core;version='[3.16.1,3.16.2)',\
biz.aQute.junit;version='[5.1.0,5.1.1)',\
+ jakarta.xml.bind-api;version='[2.3.2,2.3.3)',\
+ jakarta.xml.soap-api;version='[1.4.1,1.4.2)',\
+ jakarta.xml.ws-api;version='[2.3.2,2.3.3)',\
jboss-classfilewriter;version='[1.2.4,1.2.5)',\
- org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.extension.jaxrs;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.extension.jndi;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.extension.servlet.common;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.extension.servlet.weld;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.extra;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.itests;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.weld;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extender;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.extension.jaxrs;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.extension.jndi;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.extension.servlet.common;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.extension.servlet.weld;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.extension.spi;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.extra;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.itests;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.spi;version='[1.1.3,1.1.4)',\
+ org.apache.aries.cdi.weld;version='[1.1.3,1.1.4)',\
org.apache.aries.jax.rs.whiteboard;version='[1.0.6,1.0.7)',\
org.apache.aries.jndi.api;version='[1.1.0,1.1.1)',\
org.apache.aries.jndi.core;version='[1.0.2,1.0.3)',\
@@ -45,6 +49,7 @@
org.apache.felix.gogo.shell;version='[1.1.2,1.1.3)',\
org.apache.felix.http.jetty;version='[4.0.14,4.0.15)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
+ org.apache.geronimo.specs.geronimo-activation_1.1_spec;version='[1.1.0,1.1.1)',\
org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.3.0,1.3.1)',\
org.apache.geronimo.specs.geronimo-atinject_1.0_spec;version='[1.1.0,1.1.1)',\
org.apache.geronimo.specs.geronimo-el_2.2_spec;version='[1.1.0,1.1.1)',\
diff --git a/karaf/src/main/resources/feature.xml b/karaf/src/main/resources/feature.xml
index 342d897..707ea64 100644
--- a/karaf/src/main/resources/feature.xml
+++ b/karaf/src/main/resources/feature.xml
@@ -51,8 +51,8 @@ Karaf distribution configuration requirement:
</feature>
<feature name="osgi-util">
- <bundle>mvn:org.osgi/org.osgi.util.function/1.1.0</bundle>
- <bundle>mvn:org.osgi/org.osgi.util.promise/1.1.0</bundle>
+ <bundle dependency="true">mvn:org.osgi/org.osgi.util.function/1.1.0</bundle>
+ <bundle dependency="true">mvn:org.osgi/org.osgi.util.promise/1.1.0</bundle>
</feature>
<feature name="osgi-cdi">
@@ -69,14 +69,17 @@ Karaf distribution configuration requirement:
<bundle>mvn:org.apache.xbean/xbean-finder-shaded/4.17</bundle>
<bundle>mvn:org.apache.openwebbeans/openwebbeans-spi/2.0.17</bundle>
<bundle>mvn:org.apache.openwebbeans/openwebbeans-impl/2.0.17</bundle>
- <bundle>mvn:org.apache.openwebbeans/openwebbeans-web/2.0.17</bundle>
- <bundle>mvn:org.apache.openwebbeans/openwebbeans-el22/2.0.17</bundle>
<bundle>mvn:org.apache.felix/org.apache.felix.converter/1.0.12</bundle>
<bundle>mvn:org.apache.aries.cdi/org.apache.aries.cdi.spi/${project.version}</bundle>
<bundle>mvn:org.apache.aries.cdi/org.apache.aries.cdi.owb/${project.version}</bundle>
- <bundle>mvn:org.apache.aries.cdi/org.apache.aries.cdi.extra/${project.version}</bundle>
+ <!-- <bundle>mvn:org.apache.aries.cdi/org.apache.aries.cdi.extra/${project.version}</bundle> -->
<bundle start="true">mvn:org.apache.aries.cdi/org.apache.aries.cdi.extension.spi/${project.version}</bundle>
<bundle start="true">mvn:org.apache.aries.cdi/org.apache.aries.cdi.extender/${project.version}</bundle>
</feature>
+ <feature name="osgi-cdi-owb-web">
+ <bundle>mvn:org.apache.openwebbeans/openwebbeans-web/2.0.17</bundle>
+ <bundle>mvn:org.apache.openwebbeans/openwebbeans-el22/2.0.17</bundle>
+ </feature>
+
</features>