From bd4528dcf32a72ebb4c6bdf4c30ed31e69f471d2 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Sun, 4 Oct 2020 18:34:57 +0200 Subject: [PATCH] Resolve itest bundles for Xtext upgrade (#8653) Related to openhab/openhab-core#1685 Signed-off-by: Wouter Born --- .../itest.bndrun | 14 ++++++------- .../itest.bndrun | 20 +++++++++---------- .../itest.bndrun | 14 ++++++------- .../itest.bndrun | 19 +++++++++--------- .../itest.bndrun | 14 ++++++------- 5 files changed, 40 insertions(+), 41 deletions(-) diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun index 67318a3b46e..699b868da48 100644 --- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun +++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun @@ -24,13 +24,8 @@ Fragment-Host: org.openhab.binding.avmfritz org.jupnp;version='[2.5.2,2.5.3)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ com.google.gson;version='[2.8.2,2.8.3)',\ - org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\ - org.apache.xbean.finder;version='[4.12.0,4.12.1)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.se;version='[1.0.10,1.0.11)',\ - 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.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)',\ @@ -42,7 +37,6 @@ Fragment-Host: org.openhab.binding.avmfritz 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.ops4j.pax.web.pax-web-api;version='[7.2.11,7.2.12)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\ junit-jupiter-api;version='[5.6.2,5.6.3)',\ @@ -68,4 +62,10 @@ Fragment-Host: org.openhab.binding.avmfritz jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ com.sun.xml.bind.jaxb-osgi;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)' + org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ + org.apache.xbean.bundleutils;version='[4.17.0,4.17.1)',\ + org.apache.xbean.finder;version='[4.17.0,4.17.1)',\ + org.objectweb.asm;version='[8.0.1,8.0.2)',\ + 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)' diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun index e2ce0982530..e4f9eeed764 100644 --- a/itests/org.openhab.binding.feed.tests/itest.bndrun +++ b/itests/org.openhab.binding.feed.tests/itest.bndrun @@ -24,8 +24,6 @@ Fragment-Host: org.openhab.binding.feed javax.measure.unit-api;version='[1.0.0,1.0.1)',\ org.apache.felix.scr;version='[2.1.10,2.1.11)',\ org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\ - org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\ - org.apache.xbean.finder;version='[4.12.0,4.12.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ slf4j.api;version='[1.7.25,1.7.26)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ @@ -33,9 +31,6 @@ Fragment-Host: org.openhab.binding.feed org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.se;version='[1.0.10,1.0.11)',\ - 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.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)',\ @@ -44,10 +39,6 @@ Fragment-Host: org.openhab.binding.feed org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\ 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)',\ biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\ junit-jupiter-api;version='[5.6.2,5.6.3)',\ junit-jupiter-engine;version='[5.6.2,5.6.3)',\ @@ -71,4 +62,13 @@ Fragment-Host: org.openhab.binding.feed com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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)' \ No newline at end of file + org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ + org.apache.xbean.bundleutils;version='[4.17.0,4.17.1)',\ + org.apache.xbean.finder;version='[4.17.0,4.17.1)',\ + org.objectweb.asm;version='[8.0.1,8.0.2)',\ + 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)',\ + 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)' \ 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 b5250125bcc..7b0992a8234 100644 --- a/itests/org.openhab.binding.hue.tests/itest.bndrun +++ b/itests/org.openhab.binding.hue.tests/itest.bndrun @@ -22,8 +22,6 @@ Fragment-Host: org.openhab.binding.hue 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.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\ - org.apache.xbean.finder;version='[4.12.0,4.12.1)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ org.jupnp;version='[2.5.2,2.5.3)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ @@ -31,9 +29,6 @@ Fragment-Host: org.openhab.binding.hue org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.se;version='[1.0.10,1.0.11)',\ - 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.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)',\ @@ -45,7 +40,6 @@ Fragment-Host: org.openhab.binding.hue 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.ops4j.pax.web.pax-web-api;version='[7.2.11,7.2.12)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\ junit-jupiter-api;version='[5.6.2,5.6.3)',\ @@ -72,4 +66,10 @@ Fragment-Host: org.openhab.binding.hue com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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)' + org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ + org.apache.xbean.bundleutils;version='[4.17.0,4.17.1)',\ + org.apache.xbean.finder;version='[4.17.0,4.17.1)',\ + org.objectweb.asm;version='[8.0.1,8.0.2)',\ + 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)' diff --git a/itests/org.openhab.binding.nest.tests/itest.bndrun b/itests/org.openhab.binding.nest.tests/itest.bndrun index 0bd63c939ba..437ea724b53 100644 --- a/itests/org.openhab.binding.nest.tests/itest.bndrun +++ b/itests/org.openhab.binding.nest.tests/itest.bndrun @@ -28,8 +28,6 @@ Fragment-Host: org.openhab.binding.nest org.apache.felix.scr;version='[2.1.10,2.1.11)',\ org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ - org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\ - org.apache.xbean.finder;version='[4.12.0,4.12.1)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ org.eclipse.jetty.client;version='[9.4.20,9.4.21)',\ org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\ @@ -42,9 +40,6 @@ Fragment-Host: org.openhab.binding.nest 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.objectweb.asm.commons;version='[7.1.0,7.1.1)',\ - org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\ - org.objectweb.asm;version='[7.1.0,7.1.1)',\ org.objenesis;version='[2.6.0,2.6.1)',\ org.openhab.binding.nest.tests;version='[3.0.0,3.0.1)',\ org.openhab.binding.nest;version='[3.0.0,3.0.1)',\ @@ -59,10 +54,6 @@ Fragment-Host: org.openhab.binding.nest org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\ org.openhab.core;version='[3.0.0,3.0.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.osgi.service.event;version='[1.4.0,1.4.1)',\ org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\ org.osgi.util.function;version='[1.1.0,1.1.1)',\ @@ -87,4 +78,12 @@ Fragment-Host: org.openhab.binding.nest org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\ javax.xml.soap-api;version='[1.4.0,1.4.1)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ - org.apache.servicemix.specs.jaxws-api-2.3;version='[2.3.0,2.3.1)' + org.apache.servicemix.specs.jaxws-api-2.3;version='[2.3.0,2.3.1)',\ + org.apache.xbean.bundleutils;version='[4.17.0,4.17.1)',\ + org.apache.xbean.finder;version='[4.17.0,4.17.1)',\ + org.objectweb.asm;version='[8.0.1,8.0.2)',\ + 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)',\ + 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)' diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun index 3eae6dadb40..92623d9489a 100644 --- a/itests/org.openhab.binding.wemo.tests/itest.bndrun +++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun @@ -23,8 +23,6 @@ Fragment-Host: org.openhab.binding.wemo 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.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\ - org.apache.xbean.finder;version='[4.12.0,4.12.1)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ org.jupnp;version='[2.5.2,2.5.3)',\ org.objenesis;version='[2.6.0,2.6.1)',\ @@ -33,9 +31,6 @@ Fragment-Host: org.openhab.binding.wemo org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.se;version='[1.0.10,1.0.11)',\ - 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.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)',\ @@ -47,7 +42,6 @@ Fragment-Host: org.openhab.binding.wemo 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.ops4j.pax.web.pax-web-api;version='[7.2.11,7.2.12)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\ junit-jupiter-api;version='[5.6.2,5.6.3)',\ @@ -77,4 +71,10 @@ Fragment-Host: org.openhab.binding.wemo com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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)' + org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ + org.apache.xbean.bundleutils;version='[4.17.0,4.17.1)',\ + org.apache.xbean.finder;version='[4.17.0,4.17.1)',\ + org.objectweb.asm;version='[8.0.1,8.0.2)',\ + 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)'