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:31 UTC
[aries-cdi] 03/06: always keep sorted order for resolved -runbundles
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