more preperation for next
Signed-off-by: Raymond Augé <rotty3000@apache.org>
diff --git a/cdi-executable/owb-executable.bndrun b/cdi-executable/owb-executable.bndrun
index b2af497..f1a2d4c 100644
--- a/cdi-executable/owb-executable.bndrun
+++ b/cdi-executable/owb-executable.bndrun
@@ -23,10 +23,10 @@
-runbundles: \
openwebbeans-impl;version='[2.0.13,2.0.14)',\
openwebbeans-spi;version='[2.0.13,2.0.14)',\
- org.apache.aries.cdi.extender;version='[1.1.0,1.1.1)',\
- org.apache.aries.cdi.extension.spi;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.cdi.extender;version='[1.1.1,1.1.2)',\
+ org.apache.aries.cdi.extension.spi;version='[1.1.1,1.1.2)',\
+ org.apache.aries.cdi.owb;version='[1.1.1,1.1.2)',\
+ org.apache.aries.cdi.spi;version='[1.1.1,1.1.2)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.3,1.2.4)',\
org.apache.felix.configadmin;version='[1.9.10,1.9.11)',\
org.apache.felix.converter;version='[1.0.12,1.0.13)',\
diff --git a/cdi-executable/weld-executable.bndrun b/cdi-executable/weld-executable.bndrun
index 5d694ee..feb98c4 100644
--- a/cdi-executable/weld-executable.bndrun
+++ b/cdi-executable/weld-executable.bndrun
@@ -23,10 +23,10 @@
-runbundles: \
jboss-classfilewriter;version='[1.2.4,1.2.5)',\
- org.apache.aries.cdi.extender;version='[1.1.0,1.1.1)',\
- org.apache.aries.cdi.extension.spi;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.cdi.extender;version='[1.1.1,1.1.2)',\
+ org.apache.aries.cdi.extension.spi;version='[1.1.1,1.1.2)',\
+ org.apache.aries.cdi.spi;version='[1.1.1,1.1.2)',\
+ org.apache.aries.cdi.weld;version='[1.1.1,1.1.2)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.3,1.2.4)',\
org.apache.felix.configadmin;version='[1.9.10,1.9.11)',\
org.apache.felix.converter;version='[1.0.12,1.0.13)',\
diff --git a/cdi-extension-mp-config/pom.xml b/cdi-extension-mp-config/pom.xml
index 1e4e0a7..dc04164 100644
--- a/cdi-extension-mp-config/pom.xml
+++ b/cdi-extension-mp-config/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.cdi</groupId>
<artifactId>org.apache.aries.cdi</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/cdi-extension-mp-jwt-auth/pom.xml b/cdi-extension-mp-jwt-auth/pom.xml
index 6e3e688..73cbcf0 100644
--- a/cdi-extension-mp-jwt-auth/pom.xml
+++ b/cdi-extension-mp-jwt-auth/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.cdi</groupId>
<artifactId>org.apache.aries.cdi</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/cdi-extension-mp-metrics/pom.xml b/cdi-extension-mp-metrics/pom.xml
index 1ce1f82..d1a53b8 100644
--- a/cdi-extension-mp-metrics/pom.xml
+++ b/cdi-extension-mp-metrics/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.cdi</groupId>
<artifactId>org.apache.aries.cdi</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/cdi-itests/owb-itest.bndrun b/cdi-itests/owb-itest.bndrun
index edef0c5..0d26e61 100644
--- a/cdi-itests/owb-itest.bndrun
+++ b/cdi-itests/owb-itest.bndrun
@@ -18,50 +18,3 @@
-runblacklist: \
osgi.identity;filter:='(osgi.identity=*weld*)'
-
--runbundles: \
- biz.aQute.junit;version='[4.3.1,4.3.2)',\
- 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.1.0,1.1.1)',\
- org.apache.aries.cdi.extension.jaxrs;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.servlet.common;version='[1.1.0,1.1.1)',\
- org.apache.aries.cdi.extension.servlet.owb;version='[1.1.0,1.1.1)',\
- org.apache.aries.cdi.extension.spi;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.jax.rs.whiteboard;version='[1.0.6,1.0.7)',\
- 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.3,1.2.4)',\
- org.apache.aries.util;version='[1.0.0,1.0.1)',\
- org.apache.commons.logging;version='[1.2.0,1.2.1)',\
- org.apache.felix.configadmin;version='[1.9.10,1.9.11)',\
- org.apache.felix.converter;version='[1.0.12,1.0.13)',\
- 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.jetty;version='[4.0.14,4.0.15)',\
- 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-jaxrs_2.1_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.httpcomponents.httpclient;version='[4.5.3,4.5.4)',\
- org.apache.httpcomponents.httpcore;version='[4.4.6,4.4.7)',\
- 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.service.jaxrs;version='[1.0.0,1.0.1)',\
- org.osgi.test.common;version='[1.0.0,1.0.1)',\
- org.osgi.test.junit4;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.apache.aries.cdi.owb;version='[1.1.0,1.1.1)'
diff --git a/cdi-itests/pom.xml b/cdi-itests/pom.xml
index 40459a0..5207b3b 100644
--- a/cdi-itests/pom.xml
+++ b/cdi-itests/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.cdi</groupId>
<artifactId>org.apache.aries.cdi</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -256,42 +256,10 @@
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-resolver-maven-plugin</artifactId>
- <configuration>
- <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>
<includeDependencyManagement>true</includeDependencyManagement>
+ <resolve>true</resolve>
</configuration>
<executions>
<execution>
diff --git a/cdi-itests/weld-itest.bndrun b/cdi-itests/weld-itest.bndrun
index 2957653..a7025c4 100644
--- a/cdi-itests/weld-itest.bndrun
+++ b/cdi-itests/weld-itest.bndrun
@@ -19,47 +19,3 @@
-runblacklist: \
osgi.identity;filter:='(osgi.identity=*owb*)'
-
--runbundles: \
- biz.aQute.junit;version='[4.3.1,4.3.2)',\
- jboss-classfilewriter;version='[1.2.4,1.2.5)',\
- org.apache.aries.cdi.extender;version='[1.1.0,1.1.1)',\
- org.apache.aries.cdi.extension.jaxrs;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.servlet.common;version='[1.1.0,1.1.1)',\
- org.apache.aries.cdi.extension.servlet.weld;version='[1.1.0,1.1.1)',\
- org.apache.aries.cdi.extension.spi;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.jax.rs.whiteboard;version='[1.0.6,1.0.7)',\
- 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.3,1.2.4)',\
- org.apache.aries.util;version='[1.0.0,1.0.1)',\
- org.apache.commons.logging;version='[1.2.0,1.2.1)',\
- org.apache.felix.configadmin;version='[1.9.10,1.9.11)',\
- org.apache.felix.converter;version='[1.0.12,1.0.13)',\
- 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.jetty;version='[4.0.14,4.0.15)',\
- 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-jaxrs_2.1_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.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.spec.javax.ejb.jboss-ejb-api_3.2_spec;version='[2.0.0,2.0.1)',\
- org.jboss.weld.osgi-bundle;version='[3.1.3,3.1.4)',\
- org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
- org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
- org.osgi.test.common;version='[1.0.0,1.0.1)',\
- org.osgi.test.junit4;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)'
