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:31 UTC
[aries-cdi] 12/27: executables for each
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 b0f5ac4b6d43abf3e0ff5af57b24a3f80738ae9e
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Fri Nov 22 16:47:20 2019 -0500
executables for each
Signed-off-by: Raymond Augé <ro...@apache.org>
---
cdi-executable/owb-executable.bndrun | 11 ++--
cdi-executable/pom.xml | 60 +++++++++++++++++++---
...wb-executable.bndrun => weld-executable.bndrun} | 32 +++++++-----
pom.xml | 8 ---
4 files changed, 80 insertions(+), 31 deletions(-)
diff --git a/cdi-executable/owb-executable.bndrun b/cdi-executable/owb-executable.bndrun
index 14a9500..ce1b2c1 100644
--- a/cdi-executable/owb-executable.bndrun
+++ b/cdi-executable/owb-executable.bndrun
@@ -24,9 +24,6 @@
osgi.console=
-resolve.effective: resolve, active
--runrequires: \
- osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.owb)',\
- osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)'
-runpath: \
ch.qos.logback.classic,\
@@ -41,6 +38,14 @@
org.slf4j.spi;version=1.7.28,\
sun.misc
+-runrequires: \
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.owb)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)'
+
+-runblacklist: \
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.weld)',\
+ osgi.identity;filter:='(osgi.identity=org.jboss.spec.javax.el.jboss-el-api_3.0_spec)'
+
-runbundles: \
javax.servlet.jsp-api;version='[2.3.3,2.3.4)',\
openwebbeans-impl;version='[2.0.13,2.0.14)',\
diff --git a/cdi-executable/pom.xml b/cdi-executable/pom.xml
index 0cca58d..52607c6 100644
--- a/cdi-executable/pom.xml
+++ b/cdi-executable/pom.xml
@@ -78,21 +78,63 @@
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-resolver-maven-plugin</artifactId>
<configuration>
- <bndruns>
- <bndrun>owb-executable.bndrun</bndrun>
- </bndruns>
<includeDependencyManagement>true</includeDependencyManagement>
</configuration>
+ <executions>
+ <execution>
+ <id>owb-resolve</id>
+ <goals>
+ <goal>resolve</goal>
+ </goals>
+ <configuration>
+ <bndruns>
+ <bndrun>owb-executable.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </execution>
+ <execution>
+ <id>weld-resolve</id>
+ <goals>
+ <goal>resolve</goal>
+ </goals>
+ <configuration>
+ <bndruns>
+ <bndrun>weld-executable.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-export-maven-plugin</artifactId>
<configuration>
- <bndruns>
- <bndrun>owb-executable.bndrun</bndrun>
- </bndruns>
<includeDependencyManagement>true</includeDependencyManagement>
</configuration>
+ <executions>
+ <execution>
+ <id>owb-export</id>
+ <goals>
+ <goal>export</goal>
+ </goals>
+ <configuration>
+ <bndruns>
+ <bndrun>owb-executable.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </execution>
+ <execution>
+ <id>weld-export</id>
+ <goals>
+ <goal>export</goal>
+ </goals>
+ <configuration>
+ <bndruns>
+ <bndrun>weld-executable.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
@@ -104,6 +146,12 @@
<bndrun>owb-executable.bndrun</bndrun>
</configuration>
</execution>
+ <execution>
+ <id>weld-executable</id>
+ <configuration>
+ <bndrun>weld-executable.bndrun</bndrun>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
diff --git a/cdi-executable/owb-executable.bndrun b/cdi-executable/weld-executable.bndrun
similarity index 76%
copy from cdi-executable/owb-executable.bndrun
copy to cdi-executable/weld-executable.bndrun
index 14a9500..8322ec8 100644
--- a/cdi-executable/owb-executable.bndrun
+++ b/cdi-executable/weld-executable.bndrun
@@ -24,9 +24,6 @@
osgi.console=
-resolve.effective: resolve, active
--runrequires: \
- osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.owb)',\
- osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)'
-runpath: \
ch.qos.logback.classic,\
@@ -41,29 +38,36 @@
org.slf4j.spi;version=1.7.28,\
sun.misc
+-runrequires: \
+ osgi.identity;filter:='(osgi.identity=javax.ejb-api)',\
+ osgi.identity;filter:='(osgi.identity=javax.transaction-api)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.weld)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)'
+
+-runblacklist: \
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.owb)',\
+ osgi.identity;filter:='(osgi.identity=org.jboss.spec.javax.el.jboss-el-api_3.0_spec)'
+
-runbundles: \
- 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.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.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)',\
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-annotation_1.3_spec;version='[1.1.0,1.1.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)',\
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.apache.xbean.asm7-shaded;version='[4.13.0,4.13.1)',\
- org.apache.xbean.bundleutils;version='[4.15.0,4.15.1)',\
- org.apache.xbean.finder-shaded;version='[4.13.0,4.13.1)',\
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)'
+ org.osgi.util.promise;version='[1.1.0,1.1.1)',\
+ 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.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)'
diff --git a/pom.xml b/pom.xml
index 61b5854..4d6bf5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -284,14 +284,6 @@
<failOnChanges>false</failOnChanges>
<resolve>false</resolve>
</configuration>
- <executions>
- <execution>
- <id>export</id>
- <goals>
- <goal>export</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>