From 075b7265c0a2465e27eb563011a06b80b1afb61a Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Thu, 24 Dec 2020 00:58:48 +0100 Subject: [PATCH] Resolve itest runbundles for XStream 1.4.15 (#9489) Signed-off-by: Wouter Born --- itests/org.openhab.binding.feed.tests/itest.bndrun | 4 ++-- itests/org.openhab.binding.hue.tests/itest.bndrun | 4 ++-- itests/org.openhab.binding.max.tests/itest.bndrun | 4 ++-- itests/org.openhab.binding.modbus.tests/itest.bndrun | 4 ++-- itests/org.openhab.binding.nest.tests/itest.bndrun | 4 ++-- itests/org.openhab.binding.ntp.tests/itest.bndrun | 4 ++-- itests/org.openhab.binding.systeminfo.tests/itest.bndrun | 4 ++-- itests/org.openhab.binding.tradfri.tests/itest.bndrun | 4 ++-- itests/org.openhab.binding.wemo.tests/itest.bndrun | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun index f3b9abf6d..16723f55b 100644 --- a/itests/org.openhab.binding.feed.tests/itest.bndrun +++ b/itests/org.openhab.binding.feed.tests/itest.bndrun @@ -61,7 +61,6 @@ Fragment-Host: org.openhab.binding.feed org.ops4j.pax.web.pax-web-jetty;version='[7.2.19,7.2.20)',\ org.ops4j.pax.web.pax-web-runtime;version='[7.2.19,7.2.20)',\ org.ops4j.pax.web.pax-web-spi;version='[7.2.19,7.2.20)',\ - xstream;version='[1.4.13,1.4.14)',\ org.openhab.binding.feed;version='[3.1.0,3.1.1)',\ org.openhab.binding.feed.tests;version='[3.1.0,3.1.1)',\ org.openhab.core;version='[3.1.0,3.1.1)',\ @@ -71,4 +70,5 @@ Fragment-Host: org.openhab.binding.feed org.openhab.core.io.console;version='[3.1.0,3.1.1)',\ org.openhab.core.test;version='[3.1.0,3.1.1)',\ org.openhab.core.thing;version='[3.1.0,3.1.1)',\ - org.openhab.core.thing.xml;version='[3.1.0,3.1.1)' \ No newline at end of file + org.openhab.core.thing.xml;version='[3.1.0,3.1.1)',\ + xstream;version='[1.4.15,1.4.16)' \ No newline at end of file diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun index b6ca9f6cc..afb10419d 100644 --- a/itests/org.openhab.binding.hue.tests/itest.bndrun +++ b/itests/org.openhab.binding.hue.tests/itest.bndrun @@ -59,7 +59,6 @@ Fragment-Host: org.openhab.binding.hue org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\ org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\ org.ops4j.pax.web.pax-web-api;version='[7.2.19,7.2.20)',\ - xstream;version='[1.4.13,1.4.14)',\ org.openhab.binding.hue;version='[3.1.0,3.1.1)',\ org.openhab.binding.hue.tests;version='[3.1.0,3.1.1)',\ org.openhab.core;version='[3.1.0,3.1.1)',\ @@ -72,4 +71,5 @@ Fragment-Host: org.openhab.binding.hue org.openhab.core.io.net;version='[3.1.0,3.1.1)',\ org.openhab.core.test;version='[3.1.0,3.1.1)',\ org.openhab.core.thing;version='[3.1.0,3.1.1)',\ - org.openhab.core.thing.xml;version='[3.1.0,3.1.1)' + org.openhab.core.thing.xml;version='[3.1.0,3.1.1)',\ + xstream;version='[1.4.15,1.4.16)' diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun index 377f8c3bd..530360782 100644 --- a/itests/org.openhab.binding.max.tests/itest.bndrun +++ b/itests/org.openhab.binding.max.tests/itest.bndrun @@ -47,7 +47,6 @@ Fragment-Host: org.openhab.binding.max jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ - xstream;version='[1.4.13,1.4.14)',\ org.openhab.binding.max;version='[3.1.0,3.1.1)',\ org.openhab.binding.max.tests;version='[3.1.0,3.1.1)',\ org.openhab.core;version='[3.1.0,3.1.1)',\ @@ -58,4 +57,5 @@ Fragment-Host: org.openhab.binding.max org.openhab.core.io.console;version='[3.1.0,3.1.1)',\ org.openhab.core.test;version='[3.1.0,3.1.1)',\ org.openhab.core.thing;version='[3.1.0,3.1.1)',\ - org.openhab.core.thing.xml;version='[3.1.0,3.1.1)' + org.openhab.core.thing.xml;version='[3.1.0,3.1.1)',\ + xstream;version='[1.4.15,1.4.16)' diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun index ae268c545..120678d78 100644 --- a/itests/org.openhab.binding.modbus.tests/itest.bndrun +++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun @@ -63,7 +63,6 @@ Fragment-Host: org.openhab.binding.modbus jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ - xstream;version='[1.4.13,1.4.14)',\ org.openhab.binding.modbus;version='[3.1.0,3.1.1)',\ org.openhab.binding.modbus.tests;version='[3.1.0,3.1.1)',\ org.openhab.core;version='[3.1.0,3.1.1)',\ @@ -76,4 +75,5 @@ Fragment-Host: org.openhab.binding.modbus org.openhab.core.test;version='[3.1.0,3.1.1)',\ org.openhab.core.thing;version='[3.1.0,3.1.1)',\ org.openhab.core.thing.xml;version='[3.1.0,3.1.1)',\ - org.openhab.core.transform;version='[3.1.0,3.1.1)' + org.openhab.core.transform;version='[3.1.0,3.1.1)',\ + xstream;version='[1.4.15,1.4.16)' diff --git a/itests/org.openhab.binding.nest.tests/itest.bndrun b/itests/org.openhab.binding.nest.tests/itest.bndrun index 7745ed120..be6d08ebd 100644 --- a/itests/org.openhab.binding.nest.tests/itest.bndrun +++ b/itests/org.openhab.binding.nest.tests/itest.bndrun @@ -74,7 +74,6 @@ Fragment-Host: org.openhab.binding.nest org.ops4j.pax.web.pax-web-api;version='[7.2.19,7.2.20)',\ org.ops4j.pax.web.pax-web-jetty;version='[7.2.19,7.2.20)',\ org.ops4j.pax.web.pax-web-spi;version='[7.2.19,7.2.20)',\ - xstream;version='[1.4.13,1.4.14)',\ org.openhab.binding.nest;version='[3.1.0,3.1.1)',\ org.openhab.binding.nest.tests;version='[3.1.0,3.1.1)',\ org.openhab.core;version='[3.1.0,3.1.1)',\ @@ -86,4 +85,5 @@ Fragment-Host: org.openhab.binding.nest org.openhab.core.io.net;version='[3.1.0,3.1.1)',\ org.openhab.core.test;version='[3.1.0,3.1.1)',\ org.openhab.core.thing;version='[3.1.0,3.1.1)',\ - org.openhab.core.thing.xml;version='[3.1.0,3.1.1)' + org.openhab.core.thing.xml;version='[3.1.0,3.1.1)',\ + xstream;version='[1.4.15,1.4.16)' diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun index a390e4352..03592c0b7 100644 --- a/itests/org.openhab.binding.ntp.tests/itest.bndrun +++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun @@ -52,7 +52,6 @@ Fragment-Host: org.openhab.binding.ntp jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ - xstream;version='[1.4.13,1.4.14)',\ org.openhab.binding.ntp;version='[3.1.0,3.1.1)',\ org.openhab.binding.ntp.tests;version='[3.1.0,3.1.1)',\ org.openhab.core;version='[3.1.0,3.1.1)',\ @@ -63,4 +62,5 @@ Fragment-Host: org.openhab.binding.ntp org.openhab.core.io.console;version='[3.1.0,3.1.1)',\ org.openhab.core.test;version='[3.1.0,3.1.1)',\ org.openhab.core.thing;version='[3.1.0,3.1.1)',\ - org.openhab.core.thing.xml;version='[3.1.0,3.1.1)' + org.openhab.core.thing.xml;version='[3.1.0,3.1.1)',\ + xstream;version='[1.4.15,1.4.16)' diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun index e0feacefb..cdd4d945f 100644 --- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun +++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun @@ -55,7 +55,6 @@ Fragment-Host: org.openhab.binding.systeminfo jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ - xstream;version='[1.4.13,1.4.14)',\ org.openhab.binding.systeminfo;version='[3.1.0,3.1.1)',\ org.openhab.binding.systeminfo.tests;version='[3.1.0,3.1.1)',\ org.openhab.core;version='[3.1.0,3.1.1)',\ @@ -66,4 +65,5 @@ Fragment-Host: org.openhab.binding.systeminfo org.openhab.core.io.console;version='[3.1.0,3.1.1)',\ org.openhab.core.test;version='[3.1.0,3.1.1)',\ org.openhab.core.thing;version='[3.1.0,3.1.1)',\ - org.openhab.core.thing.xml;version='[3.1.0,3.1.1)' + org.openhab.core.thing.xml;version='[3.1.0,3.1.1)',\ + xstream;version='[1.4.15,1.4.16)' diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun index 693d9287f..fc1358c45 100644 --- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun +++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun @@ -54,7 +54,6 @@ Fragment-Host: org.openhab.binding.tradfri jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ - xstream;version='[1.4.13,1.4.14)',\ org.openhab.binding.tradfri;version='[3.1.0,3.1.1)',\ org.openhab.binding.tradfri.tests;version='[3.1.0,3.1.1)',\ org.openhab.core;version='[3.1.0,3.1.1)',\ @@ -67,4 +66,5 @@ Fragment-Host: org.openhab.binding.tradfri org.openhab.core.io.transport.mdns;version='[3.1.0,3.1.1)',\ org.openhab.core.test;version='[3.1.0,3.1.1)',\ org.openhab.core.thing;version='[3.1.0,3.1.1)',\ - org.openhab.core.thing.xml;version='[3.1.0,3.1.1)' + org.openhab.core.thing.xml;version='[3.1.0,3.1.1)',\ + xstream;version='[1.4.15,1.4.16)' diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun index cfd3d9f3f..6bbd931d7 100644 --- a/itests/org.openhab.binding.wemo.tests/itest.bndrun +++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun @@ -63,7 +63,6 @@ Fragment-Host: org.openhab.binding.wemo org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\ org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\ org.ops4j.pax.web.pax-web-api;version='[7.2.19,7.2.20)',\ - xstream;version='[1.4.13,1.4.14)',\ org.openhab.binding.wemo;version='[3.1.0,3.1.1)',\ org.openhab.binding.wemo.tests;version='[3.1.0,3.1.1)',\ org.openhab.core;version='[3.1.0,3.1.1)',\ @@ -77,4 +76,5 @@ Fragment-Host: org.openhab.binding.wemo org.openhab.core.io.transport.upnp;version='[3.1.0,3.1.1)',\ org.openhab.core.test;version='[3.1.0,3.1.1)',\ org.openhab.core.thing;version='[3.1.0,3.1.1)',\ - org.openhab.core.thing.xml;version='[3.1.0,3.1.1)' + org.openhab.core.thing.xml;version='[3.1.0,3.1.1)',\ + xstream;version='[1.4.15,1.4.16)'