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:41 UTC
[aries-cdi] 22/27: use a base bndrun to avoid duplication
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 874aaab50a52c319efff7195a3c0f2bf73e0c9e8
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Sun Nov 24 15:54:52 2019 -0500
use a base bndrun to avoid duplication
Signed-off-by: Raymond Augé <ro...@apache.org>
---
cdi-itests/base-itest.bndrun | 38 ++++++++++++++++++++++++++++++++++++++
cdi-itests/owb-itest.bndrun | 25 +------------------------
cdi-itests/weld-itest.bndrun | 18 +-----------------
3 files changed, 40 insertions(+), 41 deletions(-)
diff --git a/cdi-itests/base-itest.bndrun b/cdi-itests/base-itest.bndrun
new file mode 100644
index 0000000..cbf4ddb
--- /dev/null
+++ b/cdi-itests/base-itest.bndrun
@@ -0,0 +1,38 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#-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=,\
+ tck.config.test.javaconfig.converter.stringvalues=foo
+
+-resolve.effective: resolve, active
+
+-runpath: \
+ ch.qos.logback.classic,\
+ ch.qos.logback.core,\
+ org.apache.felix.logback,\
+ slf4j.api
+
+-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
diff --git a/cdi-itests/owb-itest.bndrun b/cdi-itests/owb-itest.bndrun
index 7636162..183d25f 100644
--- a/cdi-itests/owb-itest.bndrun
+++ b/cdi-itests/owb-itest.bndrun
@@ -10,19 +10,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+-include: base-itest.bndrun
#-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=org.apache.aries.cdi.owb)',\
osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.itests)',\
@@ -33,19 +23,6 @@
osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.weld)',\
osgi.identity;filter:='(osgi.identity=org.jboss.spec.*)'
--runpath: \
- ch.qos.logback.classic,\
- ch.qos.logback.core,\
- org.apache.felix.logback,\
- slf4j.api
-
--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.servlet.jsp-api;version='[2.3.3,2.3.4)',\
diff --git a/cdi-itests/weld-itest.bndrun b/cdi-itests/weld-itest.bndrun
index 3b4c242..e452bf3 100644
--- a/cdi-itests/weld-itest.bndrun
+++ b/cdi-itests/weld-itest.bndrun
@@ -10,19 +10,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+-include: base-itest.bndrun
#-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)',\
osgi.identity;filter:='(osgi.identity=javax.transaction-api)',\
@@ -35,12 +25,6 @@
osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.owb)',\
osgi.identity;filter:='(osgi.identity=org.jboss.spec.*)'
--runpath: \
- ch.qos.logback.classic,\
- ch.qos.logback.core,\
- org.apache.felix.logback,\
- slf4j.api
-
-runsystempackages: \
org.slf4j;version=1.7.25,\
org.slf4j.event;version=1.7.25,\