From 37562e99ff7af3e8af86f2077bbdf9e063845e34 Mon Sep 17 00:00:00 2001 From: Mark Hoffmann Date: Tue, 30 Jul 2024 15:27:24 +0200 Subject: [PATCH] Fixed bndruns Signed-off-by: Mark Hoffmann --- org.gecko.emf.converter.tests/test.bndrun | 18 ++++----------- org.gecko.emf.csv.tests/test.bndrun | 22 +++++++------------ org.gecko.emf.exporter.csv.tests/test.bndrun | 18 +++++---------- org.gecko.emf.exporter.ods.tests/test.bndrun | 22 +++++++------------ .../test.bndrun | 17 +++++--------- org.gecko.emf.exporter.xlsx.tests/test.bndrun | 18 +++++---------- org.gecko.emf.json.tests/test.bndrun | 15 ++++--------- org.gecko.emf.ods.tests/test.bndrun | 22 ++++++------------- org.gecko.emf.r_lang.tests/test.bndrun | 18 +++++---------- org.gecko.emf.xlsx.tests/test.bndrun | 19 ++++++---------- org.gecko.qvt.osgi.tests/test.bndrun | 8 +++---- 11 files changed, 65 insertions(+), 132 deletions(-) diff --git a/org.gecko.emf.converter.tests/test.bndrun b/org.gecko.emf.converter.tests/test.bndrun index ad6207c..3916b3b 100644 --- a/org.gecko.emf.converter.tests/test.bndrun +++ b/org.gecko.emf.converter.tests/test.bndrun @@ -6,15 +6,6 @@ -library: enableOSGi-Test --runrepos: \ - Central,\ - Local,\ - Temp,\ - GeckoEMF Dependencies,\ - Jacoco Dependencies,\ - Workspace,\ - OSGi-Test Dependencies - -runee: JavaSE-17 -runtrace: true @@ -45,12 +36,11 @@ assertj-core;version='[3.24.2,3.24.3)',\ net.bytebuddy.byte-buddy;version='[1.14.9,1.14.10)',\ slf4j.api;version='[1.7.36,1.7.37)',\ - slf4j.simple;version='[1.7.36,1.7.37)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ - org.eclipse.emf.ecore.xmi;version='[2.36.0,2.36.1)',\ org.gecko.emf.converter.model;version=snapshot,\ - org.gecko.emf.osgi.component.minimal;version='[6.1.1,6.1.2)',\ - org.osgi.service.cm;version='[1.6.1,1.6.2)',\ org.osgi.service.component;version='[1.5.1,1.5.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - org.osgi.util.converter;version='[1.0.9,1.0.10)' + org.osgi.util.converter;version='[1.0.9,1.0.10)',\ + org.apache.commons.logging;version='[1.2.0,1.2.1)',\ + org.gecko.emf.osgi.api;version='[6.2.0,6.2.1)',\ + slf4j.jcl;version='[1.7.36,1.7.37)' diff --git a/org.gecko.emf.csv.tests/test.bndrun b/org.gecko.emf.csv.tests/test.bndrun index 836fde1..b67b5db 100644 --- a/org.gecko.emf.csv.tests/test.bndrun +++ b/org.gecko.emf.csv.tests/test.bndrun @@ -6,15 +6,6 @@ -library: enableOSGi-Test --runrepos: \ - Central,\ - Local,\ - Temp,\ - GeckoEMF Dependencies,\ - Jacoco Dependencies,\ - Workspace,\ - OSGi-Test Dependencies - -runee: JavaSE-17 -runtrace: true @@ -52,13 +43,16 @@ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ de.siegmar.fastcsv;version='[3.0.0,3.0.1)',\ - org.apache.commons.commons-compress;version='[1.21.0,1.21.1)',\ - org.apache.servicemix.bundles.poi;version='[5.2.2,5.2.3)',\ org.eclipse.emf.common;version='[2.29.0,2.29.1)',\ org.eclipse.emf.ecore;version='[2.35.0,2.35.1)',\ org.eclipse.emf.ecore.xmi;version='[2.36.0,2.36.1)',\ - org.gecko.emf.osgi.component.minimal;version='[6.1.1,6.1.2)',\ org.gecko.emf.osgi.example.model.basic;version='[6.1.0,6.1.1)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ - slf4j.simple;version='[1.7.36,1.7.37)',\ - org.osgi.util.converter;version='[1.0.9,1.0.10)' + org.osgi.util.converter;version='[1.0.9,1.0.10)',\ + com.github.miachm.sods;version='[1.6.2,1.6.3)',\ + org.apache.commons.logging;version='[1.2.0,1.2.1)',\ + org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ + org.gecko.emf.exporter.ods;version=snapshot,\ + org.gecko.emf.osgi.api;version='[6.2.0,6.2.1)',\ + org.gecko.emf.osgi.component.minimal;version='[6.2.0,6.2.1)',\ + slf4j.jcl;version='[1.7.36,1.7.37)' diff --git a/org.gecko.emf.exporter.csv.tests/test.bndrun b/org.gecko.emf.exporter.csv.tests/test.bndrun index 8c751bd..95747d4 100644 --- a/org.gecko.emf.exporter.csv.tests/test.bndrun +++ b/org.gecko.emf.exporter.csv.tests/test.bndrun @@ -6,15 +6,6 @@ -library: enableOSGi-Test --runrepos: \ - Central,\ - Local,\ - Temp,\ - GeckoEMF Dependencies,\ - Jacoco Dependencies,\ - Workspace,\ - OSGi-Test Dependencies - -runee: JavaSE-17 -runtrace: true @@ -58,9 +49,12 @@ org.eclipse.emf.common;version='[2.29.0,2.29.1)',\ org.eclipse.emf.ecore;version='[2.35.0,2.35.1)',\ org.eclipse.emf.ecore.xmi;version='[2.36.0,2.36.1)',\ - org.gecko.emf.osgi.component.minimal;version='[6.1.1,6.1.2)',\ org.gecko.emf.osgi.example.model.basic;version='[6.1.0,6.1.1)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ de.siegmar.fastcsv;version='[3.0.0,3.0.1)',\ - slf4j.simple;version='[1.7.36,1.7.37)',\ - org.osgi.util.converter;version='[1.0.9,1.0.10)' + org.osgi.util.converter;version='[1.0.9,1.0.10)',\ + org.apache.commons.logging;version='[1.2.0,1.2.1)',\ + org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ + org.gecko.emf.osgi.api;version='[6.2.0,6.2.1)',\ + org.gecko.emf.osgi.component.minimal;version='[6.2.0,6.2.1)',\ + slf4j.jcl;version='[1.7.36,1.7.37)' diff --git a/org.gecko.emf.exporter.ods.tests/test.bndrun b/org.gecko.emf.exporter.ods.tests/test.bndrun index 948bb6d..5f6e8c0 100644 --- a/org.gecko.emf.exporter.ods.tests/test.bndrun +++ b/org.gecko.emf.exporter.ods.tests/test.bndrun @@ -6,15 +6,6 @@ -library: enableOSGi-Test --runrepos: \ - Central,\ - Local,\ - Temp,\ - GeckoEMF Dependencies,\ - Jacoco Dependencies,\ - Workspace,\ - OSGi-Test Dependencies - -runee: JavaSE-17 -runtrace: true @@ -57,10 +48,13 @@ org.eclipse.emf.common;version='[2.29.0,2.29.1)',\ org.eclipse.emf.ecore;version='[2.35.0,2.35.1)',\ org.eclipse.emf.ecore.xmi;version='[2.36.0,2.36.1)',\ - org.gecko.emf.osgi.component.minimal;version='[6.1.1,6.1.2)',\ org.gecko.emf.osgi.example.model.basic;version='[6.1.0,6.1.1)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ - org.gecko.com.github.miachm.sods;version=snapshot,\ - slf4j.simple;version='[1.7.36,1.7.37)',\ - org.osgi.util.converter;version='[1.0.9,1.0.10)' --resolve: auto \ No newline at end of file + org.osgi.util.converter;version='[1.0.9,1.0.10)',\ + com.github.miachm.sods;version='[1.6.2,1.6.3)',\ + org.apache.commons.logging;version='[1.2.0,1.2.1)',\ + org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ + org.gecko.emf.osgi.api;version='[6.2.0,6.2.1)',\ + org.gecko.emf.osgi.component.minimal;version='[6.2.0,6.2.1)',\ + slf4j.jcl;version='[1.7.36,1.7.37)' +-resolve: manual \ No newline at end of file diff --git a/org.gecko.emf.exporter.r_lang.tests/test.bndrun b/org.gecko.emf.exporter.r_lang.tests/test.bndrun index 8bc7886..22c143f 100644 --- a/org.gecko.emf.exporter.r_lang.tests/test.bndrun +++ b/org.gecko.emf.exporter.r_lang.tests/test.bndrun @@ -6,15 +6,6 @@ -library: enableOSGi-Test --runrepos: \ - Central,\ - Local,\ - Temp,\ - GeckoEMF Dependencies,\ - Jacoco Dependencies,\ - Workspace,\ - OSGi-Test Dependencies - -runee: JavaSE-17 -runtrace: true @@ -66,8 +57,10 @@ org.eclipse.emf.common;version='[2.29.0,2.29.1)',\ org.eclipse.emf.ecore;version='[2.35.0,2.35.1)',\ org.eclipse.emf.ecore.xmi;version='[2.36.0,2.36.1)',\ - org.gecko.emf.osgi.component.minimal;version='[6.1.1,6.1.2)',\ org.gecko.emf.osgi.example.model.basic;version='[6.1.0,6.1.1)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ - slf4j.simple;version='[1.7.36,1.7.37)',\ - org.osgi.util.converter;version='[1.0.9,1.0.10)' + org.osgi.util.converter;version='[1.0.9,1.0.10)',\ + org.apache.commons.logging;version='[1.2.0,1.2.1)',\ + org.gecko.emf.osgi.api;version='[6.2.0,6.2.1)',\ + org.gecko.emf.osgi.component.minimal;version='[6.2.0,6.2.1)',\ + slf4j.jcl;version='[1.7.36,1.7.37)' diff --git a/org.gecko.emf.exporter.xlsx.tests/test.bndrun b/org.gecko.emf.exporter.xlsx.tests/test.bndrun index 95a078f..e2ecab5 100644 --- a/org.gecko.emf.exporter.xlsx.tests/test.bndrun +++ b/org.gecko.emf.exporter.xlsx.tests/test.bndrun @@ -6,15 +6,6 @@ -library: enableOSGi-Test --runrepos: \ - Central,\ - Local,\ - Temp,\ - GeckoEMF Dependencies,\ - Jacoco Dependencies,\ - Workspace,\ - OSGi-Test Dependencies - -runee: JavaSE-17 -runtrace: true @@ -62,8 +53,11 @@ org.eclipse.emf.common;version='[2.29.0,2.29.1)',\ org.eclipse.emf.ecore;version='[2.35.0,2.35.1)',\ org.eclipse.emf.ecore.xmi;version='[2.36.0,2.36.1)',\ - org.gecko.emf.osgi.component.minimal;version='[6.1.1,6.1.2)',\ org.gecko.emf.osgi.example.model.basic;version='[6.1.0,6.1.1)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ - slf4j.simple;version='[1.7.36,1.7.37)',\ - org.osgi.util.converter;version='[1.0.9,1.0.10)' + org.osgi.util.converter;version='[1.0.9,1.0.10)',\ + org.apache.commons.logging;version='[1.2.0,1.2.1)',\ + org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ + org.gecko.emf.osgi.api;version='[6.2.0,6.2.1)',\ + org.gecko.emf.osgi.component.minimal;version='[6.2.0,6.2.1)',\ + slf4j.jcl;version='[1.7.36,1.7.37)' diff --git a/org.gecko.emf.json.tests/test.bndrun b/org.gecko.emf.json.tests/test.bndrun index 8500d0a..61fb693 100644 --- a/org.gecko.emf.json.tests/test.bndrun +++ b/org.gecko.emf.json.tests/test.bndrun @@ -5,15 +5,6 @@ -library: enableOSGi-Test --runrepos: \ - Central,\ - Local,\ - Temp,\ - GeckoEMF Dependencies,\ - Jacoco Dependencies,\ - Workspace,\ - OSGi-Test Dependencies - -runee: JavaSE-17 -runtrace: true @@ -56,7 +47,9 @@ org.eclipse.emf.common;version='[2.29.0,2.29.1)',\ org.eclipse.emf.ecore;version='[2.35.0,2.35.1)',\ org.eclipse.emf.ecore.xmi;version='[2.36.0,2.36.1)',\ - org.gecko.emf.osgi.component.minimal;version='[6.1.1,6.1.2)',\ org.gecko.emf.osgi.example.model.basic;version='[6.1.0,6.1.1)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ - org.osgi.util.converter;version='[1.0.9,1.0.10)' + org.osgi.util.converter;version='[1.0.9,1.0.10)',\ + org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ + org.gecko.emf.osgi.api;version='[6.2.0,6.2.1)',\ + org.gecko.emf.osgi.component.minimal;version='[6.2.0,6.2.1)' diff --git a/org.gecko.emf.ods.tests/test.bndrun b/org.gecko.emf.ods.tests/test.bndrun index 5d44622..c432dd0 100644 --- a/org.gecko.emf.ods.tests/test.bndrun +++ b/org.gecko.emf.ods.tests/test.bndrun @@ -5,15 +5,6 @@ -library: enableOSGi-Test --runrepos: \ - Central,\ - Local,\ - Temp,\ - GeckoEMF Dependencies,\ - Jacoco Dependencies,\ - Workspace,\ - OSGi-Test Dependencies - -runee: JavaSE-17 -runtrace: true @@ -52,11 +43,12 @@ org.eclipse.emf.common;version='[2.29.0,2.29.1)',\ org.eclipse.emf.ecore;version='[2.35.0,2.35.1)',\ org.eclipse.emf.ecore.xmi;version='[2.36.0,2.36.1)',\ - org.gecko.emf.osgi.component.minimal;version='[6.1.1,6.1.2)',\ org.gecko.emf.osgi.example.model.basic;version='[6.1.0,6.1.1)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ - org.apache.commons.commons-compress;version='[1.21.0,1.21.1)',\ - org.apache.servicemix.bundles.poi;version='[5.2.2,5.2.3)',\ - org.gecko.com.github.miachm.sods;version=snapshot,\ - slf4j.simple;version='[1.7.36,1.7.37)',\ - org.osgi.util.converter;version='[1.0.9,1.0.10)' + org.osgi.util.converter;version='[1.0.9,1.0.10)',\ + com.github.miachm.sods;version='[1.6.2,1.6.3)',\ + org.apache.commons.logging;version='[1.2.0,1.2.1)',\ + org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ + org.gecko.emf.osgi.api;version='[6.2.0,6.2.1)',\ + org.gecko.emf.osgi.component.minimal;version='[6.2.0,6.2.1)',\ + slf4j.jcl;version='[1.7.36,1.7.37)' diff --git a/org.gecko.emf.r_lang.tests/test.bndrun b/org.gecko.emf.r_lang.tests/test.bndrun index 2056ac6..9b60dfa 100644 --- a/org.gecko.emf.r_lang.tests/test.bndrun +++ b/org.gecko.emf.r_lang.tests/test.bndrun @@ -6,15 +6,6 @@ -library: enableOSGi-Test --runrepos: \ - Central,\ - Local,\ - Temp,\ - GeckoEMF Dependencies,\ - Jacoco Dependencies,\ - Workspace,\ - OSGi-Test Dependencies - -runee: JavaSE-17 -runtrace: true @@ -57,8 +48,11 @@ org.eclipse.emf.common;version='[2.29.0,2.29.1)',\ org.eclipse.emf.ecore;version='[2.35.0,2.35.1)',\ org.eclipse.emf.ecore.xmi;version='[2.36.0,2.36.1)',\ - org.gecko.emf.osgi.component.minimal;version='[6.1.1,6.1.2)',\ org.gecko.emf.osgi.example.model.basic;version='[6.1.0,6.1.1)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ - slf4j.simple;version='[1.7.36,1.7.37)',\ - org.osgi.util.converter;version='[1.0.9,1.0.10)' + org.osgi.util.converter;version='[1.0.9,1.0.10)',\ + org.apache.commons.logging;version='[1.2.0,1.2.1)',\ + org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ + org.gecko.emf.osgi.api;version='[6.2.0,6.2.1)',\ + org.gecko.emf.osgi.component.minimal;version='[6.2.0,6.2.1)',\ + slf4j.jcl;version='[1.7.36,1.7.37)' diff --git a/org.gecko.emf.xlsx.tests/test.bndrun b/org.gecko.emf.xlsx.tests/test.bndrun index 8c65bd6..dbe2cc8 100644 --- a/org.gecko.emf.xlsx.tests/test.bndrun +++ b/org.gecko.emf.xlsx.tests/test.bndrun @@ -5,15 +5,6 @@ -library: enableOSGi-Test --runrepos: \ - Central,\ - Local,\ - Temp,\ - GeckoEMF Dependencies,\ - Jacoco Dependencies,\ - Workspace,\ - OSGi-Test Dependencies - -runee: JavaSE-17 -runtrace: true @@ -57,8 +48,12 @@ org.eclipse.emf.common;version='[2.29.0,2.29.1)',\ org.eclipse.emf.ecore;version='[2.35.0,2.35.1)',\ org.eclipse.emf.ecore.xmi;version='[2.36.0,2.36.1)',\ - org.gecko.emf.osgi.component.minimal;version='[6.1.1,6.1.2)',\ org.gecko.emf.osgi.example.model.basic;version='[6.1.0,6.1.1)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ - slf4j.simple;version='[1.7.36,1.7.37)',\ - org.osgi.util.converter;version='[1.0.9,1.0.10)' \ No newline at end of file + org.osgi.util.converter;version='[1.0.9,1.0.10)',\ + com.github.miachm.sods;version='[1.6.2,1.6.3)',\ + org.apache.commons.logging;version='[1.2.0,1.2.1)',\ + org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ + org.gecko.emf.osgi.api;version='[6.2.0,6.2.1)',\ + org.gecko.emf.osgi.component.minimal;version='[6.2.0,6.2.1)',\ + slf4j.jcl;version='[1.7.36,1.7.37)' \ No newline at end of file diff --git a/org.gecko.qvt.osgi.tests/test.bndrun b/org.gecko.qvt.osgi.tests/test.bndrun index f63bee0..42da718 100644 --- a/org.gecko.qvt.osgi.tests/test.bndrun +++ b/org.gecko.qvt.osgi.tests/test.bndrun @@ -52,11 +52,11 @@ org.eclipse.emf.common;version='[2.29.0,2.29.1)',\ org.eclipse.emf.ecore;version='[2.35.0,2.35.1)',\ org.eclipse.emf.ecore.xmi;version='[2.36.0,2.36.1)',\ - org.gecko.emf.osgi.api;version='[6.1.1,6.1.2)',\ - org.gecko.emf.osgi.component.minimal;version='[6.1.1,6.1.2)',\ org.gecko.emf.osgi.example.model.basic;version='[6.1.0,6.1.1)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ - org.gecko.emf.osgi.component.config;version='[6.1.1,6.1.2)',\ de.dim.eclipse.core.runtime;version='[3.14.0,3.14.1)',\ de.dim.equinox.common;version='[3.9.0,3.9.1)',\ - org.eclipse.core.runtime;version='[3.14.0,3.14.1)' + org.eclipse.core.runtime;version='[3.14.0,3.14.1)',\ + org.gecko.emf.osgi.api;version='[6.2.0,6.2.1)',\ + org.gecko.emf.osgi.component.minimal;version='[6.2.0,6.2.1)',\ + org.gecko.qvt.osgi.api;version=snapshot