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 2019/11/25 18:43:46 UTC
[aries-cdi] 27/27: re-resolve
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch rotty3000/cdi-spi
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git
commit 3c28c8a81da1893994e635155ef34b264cac6bea
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Mon Nov 25 13:39:54 2019 -0500
re-resolve
Signed-off-by: Raymond Augé <ro...@apache.org>
---
cdi-executable/owb-executable.bndrun | 8 ++++----
cdi-executable/pom.xml | 2 ++
cdi-executable/weld-executable.bndrun | 19 ++++++++++---------
cdi-itests/owb-itest.bndrun | 14 +++++++-------
cdi-itests/weld-itest.bndrun | 16 ++++++++--------
5 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/cdi-executable/owb-executable.bndrun b/cdi-executable/owb-executable.bndrun
index 82ee3f4..46820c6 100644
--- a/cdi-executable/owb-executable.bndrun
+++ b/cdi-executable/owb-executable.bndrun
@@ -51,10 +51,10 @@
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.0.3,1.0.4)',\
- org.apache.aries.cdi.extra;version='[1.0.3,1.0.4)',\
- org.apache.aries.cdi.owb;version='[1.0.3,1.0.4)',\
- org.apache.aries.cdi.spi;version='[1.0.3,1.0.4)',\
+ org.apache.aries.cdi.extender;version='[1.1.0,1.1.1)',\
+ org.apache.aries.cdi.extra;version='[1.1.0,1.1.1)',\
+ org.apache.aries.cdi.owb;version='[1.1.0,1.1.1)',\
+ org.apache.aries.cdi.spi;version='[1.1.0,1.1.1)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.0,1.2.1)',\
org.apache.felix.configadmin;version='[1.9.10,1.9.11)',\
org.apache.felix.gogo.command;version='[1.1.0,1.1.1)',\
diff --git a/cdi-executable/pom.xml b/cdi-executable/pom.xml
index 52607c6..57e17d0 100644
--- a/cdi-executable/pom.xml
+++ b/cdi-executable/pom.xml
@@ -83,6 +83,7 @@
<executions>
<execution>
<id>owb-resolve</id>
+ <phase>package</phase>
<goals>
<goal>resolve</goal>
</goals>
@@ -94,6 +95,7 @@
</execution>
<execution>
<id>weld-resolve</id>
+ <phase>package</phase>
<goals>
<goal>resolve</goal>
</goals>
diff --git a/cdi-executable/weld-executable.bndrun b/cdi-executable/weld-executable.bndrun
index 956b6bc..1c46fa3 100644
--- a/cdi-executable/weld-executable.bndrun
+++ b/cdi-executable/weld-executable.bndrun
@@ -49,8 +49,13 @@
osgi.identity;filter:='(osgi.identity=org.jboss.spec.*)'
-runbundles: \
- org.apache.aries.cdi.extender;version='[1.0.3,1.0.4)',\
- org.apache.aries.cdi.spi;version='[1.0.3,1.0.4)',\
+ javax.ejb-api;version='[3.2.0,3.2.1)',\
+ javax.enterprise.cdi-api;version='[2.0.0,2.0.1)',\
+ javax.transaction-api;version='[1.2.0,1.2.1)',\
+ jboss-classfilewriter;version='[1.2.3,1.2.4)',\
+ org.apache.aries.cdi.extender;version='[1.1.0,1.1.1)',\
+ org.apache.aries.cdi.spi;version='[1.1.0,1.1.1)',\
+ org.apache.aries.cdi.weld;version='[1.1.0,1.1.1)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.0,1.2.1)',\
org.apache.felix.configadmin;version='[1.9.10,1.9.11)',\
org.apache.felix.gogo.command;version='[1.1.0,1.1.1)',\
@@ -61,12 +66,8 @@
org.apache.geronimo.specs.geronimo-el_2.2_spec;version='[1.1.0,1.1.1)',\
org.apache.geronimo.specs.geronimo-interceptor_1.2_spec;version='[1.1.0,1.1.1)',\
org.apache.geronimo.specs.geronimo-jcdi_2.0_spec;version='[1.1.0,1.1.1)',\
+ org.jboss.logging.jboss-logging;version='[3.3.2,3.3.3)',\
+ org.jboss.weld.osgi-bundle;version='[3.0.5,3.0.6)',\
org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
org.osgi.util.function;version='[1.1.0,1.1.1)',\
- org.osgi.util.promise;version='[1.1.0,1.1.1)',\
- javax.ejb-api;version='[3.2.0,3.2.1)',\
- javax.transaction-api;version='[1.2.0,1.2.1)',\
- jboss-classfilewriter;version='[1.2.3,1.2.4)',\
- org.apache.aries.cdi.weld;version='[1.0.3,1.0.4)',\
- org.jboss.logging.jboss-logging;version='[3.3.2,3.3.3)',\
- org.jboss.weld.osgi-bundle;version='[3.0.5,3.0.6)'
+ org.osgi.util.promise;version='[1.1.0,1.1.1)'
diff --git a/cdi-itests/owb-itest.bndrun b/cdi-itests/owb-itest.bndrun
index e6fb820..5cafc6e 100644
--- a/cdi-itests/owb-itest.bndrun
+++ b/cdi-itests/owb-itest.bndrun
@@ -29,13 +29,13 @@
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.0.3,1.0.4)',\
- org.apache.aries.cdi.extension.jndi;version='[1.0.3,1.0.4)',\
- org.apache.aries.cdi.extension.mp-config;version='[1.0.3,1.0.4)',\
- org.apache.aries.cdi.extra;version='[1.0.3,1.0.4)',\
- org.apache.aries.cdi.itests;version='[1.0.3,1.0.4)',\
- org.apache.aries.cdi.owb;version='[1.0.3,1.0.4)',\
- org.apache.aries.cdi.spi;version='[1.0.3,1.0.4)',\
+ org.apache.aries.cdi.extender;version='[1.1.0,1.1.1)',\
+ org.apache.aries.cdi.extension.jndi;version='[1.1.0,1.1.1)',\
+ org.apache.aries.cdi.extension.mp-config;version='[1.1.0,1.1.1)',\
+ org.apache.aries.cdi.extra;version='[1.1.0,1.1.1)',\
+ org.apache.aries.cdi.itests;version='[1.1.0,1.1.1)',\
+ org.apache.aries.cdi.owb;version='[1.1.0,1.1.1)',\
+ org.apache.aries.cdi.spi;version='[1.1.0,1.1.1)',\
org.apache.aries.jndi.api;version='[1.1.0,1.1.1)',\
org.apache.aries.jndi.core;version='[1.0.2,1.0.3)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.0,1.2.1)',\
diff --git a/cdi-itests/weld-itest.bndrun b/cdi-itests/weld-itest.bndrun
index 2c4d345..a88a2b5 100644
--- a/cdi-itests/weld-itest.bndrun
+++ b/cdi-itests/weld-itest.bndrun
@@ -37,14 +37,14 @@
javax.ejb-api;version='[3.2.0,3.2.1)',\
javax.transaction-api;version='[1.2.0,1.2.1)',\
jboss-classfilewriter;version='[1.2.3,1.2.4)',\
- org.apache.aries.cdi.extender;version='[1.0.3,1.0.4)',\
- org.apache.aries.cdi.extension.http;version='[1.0.3,1.0.4)',\
- org.apache.aries.cdi.extension.jndi;version='[1.0.3,1.0.4)',\
- org.apache.aries.cdi.extension.mp-config;version='[1.0.3,1.0.4)',\
- org.apache.aries.cdi.extra;version='[1.0.3,1.0.4)',\
- org.apache.aries.cdi.itests;version='[1.0.3,1.0.4)',\
- org.apache.aries.cdi.spi;version='[1.0.3,1.0.4)',\
- org.apache.aries.cdi.weld;version='[1.0.3,1.0.4)',\
+ org.apache.aries.cdi.extender;version='[1.1.0,1.1.1)',\
+ org.apache.aries.cdi.extension.http;version='[1.1.0,1.1.1)',\
+ org.apache.aries.cdi.extension.jndi;version='[1.1.0,1.1.1)',\
+ org.apache.aries.cdi.extension.mp-config;version='[1.1.0,1.1.1)',\
+ org.apache.aries.cdi.extra;version='[1.1.0,1.1.1)',\
+ org.apache.aries.cdi.itests;version='[1.1.0,1.1.1)',\
+ org.apache.aries.cdi.spi;version='[1.1.0,1.1.1)',\
+ org.apache.aries.cdi.weld;version='[1.1.0,1.1.1)',\
org.apache.aries.jndi.api;version='[1.1.0,1.1.1)',\
org.apache.aries.jndi.core;version='[1.0.2,1.0.3)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.0,1.2.1)',\