[CDI] bnd 4.2.0 and other simplifications
Signed-off-by: Raymond Auge <rotty3000@apache.org>
diff --git a/cdi-executable/executable.bndrun b/cdi-executable/executable.bndrun
index ff72eed..b9639da 100644
--- a/cdi-executable/executable.bndrun
+++ b/cdi-executable/executable.bndrun
@@ -14,7 +14,16 @@
#-runvm: -Xdebug, "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
-standalone: true
+-runee: JavaSE-1.8
+-runfw: org.eclipse.osgi
+-runkeep: true
+-runproperties: \
+ eclipse.log.enabled=false,\
+ logback.configurationFile=file:${.}/logback.xml,\
+ org.osgi.service.http.port=8080,\
+ osgi.console=
+-resolve.effective: resolve, active
-runrequires: \
osgi.identity;filter:='(osgi.identity=javax.ejb-api)',\
osgi.identity;filter:='(osgi.identity=javax.transaction-api)',\
@@ -38,9 +47,9 @@
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.1,1.0.2)',\
- org.apache.aries.cdi.extension.http;version='[1.0.1,1.0.2)',\
- org.apache.aries.cdi.extra;version='[1.0.1,1.0.2)',\
+ org.apache.aries.cdi.extender;version='[1.0.2,1.0.3)',\
+ org.apache.aries.cdi.extension.http;version='[1.0.2,1.0.3)',\
+ org.apache.aries.cdi.extra;version='[1.0.2,1.0.3)',\
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)',\
@@ -58,13 +67,3 @@
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)'
-
--resolve.effective: resolve, active
--runee: JavaSE-1.8
--runfw: org.eclipse.osgi
--runkeep: true
--runproperties: \
- eclipse.log.enabled=false,\
- logback.configurationFile=file:${.}/logback.xml,\
- org.osgi.service.http.port=8080,\
- osgi.console=
diff --git a/cdi-executable/pom.xml b/cdi-executable/pom.xml
index f40b270..c44057a 100644
--- a/cdi-executable/pom.xml
+++ b/cdi-executable/pom.xml
@@ -31,6 +31,7 @@
A full fledged executable JAR containing Aries CDI and several other
useful features. Deploy your CDI bundles directly into this runtime.
</description>
+ <packaging>pom</packaging>
<licenses>
<license>
@@ -49,79 +50,8 @@
<gpg.skip>true</gpg.skip>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.install.skip>true</maven.install.skip>
- <maven.javadoc.skip>true</maven.javadoc.skip>
- <maven.source.skip>true</maven.source.skip>
-
- <executable.name>executable</executable.name>
</properties>
- <dependencies>
- <!-- Provided by the Aries CDI BOM -->
- <dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.cdi</groupId>
- <artifactId>org.apache.aries.cdi.extender</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.cdi</groupId>
- <artifactId>org.apache.aries.cdi.extension.http</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.cdi</groupId>
- <artifactId>org.apache.aries.cdi.extra</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.spifly</groupId>
- <artifactId>org.apache.aries.spifly.dynamic.framework.extension</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- </dependency>
-
- <!-- Additional runtime requirements -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.gogo.command</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.gogo.runtime</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.gogo.shell</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.logback</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- </dependency>
- </dependencies>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -145,19 +75,12 @@
<plugins>
<plugin>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-resolver-maven-plugin</artifactId>
<configuration>
<bndruns>
- <bndrun>${executable.name}.bndrun</bndrun>
+ <bndrun>executable.bndrun</bndrun>
</bndruns>
+ <includeDependencyManagement>true</includeDependencyManagement>
</configuration>
</plugin>
<plugin>
@@ -165,8 +88,9 @@
<artifactId>bnd-export-maven-plugin</artifactId>
<configuration>
<bndruns>
- <bndrun>${executable.name}.bndrun</bndrun>
+ <bndrun>executable.bndrun</bndrun>
</bndruns>
+ <includeDependencyManagement>true</includeDependencyManagement>
</configuration>
</plugin>
</plugins>
diff --git a/cdi-itests/itest.bndrun b/cdi-itests/itest.bndrun
index 88d0e6a..3c0740a 100644
--- a/cdi-itests/itest.bndrun
+++ b/cdi-itests/itest.bndrun
@@ -10,10 +10,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#-runtrace: true
-#-runvm: -Xdebug, "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
+#-runjdb: 8000
-standalone: true
+-runee: JavaSE-1.8
+-runfw: org.eclipse.osgi
+-runproperties: \
+ eclipse.log.enabled=false,\
+ logback.configurationFile=file:${.}/logback.xml,\
+ org.osgi.service.http.port=0,\
+ osgi.console=
+
+-resolve.effective: resolve, active
-runrequires: \
osgi.identity;filter:='(osgi.identity=javax.ejb-api)',\
@@ -36,15 +44,15 @@
sun.misc
-runbundles: \
- biz.aQute.junit;version='[4.1.0,4.1.1)',\
+ biz.aQute.junit;version='[4.2.0,4.2.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.extender;version='[1.0.1,1.0.2)',\
- org.apache.aries.cdi.extension.http;version='[1.0.1,1.0.2)',\
- org.apache.aries.cdi.extension.jndi;version='[1.0.1,1.0.2)',\
- org.apache.aries.cdi.extra;version='[1.0.1,1.0.2)',\
- org.apache.aries.cdi.itests;version='[1.0.1,1.0.2)',\
+ org.apache.aries.cdi.extender;version='[1.0.2,1.0.3)',\
+ org.apache.aries.cdi.extension.http;version='[1.0.2,1.0.3)',\
+ org.apache.aries.cdi.extension.jndi;version='[1.0.2,1.0.3)',\
+ org.apache.aries.cdi.extra;version='[1.0.2,1.0.3)',\
+ org.apache.aries.cdi.itests;version='[1.0.2,1.0.3)',\
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)',\
@@ -56,7 +64,6 @@
org.apache.felix.gogo.shell;version='[1.1.2,1.1.3)',\
org.apache.felix.http.jetty;version='[4.0.6,4.0.7)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
- org.apache.felix.scr;version='[2.1.0,2.1.1)',\
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)',\
@@ -69,12 +76,3 @@
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)'
-
--resolve.effective: resolve, active
--runee: JavaSE-1.8
--runfw: org.eclipse.osgi
--runproperties: \
- eclipse.log.enabled=false,\
- logback.configurationFile=file:${.}/logback.xml,\
- org.osgi.service.http.port=0,\
- osgi.console=
diff --git a/cdi-itests/pom.xml b/cdi-itests/pom.xml
index ffa2009..d77cfb5 100644
--- a/cdi-itests/pom.xml
+++ b/cdi-itests/pom.xml
@@ -59,6 +59,14 @@
<version>${bnd.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.aries.cdi</groupId>
+ <artifactId>org.apache.aries.cdi.extra</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.servlet-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.3_spec</artifactId>
</dependency>
@@ -71,26 +79,12 @@
<artifactId>geronimo-jcdi_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.aries.cdi</groupId>
- <artifactId>org.apache.aries.cdi.extra</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.servlet-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-osgi</artifactId>
<version>4.5.3</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.promise</artifactId>
- </dependency>
-
- <!-- PROVIDED -->
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.extender</artifactId>
</dependency>
<dependency>
@@ -103,12 +97,6 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.component.annotations</artifactId>
- <version>1.4.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>org.osgi.service.http.whiteboard</artifactId>
</dependency>
<dependency>
@@ -117,6 +105,10 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.promise</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>osgi.annotation</artifactId>
</dependency>
<dependency>
@@ -124,33 +116,7 @@
<artifactId>osgi.core</artifactId>
</dependency>
- <!-- RUNTIME -->
- <dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.cdi</groupId>
- <artifactId>org.apache.aries.cdi.extender</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.cdi</groupId>
- <artifactId>org.apache.aries.cdi.extension.http</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.cdi</groupId>
- <artifactId>org.apache.aries.cdi.extension.jndi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <scope>runtime</scope>
- </dependency>
+ <!-- RUNTIME dependencies not found in BOMs -->
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.core</artifactId>
@@ -158,62 +124,11 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.aries.spifly</groupId>
- <artifactId>org.apache.aries.spifly.dynamic.framework.extension</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.gogo.command</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.gogo.runtime</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.gogo.shell</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.logback</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>2.1.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-osgi</artifactId>
<version>4.4.6</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.function</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- </dependency>
</dependencies>
<dependencyManagement>
@@ -263,6 +178,7 @@
<bndruns>
<bndrun>itest.bndrun</bndrun>
</bndruns>
+ <includeDependencyManagement>true</includeDependencyManagement>
</configuration>
</plugin>
<plugin>
@@ -272,6 +188,7 @@
<bndruns>
<bndrun>itest.bndrun</bndrun>
</bndruns>
+ <includeDependencyManagement>true</includeDependencyManagement>
</configuration>
</plugin>
</plugins>
diff --git a/pom.xml b/pom.xml
index 64d8b1f..5841eda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<packaging>pom</packaging>
<properties>
- <bnd.version>4.1.0</bnd.version>
+ <bnd.version>4.2.0</bnd.version>
<jsp.version>2.0</jsp.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<surefire.version>2.12</surefire.version>
