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 2020/06/05 03:25:28 UTC
[aries-cdi] branch master updated (124d91c -> 2315221)
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git.
from 124d91c ARIES-1982 Aries CDI doesn't run on upcoming version of OSGi framework
new 3f7550b clear all warnings
new 44ac18a bnd 5.1.0
new 8e76445 always keep sorted order for resolved -runbundles
new 1e78a0d update to Aries spifly 1.3.0
new a4e018d update to org.eclipse.osgi 3.15.200
new 2315221 add Java 15-ea to build matrix
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/maven.yml | 8 +--
cdi-bom/pom.xml | 4 +-
cdi-executable/base.bndrun | 7 ++-
cdi-executable/owb-executable.bndrun | 2 +-
cdi-executable/weld-executable.bndrun | 2 +-
.../cdi/extension/jaxrs/JaxrsCDIExtension.java | 5 --
cdi-extension-mp-config/base-itest.bndrun | 9 +++-
cdi-extension-mp-config/owb-itest.bndrun | 4 +-
cdi-extension-mp-config/weld-itest.bndrun | 4 +-
cdi-extension-mp-jwt-auth/base-itest.bndrun | 9 +++-
cdi-extension-mp-jwt-auth/owb-itest.bndrun | 4 +-
cdi-extension-mp-jwt-auth/weld-itest.bndrun | 4 +-
cdi-extension-mp-metrics/base-itest.bndrun | 9 +++-
cdi-extension-mp-metrics/owb-itest.bndrun | 4 +-
cdi-extension-mp-metrics/weld-itest.bndrun | 4 +-
.../aries/cdi/extension/spi/adapt/FiltersOn.java | 4 +-
.../cdi/extension/spi/adapt/RegisterExtension.java | 4 +-
cdi-itests/base-itest.bndrun | 7 ++-
cdi-itests/owb-itest.bndrun | 5 +-
cdi-itests/weld-itest.bndrun | 5 +-
pom.xml | 58 +++++++++++++++++-----
21 files changed, 109 insertions(+), 53 deletions(-)
[aries-cdi] 01/06: clear all warnings
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git
commit 3f7550b6c5f5a91b8a89b48c70241cfc2af802d3
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Thu Jun 4 22:39:59 2020 -0400
clear all warnings
Signed-off-by: Raymond Augé <ro...@apache.org>
---
.../java/org/apache/aries/cdi/extension/jaxrs/JaxrsCDIExtension.java | 5 -----
.../java/org/apache/aries/cdi/extension/spi/adapt/FiltersOn.java | 4 +++-
.../org/apache/aries/cdi/extension/spi/adapt/RegisterExtension.java | 4 +++-
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/cdi-extension-jaxrs/src/main/java/org/apache/aries/cdi/extension/jaxrs/JaxrsCDIExtension.java b/cdi-extension-jaxrs/src/main/java/org/apache/aries/cdi/extension/jaxrs/JaxrsCDIExtension.java
index 5fad41b..90202a5 100644
--- a/cdi-extension-jaxrs/src/main/java/org/apache/aries/cdi/extension/jaxrs/JaxrsCDIExtension.java
+++ b/cdi-extension-jaxrs/src/main/java/org/apache/aries/cdi/extension/jaxrs/JaxrsCDIExtension.java
@@ -26,7 +26,6 @@ import javax.enterprise.inject.spi.AfterDeploymentValidation;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.DeploymentException;
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.configurator.AnnotatedTypeConfigurator;
import javax.ws.rs.ApplicationPath;
@@ -135,7 +134,6 @@ public class JaxrsCDIExtension implements Extension {
addJaxRsExtension(pat);
}
- @SuppressWarnings("rawtypes")
void messageBodyReader(
@Observes @FiltersOn(types = MessageBodyReader.class) ProcessPotentialService pat, BeanManager beanManager) {
@@ -143,7 +141,6 @@ public class JaxrsCDIExtension implements Extension {
addJaxRsExtension(pat);
}
- @SuppressWarnings("rawtypes")
void messageBodyWriter(
@Observes @FiltersOn(types = MessageBodyWriter.class) ProcessPotentialService pat, BeanManager beanManager) {
@@ -151,7 +148,6 @@ public class JaxrsCDIExtension implements Extension {
addJaxRsExtension(pat);
}
- @SuppressWarnings("rawtypes")
void contextResolver(
@Observes @FiltersOn(types = ContextResolver.class) ProcessPotentialService pat, BeanManager beanManager) {
@@ -159,7 +155,6 @@ public class JaxrsCDIExtension implements Extension {
addJaxRsExtension(pat);
}
- @SuppressWarnings("rawtypes")
void exceptionMapper(
@Observes @FiltersOn(types = ExceptionMapper.class) ProcessPotentialService pat, BeanManager beanManager) {
diff --git a/cdi-extension-spi/src/main/java/org/apache/aries/cdi/extension/spi/adapt/FiltersOn.java b/cdi-extension-spi/src/main/java/org/apache/aries/cdi/extension/spi/adapt/FiltersOn.java
index 0266255..df7a22e 100644
--- a/cdi-extension-spi/src/main/java/org/apache/aries/cdi/extension/spi/adapt/FiltersOn.java
+++ b/cdi-extension-spi/src/main/java/org/apache/aries/cdi/extension/spi/adapt/FiltersOn.java
@@ -34,10 +34,12 @@ public @interface FiltersOn {
*/
Class<?>[] types() default {FiltersOn.class};
+ @SuppressWarnings("serial")
class Literal extends AnnotationLiteral<FiltersOn> implements FiltersOn {
public static final Literal INSTANCE = new Literal();
- private final Class[] defaultArray = new Class[0];
+ @SuppressWarnings("unchecked")
+ private final Class<? extends Annotation>[] defaultArray = new Class[0];
@Override
public Class<? extends Annotation>[] annotations() {
diff --git a/cdi-extension-spi/src/main/java/org/apache/aries/cdi/extension/spi/adapt/RegisterExtension.java b/cdi-extension-spi/src/main/java/org/apache/aries/cdi/extension/spi/adapt/RegisterExtension.java
index 45dc444..f291c40 100644
--- a/cdi-extension-spi/src/main/java/org/apache/aries/cdi/extension/spi/adapt/RegisterExtension.java
+++ b/cdi-extension-spi/src/main/java/org/apache/aries/cdi/extension/spi/adapt/RegisterExtension.java
@@ -73,7 +73,9 @@ public class RegisterExtension {
return this;
}
- public ObserverBuilder forAnnotations(final Class<? extends Annotation>... annotations) {
+ public ObserverBuilder forAnnotations(
+ @SuppressWarnings("unchecked") final Class<? extends Annotation>... annotations) {
+
if (annotations.length > 0) {
this.annotations.remove(FiltersOn.class);
}
[aries-cdi] 02/06: bnd 5.1.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git
commit 44ac18a5ebbc9dba5ca5d519b4751360406d5f42
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Thu Jun 4 22:48:50 2020 -0400
bnd 5.1.0
Signed-off-by: Raymond Augé <ro...@apache.org>
---
cdi-itests/owb-itest.bndrun | 3 +--
cdi-itests/weld-itest.bndrun | 3 +--
pom.xml | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/cdi-itests/owb-itest.bndrun b/cdi-itests/owb-itest.bndrun
index 2049646..3b62874 100644
--- a/cdi-itests/owb-itest.bndrun
+++ b/cdi-itests/owb-itest.bndrun
@@ -19,7 +19,7 @@
-runblacklist: \
osgi.identity;filter:='(osgi.identity=*weld*)'
-runbundles: \
- assertj-core;version='[3.16.1,3.16.2)',\
+ biz.aQute.junit;version='[5.1.0,5.1.1)',\
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)',\
@@ -55,7 +55,6 @@
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.servicemix.bundles.junit;version='[4.12.0,4.12.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)',\
diff --git a/cdi-itests/weld-itest.bndrun b/cdi-itests/weld-itest.bndrun
index 586afd7..c0fdb20 100644
--- a/cdi-itests/weld-itest.bndrun
+++ b/cdi-itests/weld-itest.bndrun
@@ -20,7 +20,7 @@
-runblacklist: \
osgi.identity;filter:='(osgi.identity=*owb*)'
-runbundles: \
- assertj-core;version='[3.16.1,3.16.2)',\
+ biz.aQute.junit;version='[5.1.0,5.1.1)',\
jboss-classfilewriter;version='[1.2.4,1.2.5)',\
org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extension.jaxrs;version='[1.1.2,1.1.3)',\
@@ -53,7 +53,6 @@
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.servicemix.bundles.junit;version='[4.12.0,4.12.1)',\
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)',\
diff --git a/pom.xml b/pom.xml
index 46774a5..0ce418d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
<maven.site.deploy.skip>true</maven.site.deploy.skip>
<!-- Versions -->
- <bnd.version>5.0.1</bnd.version>
+ <bnd.version>5.1.0</bnd.version>
<byte.buddy.version>1.10.6</byte.buddy.version>
<jax.rs.whiteboard.version>1.0.6</jax.rs.whiteboard.version>
<jaxb.api.version>2.3.2</jaxb.api.version>
[aries-cdi] 05/06: update to org.eclipse.osgi 3.15.200
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git
commit a4e018d589b0c164b15568f641db467d872f5ebb
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Thu Jun 4 22:53:11 2020 -0400
update to org.eclipse.osgi 3.15.200
Signed-off-by: Raymond Augé <ro...@apache.org>
---
cdi-bom/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cdi-bom/pom.xml b/cdi-bom/pom.xml
index 6ca9a94..9cb39fb 100644
--- a/cdi-bom/pom.xml
+++ b/cdi-bom/pom.xml
@@ -156,7 +156,7 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>3.15.0</version>
+ <version>3.15.200</version>
<scope>runtime</scope>
</dependency>
<dependency>
[aries-cdi] 06/06: add Java 15-ea to build matrix
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git
commit 2315221b4de0b45cb2c5771ae13af957bf1157b4
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Thu Jun 4 22:53:40 2020 -0400
add Java 15-ea to build matrix
Signed-off-by: Raymond Augé <ro...@apache.org>
---
.github/workflows/maven.yml | 8 ++---
cdi-executable/base.bndrun | 3 +-
cdi-extension-mp-config/base-itest.bndrun | 3 +-
cdi-extension-mp-jwt-auth/base-itest.bndrun | 3 +-
cdi-extension-mp-metrics/base-itest.bndrun | 3 +-
cdi-itests/base-itest.bndrun | 3 +-
pom.xml | 56 +++++++++++++++++++++++------
7 files changed, 59 insertions(+), 20 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 03a8e8e..f754326 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -21,7 +21,7 @@ jobs:
JDKxx_Matrix:
strategy:
matrix:
- java: [ 8, 11, 14 ]
+ java: [ 8, 11, 14, 15-ea ]
os: [ ubuntu-latest ]
include:
- os: windows-latest
@@ -38,11 +38,11 @@ jobs:
- name: Build
shell: bash
run: |
- mvn -U -e -B -ntp -X install
+ mvn -U -e -B -ntp install
JDKxx_Matrix-Experimental:
strategy:
matrix:
- java: [ 8, 11, 14 ]
+ java: [ 8, 11, 14, 15-ea ]
os: [ ubuntu-latest ]
include:
- os: windows-latest
@@ -58,4 +58,4 @@ jobs:
java-version: ${{ matrix.java }}
- name: Build
run: |
- mvn -U -e -B -ntp -X install -Pexperimental
+ mvn -U -e -B -ntp install -Pexperimental
diff --git a/cdi-executable/base.bndrun b/cdi-executable/base.bndrun
index 4522c03..fb1f4f4 100644
--- a/cdi-executable/base.bndrun
+++ b/cdi-executable/base.bndrun
@@ -35,7 +35,8 @@
org.slf4j.helpers;version=1.7.28,\
org.slf4j.spi;version=1.7.28,\
sun.invoke,\
- sun.misc
+ sun.misc,\
+ ${bndjava15temorarysupplementalpackages}
-runblacklist.base: \
osgi.identity;filter:='(osgi.identity=biz.aQute.bndlib)'
diff --git a/cdi-extension-mp-config/base-itest.bndrun b/cdi-extension-mp-config/base-itest.bndrun
index b66bd01..b665da8 100644
--- a/cdi-extension-mp-config/base-itest.bndrun
+++ b/cdi-extension-mp-config/base-itest.bndrun
@@ -37,7 +37,8 @@
org.slf4j.helpers;version=1.7.25,\
org.slf4j.spi;version=1.7.25,\
sun.invoke,\
- sun.misc
+ sun.misc,\
+ ${bndjava15temorarysupplementalpackages}
-runrequires.base: \
osgi.identity;filter:='(osgi.identity=${project.artifactId})',\
diff --git a/cdi-extension-mp-jwt-auth/base-itest.bndrun b/cdi-extension-mp-jwt-auth/base-itest.bndrun
index b66bd01..b665da8 100644
--- a/cdi-extension-mp-jwt-auth/base-itest.bndrun
+++ b/cdi-extension-mp-jwt-auth/base-itest.bndrun
@@ -37,7 +37,8 @@
org.slf4j.helpers;version=1.7.25,\
org.slf4j.spi;version=1.7.25,\
sun.invoke,\
- sun.misc
+ sun.misc,\
+ ${bndjava15temorarysupplementalpackages}
-runrequires.base: \
osgi.identity;filter:='(osgi.identity=${project.artifactId})',\
diff --git a/cdi-extension-mp-metrics/base-itest.bndrun b/cdi-extension-mp-metrics/base-itest.bndrun
index b66bd01..b665da8 100644
--- a/cdi-extension-mp-metrics/base-itest.bndrun
+++ b/cdi-extension-mp-metrics/base-itest.bndrun
@@ -37,7 +37,8 @@
org.slf4j.helpers;version=1.7.25,\
org.slf4j.spi;version=1.7.25,\
sun.invoke,\
- sun.misc
+ sun.misc,\
+ ${bndjava15temorarysupplementalpackages}
-runrequires.base: \
osgi.identity;filter:='(osgi.identity=${project.artifactId})',\
diff --git a/cdi-itests/base-itest.bndrun b/cdi-itests/base-itest.bndrun
index 82c7f16..fa4af5c 100644
--- a/cdi-itests/base-itest.bndrun
+++ b/cdi-itests/base-itest.bndrun
@@ -36,7 +36,8 @@
org.slf4j.helpers;version=1.7.25,\
org.slf4j.spi;version=1.7.25,\
sun.invoke,\
- sun.misc
+ sun.misc,\
+ ${bndjava15temorarysupplementalpackages}
-runrequires.base: \
osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.extra)',\
diff --git a/pom.xml b/pom.xml
index 0ce418d..fd6b3b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,51 @@
<slf4j.version>1.7.28</slf4j.version>
<surefire.version>2.12</surefire.version>
<weld.version>3.1.3.Final</weld.version>
+ <bndjava15temorarysupplementalpackages><![CDATA[
+ javax.crypto,
+ javax.crypto.spec,
+ javax.imageio,
+ javax.imageio.stream,
+ javax.management,
+ javax.management.modelmbean,
+ javax.management.remote,
+ javax.naming,
+ javax.naming.directory,
+ javax.naming.ldap,
+ javax.naming.spi,
+ javax.net,
+ javax.net.ssl,
+ javax.rmi.ssl,
+ javax.security.auth,
+ javax.security.auth.callback,
+ javax.security.auth.login,
+ javax.security.auth.x500,
+ javax.sql,
+ javax.swing,
+ javax.swing.border,
+ javax.swing.tree,
+ javax.transaction.xa,
+ javax.xml.datatype,
+ javax.xml.namespace,
+ javax.xml.parsers,
+ javax.xml.stream,
+ javax.xml.stream.events,
+ javax.xml.stream.util,
+ javax.xml.transform,
+ javax.xml.transform.dom,
+ javax.xml.transform.sax,
+ javax.xml.transform.stax,
+ javax.xml.transform.stream,
+ javax.xml.validation,
+ javax.xml.xpath,
+ org.ietf.jgss,
+ org.w3c.dom,
+ org.w3c.dom.bootstrap,
+ org.w3c.dom.ls,
+ org.xml.sax,
+ org.xml.sax.ext,
+ org.xml.sax.helpers
+ ]]></bndjava15temorarysupplementalpackages>
</properties>
<licenses>
@@ -316,17 +361,6 @@
</releases>
</repository>
</repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>bnd-snapshots</id>
- <url>https://bndtools.jfrog.io/bndtools/libs-snapshot/</url>
- <layout>default</layout>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
</profile>
<profile>
[aries-cdi] 04/06: update to Aries spifly 1.3.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git
commit 1e78a0d06a5d1c192e02dfbad40f5000f7393ba3
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Thu Jun 4 22:52:38 2020 -0400
update to Aries spifly 1.3.0
Signed-off-by: Raymond Augé <ro...@apache.org>
---
cdi-bom/pom.xml | 2 +-
cdi-executable/owb-executable.bndrun | 2 +-
cdi-executable/weld-executable.bndrun | 2 +-
cdi-extension-mp-config/owb-itest.bndrun | 2 +-
cdi-extension-mp-config/weld-itest.bndrun | 2 +-
cdi-extension-mp-jwt-auth/owb-itest.bndrun | 2 +-
cdi-extension-mp-jwt-auth/weld-itest.bndrun | 2 +-
cdi-extension-mp-metrics/owb-itest.bndrun | 2 +-
cdi-extension-mp-metrics/weld-itest.bndrun | 2 +-
cdi-itests/owb-itest.bndrun | 2 +-
cdi-itests/weld-itest.bndrun | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/cdi-bom/pom.xml b/cdi-bom/pom.xml
index a5c8792..6ca9a94 100644
--- a/cdi-bom/pom.xml
+++ b/cdi-bom/pom.xml
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.framework.extension</artifactId>
- <version>1.2.4</version>
+ <version>1.3.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/cdi-executable/owb-executable.bndrun b/cdi-executable/owb-executable.bndrun
index 194b2de..ced5da2 100644
--- a/cdi-executable/owb-executable.bndrun
+++ b/cdi-executable/owb-executable.bndrun
@@ -27,7 +27,7 @@
org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.owb;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.4,1.2.5)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.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)',\
diff --git a/cdi-executable/weld-executable.bndrun b/cdi-executable/weld-executable.bndrun
index 2a7dce1..33e88c8 100644
--- a/cdi-executable/weld-executable.bndrun
+++ b/cdi-executable/weld-executable.bndrun
@@ -27,7 +27,7 @@
org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.weld;version='[1.1.2,1.1.3)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.4,1.2.5)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.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)',\
diff --git a/cdi-extension-mp-config/owb-itest.bndrun b/cdi-extension-mp-config/owb-itest.bndrun
index 0587758..2865cb3 100644
--- a/cdi-extension-mp-config/owb-itest.bndrun
+++ b/cdi-extension-mp-config/owb-itest.bndrun
@@ -28,7 +28,7 @@
org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.owb;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.4,1.2.5)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.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)',\
diff --git a/cdi-extension-mp-config/weld-itest.bndrun b/cdi-extension-mp-config/weld-itest.bndrun
index b95ca15..dd108fd 100644
--- a/cdi-extension-mp-config/weld-itest.bndrun
+++ b/cdi-extension-mp-config/weld-itest.bndrun
@@ -28,7 +28,7 @@
org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.weld;version='[1.1.2,1.1.3)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.4,1.2.5)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.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)',\
diff --git a/cdi-extension-mp-jwt-auth/owb-itest.bndrun b/cdi-extension-mp-jwt-auth/owb-itest.bndrun
index 66bab0a..79241c0 100644
--- a/cdi-extension-mp-jwt-auth/owb-itest.bndrun
+++ b/cdi-extension-mp-jwt-auth/owb-itest.bndrun
@@ -36,7 +36,7 @@
org.apache.aries.cdi.owb;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
org.apache.aries.jax.rs.whiteboard;version='[1.0.7,1.0.8)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.4,1.2.5)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.1)',\
org.apache.commons.io;version='[2.6.0,2.6.1)',\
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-jwt-auth/weld-itest.bndrun b/cdi-extension-mp-jwt-auth/weld-itest.bndrun
index c455026..1859914 100644
--- a/cdi-extension-mp-jwt-auth/weld-itest.bndrun
+++ b/cdi-extension-mp-jwt-auth/weld-itest.bndrun
@@ -34,7 +34,7 @@
org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.weld;version='[1.1.2,1.1.3)',\
org.apache.aries.jax.rs.whiteboard;version='[1.0.7,1.0.8)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.4,1.2.5)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.1)',\
org.apache.commons.io;version='[2.6.0,2.6.1)',\
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-metrics/owb-itest.bndrun b/cdi-extension-mp-metrics/owb-itest.bndrun
index d28958d..ee35bb1 100644
--- a/cdi-extension-mp-metrics/owb-itest.bndrun
+++ b/cdi-extension-mp-metrics/owb-itest.bndrun
@@ -30,7 +30,7 @@
org.apache.aries.cdi.owb;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
org.apache.aries.jax.rs.whiteboard;version='[1.0.7,1.0.8)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.4,1.2.5)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.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)',\
diff --git a/cdi-extension-mp-metrics/weld-itest.bndrun b/cdi-extension-mp-metrics/weld-itest.bndrun
index 6c8f21c..d31b3e8 100644
--- a/cdi-extension-mp-metrics/weld-itest.bndrun
+++ b/cdi-extension-mp-metrics/weld-itest.bndrun
@@ -30,7 +30,7 @@
org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.weld;version='[1.1.2,1.1.3)',\
org.apache.aries.jax.rs.whiteboard;version='[1.0.7,1.0.8)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.4,1.2.5)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.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)',\
diff --git a/cdi-itests/owb-itest.bndrun b/cdi-itests/owb-itest.bndrun
index 3b62874..af2d5ca 100644
--- a/cdi-itests/owb-itest.bndrun
+++ b/cdi-itests/owb-itest.bndrun
@@ -37,7 +37,7 @@
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.4,1.2.5)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.1)',\
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)',\
diff --git a/cdi-itests/weld-itest.bndrun b/cdi-itests/weld-itest.bndrun
index c0fdb20..23a1cb4 100644
--- a/cdi-itests/weld-itest.bndrun
+++ b/cdi-itests/weld-itest.bndrun
@@ -35,7 +35,7 @@
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.4,1.2.5)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.1)',\
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)',\
[aries-cdi] 03/06: always keep sorted order for resolved -runbundles
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git
commit 8e76445c77043dfec0cbb97756cd878de36f5853
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Thu Jun 4 22:50:43 2020 -0400
always keep sorted order for resolved -runbundles
Signed-off-by: Raymond Augé <ro...@apache.org>
---
cdi-executable/base.bndrun | 4 ++++
cdi-extension-mp-config/base-itest.bndrun | 6 +++++-
cdi-extension-mp-config/owb-itest.bndrun | 2 +-
cdi-extension-mp-config/weld-itest.bndrun | 2 +-
cdi-extension-mp-jwt-auth/base-itest.bndrun | 6 +++++-
cdi-extension-mp-jwt-auth/owb-itest.bndrun | 2 +-
cdi-extension-mp-jwt-auth/weld-itest.bndrun | 2 +-
cdi-extension-mp-metrics/base-itest.bndrun | 6 +++++-
cdi-extension-mp-metrics/owb-itest.bndrun | 2 +-
cdi-extension-mp-metrics/weld-itest.bndrun | 2 +-
cdi-itests/base-itest.bndrun | 4 ++++
11 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/cdi-executable/base.bndrun b/cdi-executable/base.bndrun
index 97f6c76..4522c03 100644
--- a/cdi-executable/base.bndrun
+++ b/cdi-executable/base.bndrun
@@ -39,3 +39,7 @@
-runblacklist.base: \
osgi.identity;filter:='(osgi.identity=biz.aQute.bndlib)'
+
+-runstartlevel: \
+ order=sortbynameversion,\
+ begin=-1
diff --git a/cdi-extension-mp-config/base-itest.bndrun b/cdi-extension-mp-config/base-itest.bndrun
index 389b414..b66bd01 100644
--- a/cdi-extension-mp-config/base-itest.bndrun
+++ b/cdi-extension-mp-config/base-itest.bndrun
@@ -45,4 +45,8 @@
osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)'
-runblacklist.base: \
- osgi.identity;filter:='(osgi.identity=biz.aQute.bndlib)'
\ No newline at end of file
+ osgi.identity;filter:='(osgi.identity=biz.aQute.bndlib)'
+
+-runstartlevel: \
+ order=sortbynameversion,\
+ begin=-1
diff --git a/cdi-extension-mp-config/owb-itest.bndrun b/cdi-extension-mp-config/owb-itest.bndrun
index 2aba2a8..0587758 100644
--- a/cdi-extension-mp-config/owb-itest.bndrun
+++ b/cdi-extension-mp-config/owb-itest.bndrun
@@ -23,8 +23,8 @@
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.2,1.1.3)',\
- org.apache.aries.cdi.extension.mp-config-tests;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extension.mp-config;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.mp-config-tests;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.owb;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
diff --git a/cdi-extension-mp-config/weld-itest.bndrun b/cdi-extension-mp-config/weld-itest.bndrun
index 9f54851..b95ca15 100644
--- a/cdi-extension-mp-config/weld-itest.bndrun
+++ b/cdi-extension-mp-config/weld-itest.bndrun
@@ -23,8 +23,8 @@
assertj-core;version='[3.16.1,3.16.2)',\
jboss-classfilewriter;version='[1.2.4,1.2.5)',\
org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.extension.mp-config-tests;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extension.mp-config;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.mp-config-tests;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.weld;version='[1.1.2,1.1.3)',\
diff --git a/cdi-extension-mp-jwt-auth/base-itest.bndrun b/cdi-extension-mp-jwt-auth/base-itest.bndrun
index 389b414..b66bd01 100644
--- a/cdi-extension-mp-jwt-auth/base-itest.bndrun
+++ b/cdi-extension-mp-jwt-auth/base-itest.bndrun
@@ -45,4 +45,8 @@
osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)'
-runblacklist.base: \
- osgi.identity;filter:='(osgi.identity=biz.aQute.bndlib)'
\ No newline at end of file
+ osgi.identity;filter:='(osgi.identity=biz.aQute.bndlib)'
+
+-runstartlevel: \
+ order=sortbynameversion,\
+ begin=-1
diff --git a/cdi-extension-mp-jwt-auth/owb-itest.bndrun b/cdi-extension-mp-jwt-auth/owb-itest.bndrun
index 48c6522..66bab0a 100644
--- a/cdi-extension-mp-jwt-auth/owb-itest.bndrun
+++ b/cdi-extension-mp-jwt-auth/owb-itest.bndrun
@@ -27,8 +27,8 @@
org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extension.jaxrs;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extension.mp-config;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.extension.mp-jwt-auth-tests;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extension.mp-jwt-auth;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.mp-jwt-auth-tests;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extension.servlet.common;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extension.servlet.owb;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
diff --git a/cdi-extension-mp-jwt-auth/weld-itest.bndrun b/cdi-extension-mp-jwt-auth/weld-itest.bndrun
index 41ad983..c455026 100644
--- a/cdi-extension-mp-jwt-auth/weld-itest.bndrun
+++ b/cdi-extension-mp-jwt-auth/weld-itest.bndrun
@@ -25,8 +25,8 @@
org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extension.jaxrs;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extension.mp-config;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.extension.mp-jwt-auth-tests;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extension.mp-jwt-auth;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.mp-jwt-auth-tests;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extension.servlet.common;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extension.servlet.weld;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
diff --git a/cdi-extension-mp-metrics/base-itest.bndrun b/cdi-extension-mp-metrics/base-itest.bndrun
index 389b414..b66bd01 100644
--- a/cdi-extension-mp-metrics/base-itest.bndrun
+++ b/cdi-extension-mp-metrics/base-itest.bndrun
@@ -45,4 +45,8 @@
osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)'
-runblacklist.base: \
- osgi.identity;filter:='(osgi.identity=biz.aQute.bndlib)'
\ No newline at end of file
+ osgi.identity;filter:='(osgi.identity=biz.aQute.bndlib)'
+
+-runstartlevel: \
+ order=sortbynameversion,\
+ begin=-1
diff --git a/cdi-extension-mp-metrics/owb-itest.bndrun b/cdi-extension-mp-metrics/owb-itest.bndrun
index b63e21d..d28958d 100644
--- a/cdi-extension-mp-metrics/owb-itest.bndrun
+++ b/cdi-extension-mp-metrics/owb-itest.bndrun
@@ -23,8 +23,8 @@
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.2,1.1.3)',\
- org.apache.aries.cdi.extension.mp-metrics-tests;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extension.mp-metrics;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.mp-metrics-tests;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extra;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.owb;version='[1.1.2,1.1.3)',\
diff --git a/cdi-extension-mp-metrics/weld-itest.bndrun b/cdi-extension-mp-metrics/weld-itest.bndrun
index 48a29d3..6c8f21c 100644
--- a/cdi-extension-mp-metrics/weld-itest.bndrun
+++ b/cdi-extension-mp-metrics/weld-itest.bndrun
@@ -23,8 +23,8 @@
assertj-core;version='[3.16.1,3.16.2)',\
jboss-classfilewriter;version='[1.2.4,1.2.5)',\
org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
- org.apache.aries.cdi.extension.mp-metrics-tests;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extension.mp-metrics;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.mp-metrics-tests;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.extra;version='[1.1.2,1.1.3)',\
org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
diff --git a/cdi-itests/base-itest.bndrun b/cdi-itests/base-itest.bndrun
index c7642e2..82c7f16 100644
--- a/cdi-itests/base-itest.bndrun
+++ b/cdi-itests/base-itest.bndrun
@@ -46,3 +46,7 @@
-runblacklist.base: \
osgi.identity;filter:='(osgi.identity=biz.aQute.bndlib)'
+
+-runstartlevel: \
+ order=sortbynameversion,\
+ begin=-1