Clean up

- fix missing dependecies

Signed-off-by: Mark Hoffmann <m.hoffmann@data-in-motion.biz>

org.gecko.playground.ds.config/bnd.bnd

@@ -1,5 +1,5 @@
 -buildpath: \
-	org.osgi.service.cm,\
+	org.osgi.service.cm;version=latest,\
 	org.osgi.util.promise;version='1.3.0.202212101352'
 
 -sub: *.bnd

org.gecko.playground.ds.config/launch-config.bndrun

@@ -5,7 +5,8 @@
 	bnd.identity;id='org.apache.felix.gogo.shell',\
 	bnd.identity;id='org.apache.felix.configadmin',\
 	bnd.identity;id='org.eclipse.parsson.jakarta.json',\
-	bnd.identity;id='org.gecko.playground.ds.config.configadmin'
+	bnd.identity;id='org.gecko.playground.ds.config.configadmin',\
+	bnd.identity;id='org.gecko.playground.ds.config.configurator'
 -runbundles: \
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.gogo.command;version='[1.1.2,1.1.3)',\
@@ -15,5 +16,9 @@
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
-	org.eclipse.parsson.jakarta.json;version='[1.1.1,1.1.2)',\
-	org.gecko.playground.ds.config.configadmin;version=snapshot
+	org.gecko.playground.ds.config.configadmin;version=snapshot,\
+	org.eclipse.parsson.jakarta.json;version='[1.1.2,1.1.3)',\
+	org.apache.felix.cm.json;version='[2.0.0,2.0.1)',\
+	org.apache.felix.configurator;version='[1.0.18,1.0.19)',\
+	org.gecko.playground.ds.config.configurator;version=snapshot,\
+	org.osgi.util.converter;version='[1.0.9,1.0.10)'

org.gecko.playground.ds.dynamics/bnd.bnd

@@ -1,3 +1,3 @@
 -buildpath: \
-	org.gecko.playground.exchange.api,\
-	org.osgi.service.component
+	org.gecko.playground.exchange.api;version=project,\
+	org.osgi.service.component;version=latest

org.gecko.playground.ds.factory/bnd.bnd

@@ -1,5 +1,5 @@
 -buildpath: \
-	org.osgi.framework,\
-	org.osgi.service.component
+	org.osgi.framework;version=latest,\
+	org.osgi.service.component;version=latest
 
 -sub: *.bnd

org.gecko.playground.ds.greedy/bnd.bnd

@@ -1,4 +1,4 @@
 -buildpath: \
-	org.osgi.framework
+	org.osgi.framework;version=latest
 
 -sub: *.bnd

org.gecko.playground.ds.statics/bnd.bnd

@@ -1 +1 @@
--buildpath: org.gecko.playground.exchange.api
+-buildpath: org.gecko.playground.exchange.api;version=project

org.gecko.playground.ds.whiteboard/bnd.bnd

@@ -1,4 +1,4 @@
 -buildpath: \
-	org.gecko.playground.exchange.api,\
-	org.gecko.playground.ds.simple
+	org.gecko.playground.exchange.api;version=project,\
+	org.gecko.playground.ds.simple;version=project
 -privatepackage: org.gecko.playground.ds.whiteboard.logger

org.gecko.playground.e4.rcp/bnd.bnd

@@ -11,7 +11,7 @@ Bundle-Version: 1.0.0.SNAPSHOT
 
 -buildpath: \
 	javax.inject;version=latest,\
-	org.osgi.service.event,\
+	org.osgi.service.event;version=latest,\
 	javax.annotation;version=latest,\
 	org.eclipse.equinox.common;version=latest,\
 	org.eclipse.equinox.registry;version=latest,\
@@ -24,10 +24,11 @@ Bundle-Version: 1.0.0.SNAPSHOT
 	org.eclipse.e4.ui.di;version=latest,\
 	org.eclipse.e4.ui.model.workbench;version=latest,\
 	org.gecko.eclipse.api;version=latest,\
-	org.gecko.playground.search;version=latest,\
-	org.gecko.playground.model,\
-	org.gecko.search.document,\
-	org.eclipse.e4.core.contexts,\
+	org.gecko.playground.search;version=project,\
+	org.gecko.playground.model;version=project,\
+	org.gecko.search;version=latest,\
+	org.gecko.search.document;version=latest,\
+	org.eclipse.e4.core.contexts;version=latest,\
 	org.gecko.playground.mongo;version=latest
 
 -privatepackage: \

org.gecko.playground.eventadmin/bnd.bnd

@@ -1,3 +1,3 @@
 -buildpath: \
 	org.osgi.service.event;version=latest,\
-	org.gecko.playground.exchange.api;version=latest
+	org.gecko.playground.exchange.api;version=project

org.gecko.playground.exchange.api/bnd.bnd

@@ -1,4 +1,4 @@
 -buildpath: \
-	org.osgi.service.log,\
-	org.osgi.framework,\
-	org.osgi.service.component
+	org.osgi.service.log;version=latest,\
+	org.osgi.framework;version=latest,\
+	org.osgi.service.component;version=latest

org.gecko.playground.logging/bnd.bnd

@@ -1,10 +1,12 @@
 -buildpath: \
-	org.gecko.playground;version=latest,\
+	org.gecko.playground;version=project,\
 	org.apache.logging.log4j.api;version=latest,\
 	org.apache.logging.log4j.core;version=latest,\
 	slf4j.api;version=latest,\
 	org.osgi.framework;version=latest,\
 	org.osgi.service.log;version=latest,\
-	org.osgi.util.tracker;version=latest
+	org.osgi.util.tracker;version=latest,\
+	org.osgi.annotation.bundle;version=latest,\
+	org.osgi.service.component.annotations
 
 -sub: *.bnd

org.gecko.playground.model/bnd.bnd

@@ -1,7 +1,7 @@
 -library: enable-emf
 
 -buildpath :\
-	org.osgi.service.condition
+	org.osgi.service.condition;version=latest
 
 # The code generation takes a bit of time and makes the build a bit slower.
 # It might be a good idea to put comments around it, when you don't need it

org.gecko.playground.mongo/bnd.bnd

@@ -7,7 +7,7 @@ Bundle-Version: 1.0.0.SNAPSHOT
 Require-Capability: osgi.extender;filter:='(osgi.extender=osgi.configurator)'
 
 -buildpath: \
-	org.gecko.emf.repository.api,\
-	org.gecko.playground.model;version=latest
+	org.gecko.emf.repository.api;version=latest,\
+	org.gecko.playground.model;version=project
 -privatepackage: org.gecko.playground.mongo.cmd
 Export-Package: org.gecko.playground.mongo

org.gecko.playground.rest/bnd.bnd

@@ -1,9 +1,9 @@
 -buildpath: \
 	jakarta.ws.rs-api;version='2.1',\
 	jakarta.annotation-api,\
-	org.osgi.framework,\
-	org.gecko.rest.jersey,\
-	org.osgi.service.jakartars
+	org.osgi.framework;version=latest,\
+	org.gecko.rest.jersey;version=latest,\
+	org.osgi.service.jakartars;version=latest
 
 Bundle-Name: REST Interface
 Bundle-Description: Gecko Playground REST with JaxRs Whiteboard

org.gecko.playground.rsa.api/bnd.bnd

@@ -1,9 +1,9 @@
 Bundle-Version: 1.0.0.${tstamp}
 
 -buildpath: \
-	org.osgi.annotation.bundle,\
-	org.osgi.annotation.versioning,\
-	org.osgi.service.component.annotations
+	org.osgi.annotation.bundle;version=latest,\
+	org.osgi.annotation.versioning;version=latest,\
+	org.osgi.service.component.annotations;version=latest
 
 Export-Package: org.gecko.playground.rsa.api
 

org.gecko.playground.rsa.consumer/bnd.bnd

@@ -1,8 +1,8 @@
 -buildpath: \
-	org.osgi.annotation.bundle,\
-	org.osgi.annotation.versioning,\
-	org.osgi.service.component.annotations,\
-	org.gecko.playground.rsa.api;version=snapshot
+	org.osgi.annotation.bundle;version=latest,\
+	org.osgi.annotation.versioning;version=latest,\
+	org.osgi.service.component.annotations;version=latest,\
+	org.gecko.playground.rsa.api;version=project
 
 Bundle-Version: 0.0.0.${tstamp}
 

org.gecko.playground.rsa.provider/bnd.bnd

@@ -1,7 +1,7 @@
 -buildpath: \
 	org.gecko.playground.rsa.api;version=project,\
-	org.osgi.annotation.bundle,\
-	org.osgi.service.component.annotations
+	org.osgi.annotation.bundle;version=latest,\
+	org.osgi.service.component.annotations;version=latest
 
 Bundle-Version: 1.0.0.${tstamp}
 

org.gecko.playground.tasks.demo/bnd.bnd

@@ -3,7 +3,8 @@
 	org.gecko.playground.tasks;version=latest,\
 	org.osgi.util.promise;version=latest,\
 	org.osgi.service.condition;version='1.0',\
-	org.osgi.service.log
+	org.osgi.service.log;version=latest,\
+	org.osgi.service.component.annotations;version=latest
 
 Bundle-Name: Playground Tasks Demo 
 Bundle-Description: Gecko Playground Tasks Demo

org.gecko.playground.tasks.tests/bnd.bnd

@@ -1,12 +1,13 @@
+Test-Cases: ${classes;HIERARCHY_INDIRECTLY_ANNOTATED;org.junit.platform.commons.annotation.Testable;CONCRETE}
 # enables JUnit 5 support for this project
 -library: enableOSGi-Test
 
 # sets the usually required buildpath using the bnd library, you can extend it with the normal -buildpath to your liking
 -buildpath: \
-	org.osgi.framework,\
-	org.osgi.util.promise,\
-	org.osgi.service.cm,\
-	org.gecko.playground.tasks
+	org.osgi.framework;version=latest,\
+	org.osgi.util.promise;version=latest,\
+	org.osgi.service.cm;version=latest,\
+	org.gecko.playground.tasks;version=snapshot
 
 Private-Package: org.gecko.playground.tasks.tests
 

org.gecko.playground.tasks.tests/build.gradle

@@ -0,0 +1,8 @@
+
+def resolveTask = tasks.named("resolve.test") {
+	outputBndrun = layout.buildDirectory.file("test.bndrun")
+}
+
+tasks.named("testOSGi") {
+	bndrun = resolveTask.flatMap { it.outputBndrun }
+}

org.gecko.playground.tasks/bnd.bnd

@@ -1,9 +1,9 @@
 -buildpath: \
-	org.osgi.service.condition,\
+	org.osgi.service.condition;version=latest,\
 	org.osgi.util.promise;version=latest,\
-	org.osgi.util.function,\
-	org.osgi.framework,\
-	org.osgi.service.log
+	org.osgi.util.function;version=latest,\
+	org.osgi.framework;version=latest,\
+	org.osgi.service.log;version=latest
 
 Bundle-Name: Playground Tasks Runtime
 Bundle-Description: Gecko Playground Tasks Runtime

org.gecko.playground.vaadin/bnd.bnd

@@ -19,18 +19,19 @@ Export-Package: \
 Require-Capability: osgi.extender;filter:='(osgi.extender=osgi.configurator)'
 -buildpath: \
 	org.gecko.playground.model;version=latest,\
-	com.vaadin.flow.component.combobox,\
-	com.vaadin.flow.component.dialog,\
-	com.vaadin.flow.component.grid,\
-	com.vaadin.flow.component.icon,\
-	com.vaadin.flow.component.datepicker,\
-	com.vaadin.flow.data,\
-	com.vaadin.flow.data.renderer,\
-	com.vaadin.external.gwt,\
-	com.vaadin.flow.component.radiobutton,\
-	com.vaadin.flow.component.checkbox,\
-	org.gecko.playground.search;version=latest,\
-	org.gecko.playground.mongo;version=latest
+	com.vaadin.flow.component.combobox;version=latest,\
+	com.vaadin.flow.component.dialog;version=latest,\
+	com.vaadin.flow.component.grid;version=latest,\
+	com.vaadin.flow.component.icon;version=latest,\
+	com.vaadin.flow.component.datepicker;version=latest,\
+	com.vaadin.flow.data;version=latest,\
+	com.vaadin.flow.data.renderer;version=latest,\
+	com.vaadin.external.gwt;version=latest,\
+	com.vaadin.flow.component.radiobutton;version=latest,\
+	com.vaadin.flow.component.checkbox;version=latest,\
+	org.gecko.playground.search;version=project,\
+	org.gecko.playground.mongo;version=project,\
+	org.gecko.search;version=latest
 
 javac.source: 11
 javac.target: 11

org.gecko.playground.wab.jersey/bnd.bnd

@@ -1,11 +1,11 @@
 -buildpath: \
 	jakarta.ws.rs-api;version='2.1',\
 	org.gecko.playground.http.jersey;version=latest,\
-	jakarta.xml.bind-api,\
-	org.gecko.playground.jaxb;version=latest,\
-	org.osgi.util.promise,\
-	org.osgi.service.jakartars,\
-	org.osgi.util.function
+	jakarta.xml.bind-api;version=latest,\
+	org.gecko.playground.jaxb;version=project,\
+	org.osgi.util.promise;version=latest,\
+	org.osgi.service.jakartars;version=latest,\
+	org.osgi.util.function;version=latest
 
 Bundle-Name: Jersey REST as Web Application Bundle
 Bundle-Description: Gecko Playground Jersey REST as Web Application Bundle

org.gecko.playground.wab/bnd.bnd

@@ -2,8 +2,8 @@ Bundle-Version: 1.0.0.SNAPSHOT
 
 -buildpath: \
 	org.apache.felix.http.servlet-api;version=latest,\
-	org.osgi.framework,\
-	slf4j.api
+	org.osgi.framework;version=latest,\
+	slf4j.api;version=latest
 
 
 Web-ContextPath: /test

org.gecko.playground.workmode/bnd.bnd

@@ -1,9 +1,12 @@
 -buildpath: \
-	org.gecko.playground,\
+	org.gecko.playground;version=project,\
 	org.osgi.service.condition;version='1.0',\
-	org.osgi.service.cm,\
-	org.osgi.service.log,\
-	org.osgi.framework
+	org.osgi.service.cm;version=latest,\
+	org.osgi.service.log;version=latest,\
+	org.osgi.framework;version=latest,\
+	org.osgi.annotation.versioning;version=latest,\
+	org.osgi.annotation.bundle;version=latest,\
+	org.osgi.service.component.annotations;version=latest
 
 Bundle-Name: Playground Workmode 
 Bundle-Description: Gecko Playground Workmode

org.gecko.playground.xslt/bnd.bnd

@@ -1,8 +1,9 @@
 -buildpath: \
-	org.gecko.playground.jaxb;version=latest,\
 	jakarta.xml.bind-api;version=latest,\
-	org.gecko.playground.saxon,\
-	org.osgi.framework
+	org.osgi.framework;version=latest,\
+	org.osgi.resource;version=latest,\
+	org.gecko.playground.jaxb;version=project,\
+	org.gecko.playground.saxon;version=project
 
 -includeresource: xsl
 

org.gecko.playground/bnd.bnd

@@ -1,4 +1,6 @@
--buildpath: jakarta.json-api
+-buildpath: \
+	jakarta.json-api,\
+	osgi.annotation
 
 Export-Package: \
 	org.gecko.playground.configuration,\