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:34 UTC
[aries-cdi] 15/27: run test suite on both
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 e421358635dbac3adf75af9dc50b233d905c7c6c
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Fri Nov 22 16:49:35 2019 -0500
run test suite on both
Signed-off-by: Raymond Augé <ro...@apache.org>
---
cdi-itests/{itest.bndrun => owb-itest.bndrun} | 24 +++++----
cdi-itests/pom.xml | 72 +++++++++++++++++++++++---
cdi-itests/{itest.bndrun => weld-itest.bndrun} | 9 +++-
pom.xml | 8 ---
4 files changed, 89 insertions(+), 24 deletions(-)
diff --git a/cdi-itests/itest.bndrun b/cdi-itests/owb-itest.bndrun
similarity index 79%
copy from cdi-itests/itest.bndrun
copy to cdi-itests/owb-itest.bndrun
index 959cdb8..91fed8e 100644
--- a/cdi-itests/itest.bndrun
+++ b/cdi-itests/owb-itest.bndrun
@@ -24,13 +24,15 @@
-resolve.effective: resolve, active
-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.extra)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.owb)',\
osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.itests)',\
osgi.identity;filter:='(osgi.identity=org.apache.aries.jndi.core)',\
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)'
+
-runpath: \
ch.qos.logback.classic,\
ch.qos.logback.core,\
@@ -39,20 +41,23 @@
-runsystempackages: \
org.slf4j;version=1.7.25,\
+ org.slf4j.event;version=1.7.25,\
org.slf4j.helpers;version=1.7.25,\
org.slf4j.spi;version=1.7.25,\
sun.misc
-runbundles: \
biz.aQute.junit;version='[4.3.1,4.3.2)',\
- 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)',\
+ 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.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.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.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)',\
@@ -71,8 +76,9 @@
org.apache.geronimo.specs.geronimo-jcdi_2.0_spec;version='[1.1.0,1.1.1)',\
org.apache.httpcomponents.httpclient;version='[4.5.3,4.5.4)',\
org.apache.httpcomponents.httpcore;version='[4.4.6,4.4.7)',\
- 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.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)'
diff --git a/cdi-itests/pom.xml b/cdi-itests/pom.xml
index 3bca27e..0a8aea2 100644
--- a/cdi-itests/pom.xml
+++ b/cdi-itests/pom.xml
@@ -119,6 +119,22 @@
<!-- RUNTIME dependencies not found in BOMs -->
<dependency>
+ <groupId>org.apache.aries.cdi</groupId>
+ <artifactId>org.apache.aries.cdi.owb</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-web</artifactId>
+ <version>${owb.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.cdi</groupId>
+ <artifactId>org.apache.aries.cdi.weld</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.core</artifactId>
<version>1.0.2</version>
@@ -181,21 +197,65 @@
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-resolver-maven-plugin</artifactId>
<configuration>
- <bndruns>
- <bndrun>itest.bndrun</bndrun>
- </bndruns>
<includeDependencyManagement>true</includeDependencyManagement>
</configuration>
+ <executions>
+ <execution>
+ <id>owb-resolve</id>
+ <phase>package</phase>
+ <goals>
+ <goal>resolve</goal>
+ </goals>
+ <configuration>
+ <bndruns>
+ <bndrun>owb-itest.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </execution>
+ <execution>
+ <id>weld-resolve</id>
+ <phase>package</phase>
+ <goals>
+ <goal>resolve</goal>
+ </goals>
+ <configuration>
+ <bndruns>
+ <bndrun>weld-itest.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-testing-maven-plugin</artifactId>
<configuration>
- <bndruns>
- <bndrun>itest.bndrun</bndrun>
- </bndruns>
<includeDependencyManagement>true</includeDependencyManagement>
</configuration>
+ <executions>
+ <execution>
+ <id>owb-test</id>
+ <goals>
+ <goal>testing</goal>
+ </goals>
+ <configuration>
+ <bndruns>
+ <bndrun>owb-itest.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </execution>
+ <execution>
+ <id>weld-test</id>
+ <goals>
+ <goal>testing</goal>
+ </goals>
+ <configuration>
+ <bndruns>
+ <bndrun>weld-itest.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
diff --git a/cdi-itests/itest.bndrun b/cdi-itests/weld-itest.bndrun
similarity index 89%
rename from cdi-itests/itest.bndrun
rename to cdi-itests/weld-itest.bndrun
index 959cdb8..669ba00 100644
--- a/cdi-itests/itest.bndrun
+++ b/cdi-itests/weld-itest.bndrun
@@ -26,11 +26,15 @@
-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.extra)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.weld)',\
osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.itests)',\
osgi.identity;filter:='(osgi.identity=org.apache.aries.jndi.core)',\
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)'
+
-runpath: \
ch.qos.logback.classic,\
ch.qos.logback.core,\
@@ -39,6 +43,7 @@
-runsystempackages: \
org.slf4j;version=1.7.25,\
+ org.slf4j.event;version=1.7.25,\
org.slf4j.helpers;version=1.7.25,\
org.slf4j.spi;version=1.7.25,\
sun.misc
@@ -53,6 +58,8 @@
org.apache.aries.cdi.extension.jndi;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.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/pom.xml b/pom.xml
index 4d6bf5f..d58238a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -324,14 +324,6 @@
<failOnChanges>false</failOnChanges>
<resolve>false</resolve>
</configuration>
- <executions>
- <execution>
- <id>testing</id>
- <goals>
- <goal>testing</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>