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/27 04:46:42 UTC
[aries-cdi] branch master updated: [ARIES-2023] Improve Aries CDI
Karaf features repository
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 d31b652 [ARIES-2023] Improve Aries CDI Karaf features repository
d31b652 is described below
commit d31b652f0cec178449b20e8bc094a6e0f82df5af
Author: jbonofre <jb...@apache.org>
AuthorDate: Fri Nov 27 05:46:08 2020 +0100
[ARIES-2023] Improve Aries CDI Karaf features repository
---
{karaf => cdi-karaf}/pom.xml | 0
.../src/main/resources/feature.xml | 34 ++++++++++------------
pom.xml | 2 +-
3 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/karaf/pom.xml b/cdi-karaf/pom.xml
similarity index 100%
rename from karaf/pom.xml
rename to cdi-karaf/pom.xml
diff --git a/karaf/src/main/resources/feature.xml b/cdi-karaf/src/main/resources/feature.xml
similarity index 75%
rename from karaf/src/main/resources/feature.xml
rename to cdi-karaf/src/main/resources/feature.xml
index 707ea64..ec6e30c 100644
--- a/karaf/src/main/resources/feature.xml
+++ b/cdi-karaf/src/main/resources/feature.xml
@@ -14,29 +14,26 @@
* limitations under the License.
*/
-->
-<!--
-NOTE: this is a raw feature for java 11 where javax.annotation is taken from the JVM (until Karaf >= 4.3 drops it)
-
-Minimal Karaf version: 4.3.0
-Minimal Java version: 11
-Karaf distribution configuration requirement:
-- etc/config.properties (to make javax.annotation taken from the JVM only) + avoid to deploy geronimo-annotation_specs_1.3
- > org.osgi.framework.system.capabilities = ${eecap-${java.specification.version}},${${karaf.framework}-capabilities},${karaf-capabilities},"osgi.contract;osgi.contract=JavaAnnotation;version:List<Version>="1.3,1.2,1.1,1.0"
--->
<features name="aries-cdi"
xmlns="http://karaf.apache.org/xmlns/features/v1.4.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.4.0">
- <feature name="spi-loader" version="1.3.0">
- <bundle>mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.3.0</bundle>
+ <feature name="spifly" version="1.3.2">
+ <bundle dependency="true">mvn:org.ow2.asm/asm/9.0</bundle>
+ <bundle dependency="true">mvn:org.ow2.asm/asm-util/9.0</bundle>
+ <bundle dependency="true">mvn:org.ow2.asm/asm-tree/9.0</bundle>
+ <bundle dependency="true">mvn:org.ow2.asm/asm-analysis/9.0</bundle>
+ <bundle dependency="true">mvn:org.ow2.asm/asm-commons/9.0</bundle>
+ <bundle>mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.3.2</bundle>
</feature>
<feature name="javax.annotation" version="1.3">
- <!-- reuse jvm one for now, just ensure to patch karaf to add JavaAnnotation capability -->
+ <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.annotation-api-1.3/1.3_3</bundle>
</feature>
<feature name="cdi-spec" version="2.0">
+ <feature prerequisite="true">spifly</feature>
<feature>javax.annotation</feature>
<bundle>mvn:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.2</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-interceptor_1.2_spec/1.2</bundle>
@@ -44,25 +41,25 @@ Karaf distribution configuration requirement:
<bundle>mvn:org.apache.geronimo.specs/geronimo-jcdi_2.0_spec/1.2</bundle>
</feature>
- <feature name="osgi-namespace">
+ <feature name="osgi-namespace" version="1.0.0">
<bundle>mvn:org.osgi/org.osgi.namespace.service/1.0.0</bundle>
<bundle>mvn:org.osgi/org.osgi.namespace.implementation/1.0.0</bundle>
<bundle>mvn:org.osgi/org.osgi.namespace.extender/1.0.1</bundle>
</feature>
- <feature name="osgi-util">
+ <feature name="osgi-util" version="1.1.0">
<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">
+ <feature name="osgi-cdi" version="1.0.0">
<feature>cdi-spec</feature>
<feature>osgi-namespace</feature>
<feature>osgi-util</feature>
<bundle>mvn:org.osgi/org.osgi.service.cdi/1.0.0</bundle>
</feature>
- <feature name="osgi-cdi-owb">
+ <feature name="osgi-cdi-owb" version="${project.version}">
<feature>osgi-cdi</feature>
<bundle>mvn:org.apache.xbean/xbean-bundleutils/4.17</bundle>
<bundle>mvn:org.apache.xbean/xbean-asm8-shaded/4.17</bundle>
@@ -72,14 +69,15 @@ Karaf distribution configuration requirement:
<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 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">
+ <feature name="osgi-cdi-owb-web" version="${project.version}">
<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.aries.cdi/org.apache.aries.cdi.extra/${project.version}</bundle>
</feature>
+
</features>
diff --git a/pom.xml b/pom.xml
index 8822b5f..80687a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@
<module>cdi-weld</module>
<module>cdi-bom</module>
<module>cdi-executable</module>
- <module>karaf</module>
+ <module>cdi-karaf</module>
</modules>
<dependencyManagement>