diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun index e9299b5fc..445b35462 100644 --- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun +++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun @@ -19,12 +19,7 @@ Fragment-Host: org.openhab.core.auth.oauth2client org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.net;version='[2.5.0,2.5.1)',\ org.objenesis;version='[2.6.0,2.6.1)',\ - org.openhab.core.auth.oauth2client;version='[2.5.0,2.5.1)',\ - org.openhab.core.auth.oauth2client.tests;version='[2.5.0,2.5.1)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ slf4j.api;version='[1.7.25,1.7.26)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ @@ -39,7 +34,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client net.bytebuddy.byte-buddy-agent;version='[1.9.10,1.9.11)',\ org.mockito.mockito-core;version='[3.1.0,3.1.1)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ org.eclipse.jetty.client;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\ @@ -50,4 +44,10 @@ Fragment-Host: org.openhab.core.auth.oauth2client org.eclipse.jetty.websocket.api;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.websocket.client;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.websocket.common;version='[9.4.20,9.4.21)',\ - org.eclipse.jetty.xml;version='[9.4.20,9.4.21)' + org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.auth.oauth2client;version='[3.0.0,3.0.1)',\ + org.openhab.core.auth.oauth2client.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.net;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index e743cedef..c2df5095a 100644 --- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun @@ -12,7 +12,6 @@ Bundle-SymbolicName: ${project.artifactId} ch.qos.logback.core;version='[1.2.3,1.2.4)',\ com.google.gson;version='[2.8.2,2.8.3)',\ javax.measure.unit-api;version='[1.0.0,1.0.1)',\ - org.apache.commons.collections;version='[3.2.1,3.2.2)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ @@ -22,20 +21,12 @@ Bundle-SymbolicName: ${project.artifactId} org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.openhab.core.automation.integration.tests;version='[2.5.0,2.5.1)',\ - org.openhab.core.automation;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing;version='[2.5.0,2.5.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ slf4j.api;version='[1.7.25,1.7.26)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.se;version='[1.0.10,1.0.11)',\ - org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\ jollyday;version='[0.5.8,0.5.9)',\ org.threeten.extra;version='[1.4.0,1.4.1)',\ org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\ @@ -43,4 +34,12 @@ Bundle-SymbolicName: ${project.artifactId} org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\ - org.eclipse.jetty.util;version='[9.4.20,9.4.21)' + org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.automation;version='[3.0.0,3.0.1)',\ + org.openhab.core.automation.integration.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.ephemeris;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun index 5a0d625b7..00845afcc 100644 --- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun @@ -13,7 +13,6 @@ Fragment-Host: org.openhab.core.automation ch.qos.logback.core;version='[1.2.3,1.2.4)',\ com.google.gson;version='[2.8.2,2.8.3)',\ javax.measure.unit-api;version='[1.0.0,1.0.1)',\ - org.apache.commons.collections;version='[3.2.1,3.2.2)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ @@ -23,20 +22,12 @@ Fragment-Host: org.openhab.core.automation org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.openhab.core.automation.module.core.tests;version='[2.5.0,2.5.1)',\ - org.openhab.core.automation;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing;version='[2.5.0,2.5.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ slf4j.api;version='[1.7.25,1.7.26)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.se;version='[1.0.10,1.0.11)',\ - org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\ jollyday;version='[0.5.8,0.5.9)',\ org.threeten.extra;version='[1.4.0,1.4.1)',\ org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\ @@ -44,4 +35,12 @@ Fragment-Host: org.openhab.core.automation org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\ - org.eclipse.jetty.util;version='[9.4.20,9.4.21)' + org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.automation;version='[3.0.0,3.0.1)',\ + org.openhab.core.automation.module.core.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.ephemeris;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.automation.module.script.defaultscope.tests/itest.bndrun b/itests/org.openhab.core.automation.module.script.defaultscope.tests/itest.bndrun index 21ab9b538..f9d886647 100644 --- a/itests/org.openhab.core.automation.module.script.defaultscope.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.script.defaultscope.tests/itest.bndrun @@ -12,7 +12,6 @@ Bundle-SymbolicName: ${project.artifactId} ch.qos.logback.core;version='[1.2.3,1.2.4)',\ com.google.gson;version='[2.8.2,2.8.3)',\ javax.measure.unit-api;version='[1.0.0,1.0.1)',\ - org.apache.commons.collections;version='[3.2.1,3.2.2)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ @@ -22,21 +21,12 @@ Bundle-SymbolicName: ${project.artifactId} org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.openhab.core.automation.module.script.defaultscope.tests;version='[2.5.0,2.5.1)',\ - org.openhab.core.automation.module.script;version='[2.5.0,2.5.1)',\ - org.openhab.core.automation;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing;version='[2.5.0,2.5.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ slf4j.api;version='[1.7.25,1.7.26)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.se;version='[1.0.10,1.0.11)',\ - org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\ jollyday;version='[0.5.8,0.5.9)',\ org.threeten.extra;version='[1.4.0,1.4.1)',\ org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\ @@ -44,4 +34,13 @@ Bundle-SymbolicName: ${project.artifactId} org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\ - org.eclipse.jetty.util;version='[9.4.20,9.4.21)' + org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.automation;version='[3.0.0,3.0.1)',\ + org.openhab.core.automation.module.script;version='[3.0.0,3.0.1)',\ + org.openhab.core.automation.module.script.defaultscope.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.ephemeris;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun index 53973ecab..1f1fec543 100644 --- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun @@ -13,7 +13,6 @@ Fragment-Host: org.openhab.core.automation.module.script ch.qos.logback.core;version='[1.2.3,1.2.4)',\ com.google.gson;version='[2.8.2,2.8.3)',\ javax.measure.unit-api;version='[1.0.0,1.0.1)',\ - org.apache.commons.collections;version='[3.2.1,3.2.2)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ @@ -23,21 +22,12 @@ Fragment-Host: org.openhab.core.automation.module.script org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.openhab.core.automation.module.script.tests;version='[2.5.0,2.5.1)',\ - org.openhab.core.automation.module.script;version='[2.5.0,2.5.1)',\ - org.openhab.core.automation;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing;version='[2.5.0,2.5.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ slf4j.api;version='[1.7.25,1.7.26)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.se;version='[1.0.10,1.0.11)',\ - org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\ jollyday;version='[0.5.8,0.5.9)',\ org.threeten.extra;version='[1.4.0,1.4.1)',\ org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\ @@ -45,4 +35,13 @@ Fragment-Host: org.openhab.core.automation.module.script org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\ - org.eclipse.jetty.util;version='[9.4.20,9.4.21)' + org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.automation;version='[3.0.0,3.0.1)',\ + org.openhab.core.automation.module.script;version='[3.0.0,3.0.1)',\ + org.openhab.core.automation.module.script.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.ephemeris;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun index 250a14ea4..a8c79b28b 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun @@ -10,7 +10,6 @@ Fragment-Host: org.openhab.core.automation # -runbundles: \ javax.measure.unit-api;version='[1.0.0,1.0.1)',\ - org.apache.commons.collections;version='[3.2.1,3.2.2)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ @@ -19,10 +18,6 @@ Fragment-Host: org.openhab.core.automation org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing;version='[2.5.0,2.5.1)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ com.google.gson;version='[2.8.2,2.8.3)',\ @@ -30,13 +25,9 @@ Fragment-Host: org.openhab.core.automation org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ - org.openhab.core.automation;version='[2.5.0,2.5.1)',\ - org.openhab.core.automation.module.timer.tests;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ slf4j.api;version='[1.7.25,1.7.26)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.se;version='[1.0.10,1.0.11)',\ - org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\ jollyday;version='[0.5.8,0.5.9)',\ org.threeten.extra;version='[1.4.0,1.4.1)',\ org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\ @@ -44,4 +35,12 @@ Fragment-Host: org.openhab.core.automation org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\ - org.eclipse.jetty.util;version='[9.4.20,9.4.21)' + org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.automation;version='[3.0.0,3.0.1)',\ + org.openhab.core.automation.module.timer.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.ephemeris;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index ccd74e323..e1198da1f 100644 --- a/itests/org.openhab.core.automation.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.tests/itest.bndrun @@ -13,7 +13,6 @@ Fragment-Host: org.openhab.core.automation ch.qos.logback.core;version='[1.2.3,1.2.4)',\ com.google.gson;version='[2.8.2,2.8.3)',\ javax.measure.unit-api;version='[1.0.0,1.0.1)',\ - org.apache.commons.collections;version='[3.2.1,3.2.2)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ @@ -23,20 +22,12 @@ Fragment-Host: org.openhab.core.automation org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.automation;version='[2.5.0,2.5.1)',\ - org.openhab.core.automation.tests;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing;version='[2.5.0,2.5.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ slf4j.api;version='[1.7.25,1.7.26)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.se;version='[1.0.10,1.0.11)',\ - org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\ jollyday;version='[0.5.8,0.5.9)',\ org.threeten.extra;version='[1.4.0,1.4.1)',\ org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\ @@ -44,4 +35,12 @@ Fragment-Host: org.openhab.core.automation org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\ - org.eclipse.jetty.util;version='[9.4.20,9.4.21)' + org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.automation;version='[3.0.0,3.0.1)',\ + org.openhab.core.automation.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.ephemeris;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.binding.xml.tests/itest.bndrun b/itests/org.openhab.core.binding.xml.tests/itest.bndrun index c527b18ba..389d5c2fe 100644 --- a/itests/org.openhab.core.binding.xml.tests/itest.bndrun +++ b/itests/org.openhab.core.binding.xml.tests/itest.bndrun @@ -19,13 +19,7 @@ Fragment-Host: org.openhab.core.binding.xml org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\ - org.openhab.core.binding.xml;version='[2.5.0,2.5.1)',\ - org.openhab.core.binding.xml.tests;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ slf4j.api;version='[1.7.25,1.7.26)',\ @@ -41,4 +35,10 @@ Fragment-Host: org.openhab.core.binding.xml org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\ - org.eclipse.jetty.util;version='[9.4.20,9.4.21)' + org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.binding.xml;version='[3.0.0,3.0.1)',\ + org.openhab.core.binding.xml.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.xml;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun index 01e66ccff..d52956da3 100644 --- a/itests/org.openhab.core.config.core.tests/itest.bndrun +++ b/itests/org.openhab.core.config.core.tests/itest.bndrun @@ -17,13 +17,9 @@ Fragment-Host: org.openhab.core.config.core org.apache.felix.scr;version='[2.1.10,2.1.11)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ org.objenesis;version='[2.6.0,2.6.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.openhab.core.config.core.tests;version='[2.5.0,2.5.1)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ slf4j.api;version='[1.7.25,1.7.26)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ @@ -42,4 +38,8 @@ Fragment-Host: org.openhab.core.config.core org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\ - org.eclipse.jetty.util;version='[9.4.20,9.4.21)' + org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun index 38a3ab7b0..7fb9fb6a8 100644 --- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun @@ -10,7 +10,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns # -runbundles: \ javax.measure.unit-api;version='[1.0.0,1.0.1)',\ - org.apache.commons.collections;version='[3.2.1,3.2.2)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\ org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\ @@ -20,16 +19,7 @@ Fragment-Host: org.openhab.core.config.discovery.mdns org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing;version='[2.5.0,2.5.1)',\ javax.jmdns;version='[3.5.5,3.5.6)',\ - org.openhab.core.config.discovery;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.discovery.mdns;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.discovery.mdns.tests;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.transport.mdns;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ slf4j.api;version='[1.7.25,1.7.26)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ @@ -45,4 +35,13 @@ Fragment-Host: org.openhab.core.config.discovery.mdns org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\ - org.eclipse.jetty.util;version='[9.4.20,9.4.21)' + org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.discovery;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.discovery.mdns;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.discovery.mdns.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.transport.mdns;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun index fea07fe0a..a5c0b1f92 100644 --- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun @@ -12,7 +12,6 @@ Fragment-Host: org.openhab.core.config.discovery # -runbundles: \ javax.measure.unit-api;version='[1.0.0,1.0.1)',\ - org.apache.commons.collections;version='[3.2.1,3.2.2)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\ org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\ @@ -21,15 +20,6 @@ Fragment-Host: org.openhab.core.config.discovery org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ org.objenesis;version='[2.6.0,2.6.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.discovery;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.discovery.tests;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing.xml;version='[2.5.0,2.5.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ @@ -51,4 +41,13 @@ Fragment-Host: org.openhab.core.config.discovery org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\ - org.eclipse.jetty.util;version='[9.4.20,9.4.21)' + org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.discovery;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.discovery.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.xml;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing.xml;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun index 92dca035a..4e4dc7bc5 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun @@ -13,7 +13,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs ch.qos.logback.core;version='[1.2.3,1.2.4)',\ com.google.gson;version='[2.8.2,2.8.3)',\ javax.measure.unit-api;version='[1.0.0,1.0.1)',\ - org.apache.commons.collections;version='[3.2.1,3.2.2)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\ org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\ @@ -24,14 +23,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ org.objenesis;version='[2.6.0,2.6.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.discovery.usbserial.linuxsysfs.tests;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.discovery.usbserial.linuxsysfs;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.discovery.usbserial;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.discovery;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing;version='[2.5.0,2.5.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ @@ -42,11 +33,19 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs net.bytebuddy.byte-buddy-agent;version='[1.9.10,1.9.11)',\ org.mockito.mockito-core;version='[3.1.0,3.1.1)',\ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\ - org.eclipse.jetty.util;version='[9.4.20,9.4.21)' + org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.discovery;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.discovery.usbserial;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.discovery.usbserial.linuxsysfs;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.discovery.usbserial.linuxsysfs.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun index 638aaf59f..0f9e633ad 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun @@ -23,7 +23,6 @@ Provide-Capability: \ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ com.google.gson;version='[2.8.2,2.8.3)',\ javax.measure.unit-api;version='[1.0.0,1.0.1)',\ - org.apache.commons.collections;version='[3.2.1,3.2.2)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\ org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\ @@ -35,14 +34,6 @@ Provide-Capability: \ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ org.objenesis;version='[2.6.0,2.6.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.discovery.usbserial.tests;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.discovery.usbserial;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.discovery;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing;version='[2.5.0,2.5.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ @@ -57,4 +48,12 @@ Provide-Capability: \ org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\ - org.eclipse.jetty.util;version='[9.4.20,9.4.21)' + org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.discovery;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.discovery.usbserial;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.discovery.usbserial.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun index 994eb92bf..e47baf7ca 100644 --- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun +++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun @@ -19,8 +19,6 @@ Fragment-Host: org.openhab.core.config.dispatch org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ com.google.gson;version='[2.8.2,2.8.3)',\ @@ -28,9 +26,6 @@ Fragment-Host: org.openhab.core.config.dispatch org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ - org.openhab.core.config.dispatch;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.dispatch.tests;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ slf4j.api;version='[1.7.25,1.7.26)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.se;version='[1.0.10,1.0.11)',\ @@ -39,4 +34,9 @@ Fragment-Host: org.openhab.core.config.dispatch org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\ - org.eclipse.jetty.util;version='[9.4.20,9.4.21)' + org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.dispatch;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.dispatch.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.config.xml.tests/itest.bndrun b/itests/org.openhab.core.config.xml.tests/itest.bndrun index 8f47ceb6e..b7ef83027 100644 --- a/itests/org.openhab.core.config.xml.tests/itest.bndrun +++ b/itests/org.openhab.core.config.xml.tests/itest.bndrun @@ -18,12 +18,7 @@ Fragment-Host: org.openhab.core.config.xml org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\ - org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.xml.tests;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ com.google.gson;version='[2.8.2,2.8.3)',\ @@ -39,4 +34,9 @@ Fragment-Host: org.openhab.core.config.xml org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\ - org.eclipse.jetty.util;version='[9.4.20,9.4.21)' + org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.xml;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.xml.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index 7077113eb..144e92049 100644 --- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun +++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun @@ -29,10 +29,6 @@ feature.openhab-config: \ org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.ephemeris.tests;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ slf4j.api;version='[1.7.25,1.7.26)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ @@ -41,9 +37,7 @@ feature.openhab-config: \ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ - org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\ org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\ - org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\ org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\ org.apache.felix.log;version='[1.2.0,1.2.1)',\ org.apache.felix.logback;version='[1.0.0,1.0.1)',\ @@ -56,4 +50,10 @@ feature.openhab-config: \ org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\ - org.eclipse.jetty.util;version='[9.4.20,9.4.21)' + org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.xml;version='[3.0.0,3.0.1)',\ + org.openhab.core.ephemeris;version='[3.0.0,3.0.1)',\ + org.openhab.core.ephemeris.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun index 07f4bea4c..7a868bf62 100644 --- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun +++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun @@ -16,7 +16,6 @@ Fragment-Host: org.openhab.core.io.rest.core javax.measure.unit-api;version='[1.0.0,1.0.1)',\ net.minidev.accessors-smart;version='[1.2.0,1.2.1)',\ net.minidev.json-smart;version='[2.3.0,2.3.1)',\ - org.apache.commons.collections;version='[3.2.1,3.2.2)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\ org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\ @@ -24,17 +23,6 @@ Fragment-Host: org.openhab.core.io.rest.core org.apache.felix.scr;version='[2.1.10,2.1.11)',\ org.objectweb.asm;version='[5.0.4,5.0.5)',\ org.objenesis;version='[2.6.0,2.6.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.discovery;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.rest;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.rest.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.rest.core.tests;version='[2.5.0,2.5.1)',\ - org.openhab.core.persistence;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing;version='[2.5.0,2.5.1)',\ - org.openhab.core.transform;version='[2.5.0,2.5.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ @@ -57,4 +45,15 @@ Fragment-Host: org.openhab.core.io.rest.core org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\ - org.eclipse.jetty.util;version='[9.4.20,9.4.21)' + org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.discovery;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.rest;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.rest.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.rest.core.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.persistence;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing;version='[3.0.0,3.0.1)',\ + org.openhab.core.transform;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.model.core.tests/itest.bndrun b/itests/org.openhab.core.model.core.tests/itest.bndrun index ca666930f..00b2e98d7 100644 --- a/itests/org.openhab.core.model.core.tests/itest.bndrun +++ b/itests/org.openhab.core.model.core.tests/itest.bndrun @@ -13,7 +13,6 @@ Fragment-Host: org.openhab.core.model.core javax.measure.unit-api;version='[1.0.0,1.0.1)',\ log4j;version='[1.2.17,1.2.18)',\ org.antlr.runtime;version='[3.2.0,3.2.1)',\ - org.apache.commons.collections;version='[3.2.1,3.2.2)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ @@ -26,9 +25,6 @@ Fragment-Host: org.openhab.core.model.core org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.core;version='[2.5.0,2.5.1)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ com.google.gson;version='[2.8.2,2.8.3)',\ @@ -37,12 +33,9 @@ Fragment-Host: org.openhab.core.model.core org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.objenesis;version='[2.6.0,2.6.1)',\ - org.openhab.core.model.core.tests;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ slf4j.api;version='[1.7.25,1.7.26)',\ org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.se;version='[1.0.10,1.0.11)',\ net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\ @@ -60,12 +53,6 @@ Fragment-Host: org.openhab.core.model.core joda-time;version='[2.9.2,2.9.3)',\ org.eclipse.xtext.common.types;version='[2.19.0,2.19.1)',\ org.objectweb.asm;version='[7.1.0,7.1.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.item;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\ - org.openhab.core.persistence;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing;version='[2.5.0,2.5.1)',\ jollyday;version='[0.5.8,0.5.9)',\ org.apache.commons.exec;version='[1.1.0,1.1.1)',\ org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\ @@ -73,16 +60,6 @@ Fragment-Host: org.openhab.core.model.core org.eclipse.xtext.xbase;version='[2.19.0,2.19.1)',\ org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\ org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\ - org.openhab.core.audio;version='[2.5.0,2.5.1)',\ - org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.http;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.net;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.script;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\ - org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\ - org.openhab.core.transform;version='[2.5.0,2.5.1)',\ - org.openhab.core.voice;version='[2.5.0,2.5.1)',\ org.threeten.extra;version='[1.4.0,1.4.1)',\ org.eclipse.jetty.client;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\ @@ -95,9 +72,30 @@ Fragment-Host: org.openhab.core.model.core org.eclipse.jetty.websocket.client;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.websocket.common;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\ - org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\ org.ops4j.pax.swissbox.optional.jcl;version='[1.8.3,1.8.4)',\ org.ops4j.pax.web.pax-web-api;version='[7.2.11,7.2.12)',\ org.ops4j.pax.web.pax-web-jetty;version='[7.2.11,7.2.12)',\ org.ops4j.pax.web.pax-web-runtime;version='[7.2.11,7.2.12)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)' + org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.audio;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.ephemeris;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.http;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.net;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.core.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.item;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.persistence;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.rule;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.script;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.script.runtime;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.sitemap;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.thing;version='[3.0.0,3.0.1)',\ + org.openhab.core.persistence;version='[3.0.0,3.0.1)',\ + org.openhab.core.scheduler;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing;version='[3.0.0,3.0.1)',\ + org.openhab.core.transform;version='[3.0.0,3.0.1)',\ + org.openhab.core.voice;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index c66963a85..ea314904f 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -15,7 +15,6 @@ Fragment-Host: org.openhab.core.model.item javax.measure.unit-api;version='[1.0.0,1.0.1)',\ log4j;version='[1.2.17,1.2.18)',\ org.antlr.runtime;version='[3.2.0,3.2.1)',\ - org.apache.commons.collections;version='[3.2.1,3.2.2)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\ org.apache.felix.scr;version='[2.1.10,2.1.11)',\ @@ -25,13 +24,6 @@ Fragment-Host: org.openhab.core.model.item org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.item;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.item.tests;version='[2.5.0,2.5.1)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ com.google.gson;version='[2.8.2,2.8.3)',\ @@ -39,19 +31,13 @@ Fragment-Host: org.openhab.core.model.item org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ - org.openhab.core.model.item.runtime;version='[2.5.0,2.5.1)',\ slf4j.api;version='[1.7.25,1.7.26)',\ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ joda-time;version='[2.9.2,2.9.3)',\ org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\ - org.openhab.core.persistence;version='[2.5.0,2.5.1)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.se;version='[1.0.10,1.0.11)',\ com.google.guava;version='[27.1.0,27.1.1)',\ @@ -72,16 +58,6 @@ Fragment-Host: org.openhab.core.model.item org.eclipse.xtext.xbase;version='[2.19.0,2.19.1)',\ org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\ org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\ - org.openhab.core.audio;version='[2.5.0,2.5.1)',\ - org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.http;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.net;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.script;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\ - org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\ - org.openhab.core.transform;version='[2.5.0,2.5.1)',\ - org.openhab.core.voice;version='[2.5.0,2.5.1)',\ org.threeten.extra;version='[1.4.0,1.4.1)',\ org.eclipse.jetty.client;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\ @@ -94,9 +70,31 @@ Fragment-Host: org.openhab.core.model.item org.eclipse.jetty.websocket.client;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.websocket.common;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\ - org.openhab.core.model.rule.runtime;version='[2.5.0,2.5.1)',\ org.ops4j.pax.swissbox.optional.jcl;version='[1.8.3,1.8.4)',\ org.ops4j.pax.web.pax-web-api;version='[7.2.11,7.2.12)',\ org.ops4j.pax.web.pax-web-jetty;version='[7.2.11,7.2.12)',\ org.ops4j.pax.web.pax-web-runtime;version='[7.2.11,7.2.12)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)' + org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.audio;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.ephemeris;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.http;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.net;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.item;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.item.runtime;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.item.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.persistence;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.rule;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.script;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.script.runtime;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.sitemap;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.thing;version='[3.0.0,3.0.1)',\ + org.openhab.core.persistence;version='[3.0.0,3.0.1)',\ + org.openhab.core.scheduler;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing;version='[3.0.0,3.0.1)',\ + org.openhab.core.transform;version='[3.0.0,3.0.1)',\ + org.openhab.core.voice;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.model.persistence.tests/itest.bndrun b/itests/org.openhab.core.model.persistence.tests/itest.bndrun index aeed4cdb9..ea02bd037 100644 --- a/itests/org.openhab.core.model.persistence.tests/itest.bndrun +++ b/itests/org.openhab.core.model.persistence.tests/itest.bndrun @@ -16,7 +16,6 @@ Fragment-Host: org.openhab.core.model.persistence joda-time;version='[2.9.2,2.9.3)',\ log4j;version='[1.2.17,1.2.18)',\ org.antlr.runtime;version='[3.2.0,3.2.1)',\ - org.apache.commons.collections;version='[3.2.1,3.2.2)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\ org.apache.felix.scr;version='[2.1.10,2.1.11)',\ @@ -28,15 +27,6 @@ Fragment-Host: org.openhab.core.model.persistence org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.item;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\ - org.openhab.core.persistence;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.persistence.tests;version='[2.5.0,2.5.1)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ com.google.gson;version='[2.8.2,2.8.3)',\ @@ -44,12 +34,9 @@ Fragment-Host: org.openhab.core.model.persistence org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ - org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\ slf4j.api;version='[1.7.25,1.7.26)',\ org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.se;version='[1.0.10,1.0.11)',\ com.google.guava;version='[27.1.0,27.1.1)',\ @@ -71,16 +58,6 @@ Fragment-Host: org.openhab.core.model.persistence org.eclipse.xtext.xbase;version='[2.19.0,2.19.1)',\ org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\ org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\ - org.openhab.core.audio;version='[2.5.0,2.5.1)',\ - org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.http;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.net;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.script;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\ - org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\ - org.openhab.core.transform;version='[2.5.0,2.5.1)',\ - org.openhab.core.voice;version='[2.5.0,2.5.1)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.se;version='[1.0.10,1.0.11)',\ com.google.guava;version='[27.1.0,27.1.1)',\ @@ -97,7 +74,6 @@ Fragment-Host: org.openhab.core.model.persistence org.objectweb.asm;version='[7.1.0,7.1.1)',\ org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\ org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ org.threeten.extra;version='[1.4.0,1.4.1)',\ org.eclipse.jetty.client;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\ @@ -110,9 +86,31 @@ Fragment-Host: org.openhab.core.model.persistence org.eclipse.jetty.websocket.client;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.websocket.common;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\ - org.openhab.core.model.rule.runtime;version='[2.5.0,2.5.1)',\ org.ops4j.pax.swissbox.optional.jcl;version='[1.8.3,1.8.4)',\ org.ops4j.pax.web.pax-web-api;version='[7.2.11,7.2.12)',\ org.ops4j.pax.web.pax-web-jetty;version='[7.2.11,7.2.12)',\ org.ops4j.pax.web.pax-web-runtime;version='[7.2.11,7.2.12)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)' + org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.audio;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.ephemeris;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.http;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.net;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.item;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.persistence;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.persistence.runtime;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.persistence.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.rule;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.script;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.script.runtime;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.sitemap;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.thing;version='[3.0.0,3.0.1)',\ + org.openhab.core.persistence;version='[3.0.0,3.0.1)',\ + org.openhab.core.scheduler;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing;version='[3.0.0,3.0.1)',\ + org.openhab.core.transform;version='[3.0.0,3.0.1)',\ + org.openhab.core.voice;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index 7ad8b95f5..4362e4079 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -16,7 +16,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime joda-time;version='[2.9.2,2.9.3)',\ log4j;version='[1.2.17,1.2.18)',\ org.antlr.runtime;version='[3.2.0,3.2.1)',\ - org.apache.commons.collections;version='[3.2.1,3.2.2)',\ org.apache.commons.exec;version='[1.1.0,1.1.1)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\ @@ -28,24 +27,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.audio;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.http;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.net;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.item;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.script;version='[2.5.0,2.5.1)',\ - org.openhab.core.persistence;version='[2.5.0,2.5.1)',\ - org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing;version='[2.5.0,2.5.1)',\ - org.openhab.core.transform;version='[2.5.0,2.5.1)',\ - org.openhab.core.voice;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.rule.runtime;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.rule.tests;version='[2.5.0,2.5.1)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ com.google.gson;version='[2.8.2,2.8.3)',\ @@ -56,15 +37,10 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\ org.apache.xbean.finder;version='[4.12.0,4.12.1)',\ slf4j.api;version='[1.7.25,1.7.26)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.se;version='[1.0.10,1.0.11)',\ com.google.guava;version='[27.1.0,27.1.1)',\ @@ -98,4 +74,27 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.ops4j.pax.web.pax-web-api;version='[7.2.11,7.2.12)',\ org.ops4j.pax.web.pax-web-jetty;version='[7.2.11,7.2.12)',\ org.ops4j.pax.web.pax-web-runtime;version='[7.2.11,7.2.12)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)' + org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.audio;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.ephemeris;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.http;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.net;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.item;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.persistence;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.rule;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.rule.runtime;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.rule.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.script;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.script.runtime;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.sitemap;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.thing;version='[3.0.0,3.0.1)',\ + org.openhab.core.persistence;version='[3.0.0,3.0.1)',\ + org.openhab.core.scheduler;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing;version='[3.0.0,3.0.1)',\ + org.openhab.core.transform;version='[3.0.0,3.0.1)',\ + org.openhab.core.voice;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun index d17c73b8e..ad5fd5208 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -16,7 +16,6 @@ Fragment-Host: org.openhab.core.model.script joda-time;version='[2.9.2,2.9.3)',\ log4j;version='[1.2.17,1.2.18)',\ org.antlr.runtime;version='[3.2.0,3.2.1)',\ - org.apache.commons.collections;version='[3.2.1,3.2.2)',\ org.apache.commons.exec;version='[1.1.0,1.1.1)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\ @@ -30,21 +29,6 @@ Fragment-Host: org.openhab.core.model.script org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.audio;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.http;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.net;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.item;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.script;version='[2.5.0,2.5.1)',\ - org.openhab.core.persistence;version='[2.5.0,2.5.1)',\ - org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing;version='[2.5.0,2.5.1)',\ - org.openhab.core.transform;version='[2.5.0,2.5.1)',\ - org.openhab.core.voice;version='[2.5.0,2.5.1)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ com.google.gson;version='[2.8.2,2.8.3)',\ @@ -54,16 +38,9 @@ Fragment-Host: org.openhab.core.model.script org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\ org.apache.xbean.finder;version='[4.12.0,4.12.1)',\ - org.openhab.core.model.script.tests;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ slf4j.api;version='[1.7.25,1.7.26)',\ - org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\ org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.se;version='[1.0.10,1.0.11)',\ com.google.guava;version='[27.1.0,27.1.1)',\ @@ -93,9 +70,30 @@ Fragment-Host: org.openhab.core.model.script org.eclipse.jetty.websocket.client;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.websocket.common;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\ - org.openhab.core.model.rule.runtime;version='[2.5.0,2.5.1)',\ org.ops4j.pax.swissbox.optional.jcl;version='[1.8.3,1.8.4)',\ org.ops4j.pax.web.pax-web-api;version='[7.2.11,7.2.12)',\ org.ops4j.pax.web.pax-web-jetty;version='[7.2.11,7.2.12)',\ org.ops4j.pax.web.pax-web-runtime;version='[7.2.11,7.2.12)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)' + org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.audio;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.ephemeris;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.http;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.net;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.item;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.persistence;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.rule;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.script;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.script.runtime;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.script.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.sitemap;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.thing;version='[3.0.0,3.0.1)',\ + org.openhab.core.persistence;version='[3.0.0,3.0.1)',\ + org.openhab.core.scheduler;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing;version='[3.0.0,3.0.1)',\ + org.openhab.core.transform;version='[3.0.0,3.0.1)',\ + org.openhab.core.voice;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index 9a4873868..db25b1fd4 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -18,7 +18,6 @@ Fragment-Host: org.openhab.core.model.thing joda-time;version='[2.9.2,2.9.3)',\ log4j;version='[1.2.17,1.2.18)',\ org.antlr.runtime;version='[3.2.0,3.2.1)',\ - org.apache.commons.collections;version='[3.2.1,3.2.2)',\ org.apache.commons.exec;version='[1.1.0,1.1.1)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\ @@ -34,34 +33,8 @@ Fragment-Host: org.openhab.core.model.thing org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.audio;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.http;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.net;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.item;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.script;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\ - org.openhab.core.persistence;version='[2.5.0,2.5.1)',\ - org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing;version='[2.5.0,2.5.1)',\ - org.openhab.core.transform;version='[2.5.0,2.5.1)',\ - org.openhab.core.voice;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\ org.objenesis;version='[2.6.0,2.6.1)',\ - org.openhab.core.model.thing.tests;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.thing.runtime;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.item.runtime;version='[2.5.0,2.5.1)',\ org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\ - org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing.xml;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.thing.testsupport;version='[2.5.0,2.5.1)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ slf4j.api;version='[1.7.25,1.7.26)',\ @@ -72,7 +45,6 @@ Fragment-Host: org.openhab.core.model.thing org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ - org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.se;version='[1.0.10,1.0.11)',\ net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\ @@ -105,10 +77,36 @@ Fragment-Host: org.openhab.core.model.thing org.eclipse.jetty.websocket.client;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.websocket.common;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\ - org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\ org.ops4j.pax.swissbox.optional.jcl;version='[1.8.3,1.8.4)',\ org.ops4j.pax.web.pax-web-api;version='[7.2.11,7.2.12)',\ org.ops4j.pax.web.pax-web-jetty;version='[7.2.11,7.2.12)',\ org.ops4j.pax.web.pax-web-runtime;version='[7.2.11,7.2.12)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)' + org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.audio;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.xml;version='[3.0.0,3.0.1)',\ + org.openhab.core.ephemeris;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.http;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.net;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.item;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.item.runtime;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.persistence;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.rule;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.script;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.script.runtime;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.sitemap;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.thing;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.thing.runtime;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.thing.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.model.thing.testsupport;version='[3.0.0,3.0.1)',\ + org.openhab.core.persistence;version='[3.0.0,3.0.1)',\ + org.openhab.core.scheduler;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\ + org.openhab.core.transform;version='[3.0.0,3.0.1)',\ + org.openhab.core.voice;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun index 375aea7ef..25a22cda5 100644 --- a/itests/org.openhab.core.storage.json.tests/itest.bndrun +++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun @@ -15,11 +15,6 @@ Fragment-Host: org.openhab.core.storage.json org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ org.apache.felix.scr;version='[2.1.10,2.1.11)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.storage.json;version='[2.5.0,2.5.1)',\ - org.openhab.core.storage.json.tests;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ @@ -38,4 +33,9 @@ Fragment-Host: org.openhab.core.storage.json org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\ - org.eclipse.jetty.util;version='[9.4.20,9.4.21)' + org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.storage.json;version='[3.0.0,3.0.1)',\ + org.openhab.core.storage.json.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun index 4700c6ce0..790bd24ba 100644 --- a/itests/org.openhab.core.tests/itest.bndrun +++ b/itests/org.openhab.core.tests/itest.bndrun @@ -19,9 +19,6 @@ Fragment-Host: org.openhab.core org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ - org.openhab.core.tests;version='[2.5.0,2.5.1)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ slf4j.api;version='[1.7.25,1.7.26)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ @@ -40,4 +37,7 @@ Fragment-Host: org.openhab.core org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\ - org.eclipse.jetty.util;version='[9.4.20,9.4.21)' + org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)',\ + org.openhab.core.tests;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun index 008700b43..cc4624008 100644 --- a/itests/org.openhab.core.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.tests/itest.bndrun @@ -13,7 +13,6 @@ Fragment-Host: org.openhab.core.thing # -runbundles: \ javax.measure.unit-api;version='[1.0.0,1.0.1)',\ - org.apache.commons.collections;version='[3.2.1,3.2.2)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\ org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\ @@ -21,18 +20,10 @@ Fragment-Host: org.openhab.core.thing org.apache.felix.scr;version='[2.1.10,2.1.11)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ org.objenesis;version='[2.6.0,2.6.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing.tests;version='[2.5.0,2.5.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\ - org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing.xml;version='[2.5.0,2.5.1)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ slf4j.api;version='[1.7.25,1.7.26)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ @@ -51,4 +42,12 @@ Fragment-Host: org.openhab.core.thing org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\ - org.eclipse.jetty.util;version='[9.4.20,9.4.21)' + org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.xml;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing.tests;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing.xml;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.thing.xml.tests/itest.bndrun b/itests/org.openhab.core.thing.xml.tests/itest.bndrun index 99d7d000e..b66ca6397 100644 --- a/itests/org.openhab.core.thing.xml.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.xml.tests/itest.bndrun @@ -12,25 +12,15 @@ Fragment-Host: org.openhab.core.thing.xml # -runbundles: \ javax.measure.unit-api;version='[1.0.0,1.0.1)',\ - org.apache.commons.collections;version='[3.2.1,3.2.2)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ org.apache.felix.scr;version='[2.1.10,2.1.11)',\ org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing.xml;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing.xml.tests;version='[2.5.0,2.5.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.openhab.core.binding.xml;version='[2.5.0,2.5.1)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ slf4j.api;version='[1.7.25,1.7.26)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ @@ -46,4 +36,13 @@ Fragment-Host: org.openhab.core.thing.xml org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\ - org.eclipse.jetty.util;version='[9.4.20,9.4.21)' + org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.binding.xml;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.xml;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing.xml.tests;version='[3.0.0,3.0.1)' diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun index fa9bc9df5..9f50ac9c0 100644 --- a/itests/org.openhab.core.voice.tests/itest.bndrun +++ b/itests/org.openhab.core.voice.tests/itest.bndrun @@ -10,22 +10,12 @@ Fragment-Host: org.openhab.core.voice # -runbundles: \ javax.measure.unit-api;version='[1.0.0,1.0.1)',\ - org.apache.commons.collections;version='[3.2.1,3.2.2)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\ org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ org.apache.felix.scr;version='[2.1.10,2.1.11)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.audio;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.http;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing;version='[2.5.0,2.5.1)',\ - org.openhab.core.voice;version='[2.5.0,2.5.1)',\ - org.openhab.core.voice.tests;version='[2.5.0,2.5.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ @@ -55,4 +45,13 @@ Fragment-Host: org.openhab.core.voice org.ops4j.pax.web.pax-web-api;version='[7.2.11,7.2.12)',\ org.ops4j.pax.web.pax-web-jetty;version='[7.2.11,7.2.12)',\ org.ops4j.pax.web.pax-web-runtime;version='[7.2.11,7.2.12)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)' + org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)',\ + org.openhab.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.audio;version='[3.0.0,3.0.1)',\ + org.openhab.core.config.core;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ + org.openhab.core.io.http;version='[3.0.0,3.0.1)',\ + org.openhab.core.test;version='[3.0.0,3.0.1)',\ + org.openhab.core.thing;version='[3.0.0,3.0.1)',\ + org.openhab.core.voice;version='[3.0.0,3.0.1)',\ + org.openhab.core.voice.tests;version='[3.0.0,3.0.1)'