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-cdi.git
The following commit(s) were added to refs/heads/master by this push:
new ea3e639 ARIES-2072 update karaf feature.xml & create a karaf feature
for weld CDI provider
ea3e639 is described below
commit ea3e639b781ab3e111661c92afdb61f5d574bd61
Author: Jakub Herkel <[email protected]>
AuthorDate: Wed May 4 20:15:11 2022 +0200
ARIES-2072 update karaf feature.xml & create a karaf feature for weld CDI
provider
---
cdi-karaf/src/main/resources/feature.xml | 49 +++++++++++++++++++-------------
cdi-owb/pom.xml | 4 +--
cdi-weld/pom.xml | 2 +-
pom.xml | 6 ++--
4 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/cdi-karaf/src/main/resources/feature.xml
b/cdi-karaf/src/main/resources/feature.xml
index ec6e30c..e294cf1 100644
--- a/cdi-karaf/src/main/resources/feature.xml
+++ b/cdi-karaf/src/main/resources/feature.xml
@@ -19,13 +19,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.4.0";>
- <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 name="spifly" version="1.3.4">
+ <bundle dependency="true">mvn:org.ow2.asm/asm/9.2</bundle>
+ <bundle dependency="true">mvn:org.ow2.asm/asm-util/9.2</bundle>
+ <bundle dependency="true">mvn:org.ow2.asm/asm-tree/9.2</bundle>
+ <bundle dependency="true">mvn:org.ow2.asm/asm-analysis/9.2</bundle>
+ <bundle dependency="true">mvn:org.ow2.asm/asm-commons/9.2</bundle>
+ <bundle
dependency="true">mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.3.4</bundle>
</feature>
<feature name="javax.annotation" version="1.3">
@@ -35,10 +35,10 @@
<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>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-el_2.2_spec/1.1</bundle>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-jcdi_2.0_spec/1.2</bundle>
+ <bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.2</bundle>
+ <bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-interceptor_1.2_spec/1.2</bundle>
+ <bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-el_2.2_spec/1.1</bundle>
+ <bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jcdi_2.0_spec/1.2</bundle>
</feature>
<feature name="osgi-namespace" version="1.0.0">
@@ -61,21 +61,32 @@
<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>
- <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.felix/org.apache.felix.converter/1.0.12</bundle>
+ <bundle>mvn:org.apache.xbean/xbean-bundleutils/${xbean.version}</bundle>
+ <bundle>mvn:org.apache.xbean/xbean-asm9-shaded/${xbean.version}</bundle>
+ <bundle>mvn:org.apache.xbean/xbean-finder-shaded/${xbean.version}</bundle>
+
<bundle>mvn:org.apache.openwebbeans/openwebbeans-spi/${owb.version}</bundle>
+
<bundle>mvn:org.apache.openwebbeans/openwebbeans-impl/${owb.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.felix/org.apache.felix.converter/${felix.converter.version}</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
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-weld" version="${project.version}">
+ <feature>osgi-cdi</feature>
+ <bundle
dependency="true">mvn:org.jboss.classfilewriter/jboss-classfilewriter/</bundle>
+ <bundle>mvn:org.jboss.weld/weld-osgi-bundle/${weld.version}</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.weld/${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>
+
<bundle>mvn:org.apache.aries.cdi/org.apache.aries.cdi.extra/${project.version}</bundle>
+ </feature>
+
<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.openwebbeans/openwebbeans-web/${owb.version}</bundle>
+
<bundle>mvn:org.apache.openwebbeans/openwebbeans-el22/${owb.version}</bundle>
<bundle>mvn:org.apache.aries.cdi/org.apache.aries.cdi.extra/${project.version}</bundle>
</feature>
diff --git a/cdi-owb/pom.xml b/cdi-owb/pom.xml
index c5be5be..7f3ac62 100644
--- a/cdi-owb/pom.xml
+++ b/cdi-owb/pom.xml
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-bundleutils</artifactId>
- <version>4.20</version>
+ <version>${xbean.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -111,7 +111,7 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm9-shaded</artifactId>
- <version>4.20</version>
+ <version>${xbean.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/cdi-weld/pom.xml b/cdi-weld/pom.xml
index 9fa2556..a9a807d 100644
--- a/cdi-weld/pom.xml
+++ b/cdi-weld/pom.xml
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
- <version>3.4.2.Final</version>
+ <version>3.4.3.Final</version>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index a08a4a2..775fa14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,9 @@
<owb.version>2.0.26</owb.version>
<slf4j.version>1.7.36</slf4j.version>
<surefire.version>2.12</surefire.version>
- <weld.version>3.1.8.Final</weld.version>
+ <weld.version>3.1.9.Final</weld.version>
+ <felix.converter.version>1.0.18</felix.converter.version>
+ <xbean.version>4.21</xbean.version>
</properties>
<licenses>
@@ -122,7 +124,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.converter</artifactId>
- <version>1.0.18</version>
+ <version>${felix.converter.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
