From 52c21a35a32280dfd153df542da6bec4e9f7d222 Mon Sep 17 00:00:00 2001
From: Wouter Born <github@maindrain.net>
Date: Sat, 5 Mar 2022 15:19:52 +0100
Subject: [PATCH] Resolve runbundles for Xtext upgrade (#12385)

Depends on openhab/openhab-core#2786

Signed-off-by: Wouter Born <github@maindrain.net>
---
 itests/org.openhab.binding.astro.tests/itest.bndrun      | 4 ++--
 itests/org.openhab.binding.avmfritz.tests/itest.bndrun   | 6 +++---
 itests/org.openhab.binding.feed.tests/itest.bndrun       | 6 +++---
 itests/org.openhab.binding.hue.tests/itest.bndrun        | 6 +++---
 itests/org.openhab.binding.max.tests/itest.bndrun        | 4 ++--
 itests/org.openhab.binding.mielecloud.tests/itest.bndrun | 6 +++---
 itests/org.openhab.binding.modbus.tests/itest.bndrun     | 4 ++--
 itests/org.openhab.binding.nest.tests/itest.bndrun       | 6 +++---
 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       | 6 +++---
 itests/org.openhab.persistence.mapdb.tests/itest.bndrun  | 4 ++--
 13 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/itests/org.openhab.binding.astro.tests/itest.bndrun b/itests/org.openhab.binding.astro.tests/itest.bndrun
index c654c9624..631ee7280 100644
--- a/itests/org.openhab.binding.astro.tests/itest.bndrun
+++ b/itests/org.openhab.binding.astro.tests/itest.bndrun
@@ -16,7 +16,6 @@ Fragment-Host: org.openhab.binding.astro
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	com.google.gson;version='[2.8.6,2.8.7)',\
 	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
@@ -50,4 +49,5 @@ Fragment-Host: org.openhab.binding.astro
 	org.openhab.core.io.console;version='[3.3.0,3.3.1)',\
 	org.openhab.core.storage.json;version='[3.3.0,3.3.1)',\
 	org.openhab.core.thing;version='[3.3.0,3.3.1)',\
-	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)'
+	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
+	com.google.gson;version='[2.8.9,2.8.10)'
diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
index 54a42fdcb..4bd04fd2f 100644
--- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
+++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
@@ -23,8 +23,6 @@ Fragment-Host: org.openhab.binding.avmfritz
 	com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	com.google.gson;version='[2.8.6,2.8.7)',\
-	org.objectweb.asm;version='[9.1.0,9.1.1)',\
 	org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
 	org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
 	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -75,4 +73,6 @@ Fragment-Host: org.openhab.binding.avmfritz
 	org.openhab.core.thing;version='[3.3.0,3.3.1)',\
 	org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\
 	org.apache.xbean.finder;version='[4.20.0,4.20.1)',\
-	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)'
+	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	org.objectweb.asm;version='[9.2.0,9.2.1)'
diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun
index 415c59a70..f9fc77dde 100644
--- a/itests/org.openhab.binding.feed.tests/itest.bndrun
+++ b/itests/org.openhab.binding.feed.tests/itest.bndrun
@@ -27,8 +27,6 @@ Fragment-Host: org.openhab.binding.feed
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	com.google.gson;version='[2.8.6,2.8.7)',\
-	org.objectweb.asm;version='[9.1.0,9.1.1)',\
 	org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
 	org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
 	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -75,4 +73,6 @@ Fragment-Host: org.openhab.binding.feed
 	org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\
 	org.apache.xbean.finder;version='[4.20.0,4.20.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	xstream;version='[1.4.19,1.4.20)'
+	xstream;version='[1.4.19,1.4.20)',\
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	org.objectweb.asm;version='[9.2.0,9.2.1)'
diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun
index 285b942e6..33ef3d775 100644
--- a/itests/org.openhab.binding.hue.tests/itest.bndrun
+++ b/itests/org.openhab.binding.hue.tests/itest.bndrun
@@ -27,8 +27,6 @@ Fragment-Host: org.openhab.binding.hue
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	com.google.gson;version='[2.8.6,2.8.7)',\
-	org.objectweb.asm;version='[9.1.0,9.1.1)',\
 	org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
 	org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
 	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -79,4 +77,6 @@ Fragment-Host: org.openhab.binding.hue
 	org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\
 	org.apache.xbean.finder;version='[4.20.0,4.20.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	xstream;version='[1.4.19,1.4.20)'
+	xstream;version='[1.4.19,1.4.20)',\
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	org.objectweb.asm;version='[9.2.0,9.2.1)'
diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun
index 4d306a5cb..8b1054107 100644
--- a/itests/org.openhab.binding.max.tests/itest.bndrun
+++ b/itests/org.openhab.binding.max.tests/itest.bndrun
@@ -25,7 +25,6 @@ Fragment-Host: org.openhab.binding.max
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	com.google.gson;version='[2.8.6,2.8.7)',\
 	org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
 	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
@@ -66,4 +65,5 @@ Fragment-Host: org.openhab.binding.max
 	org.openhab.core.thing;version='[3.3.0,3.3.1)',\
 	org.openhab.core.thing.xml;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	xstream;version='[1.4.19,1.4.20)'
+	xstream;version='[1.4.19,1.4.20)',\
+	com.google.gson;version='[2.8.9,2.8.10)'
diff --git a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
index 704e62df1..49bbdd222 100644
--- a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
@@ -25,8 +25,6 @@ Fragment-Host: org.openhab.binding.mielecloud
 	org.opentest4j;version='[1.2.0,1.2.1)',\
 	org.hamcrest;version='[2.2.0,2.2.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	com.google.gson;version='[2.8.6,2.8.7)',\
-	org.objectweb.asm;version='[9.1.0,9.1.1)',\
 	org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
 	org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
 	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -85,4 +83,6 @@ Fragment-Host: org.openhab.binding.mielecloud
 	org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\
 	org.apache.xbean.finder;version='[4.20.0,4.20.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	xstream;version='[1.4.19,1.4.20)'
+	xstream;version='[1.4.19,1.4.20)',\
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	org.objectweb.asm;version='[9.2.0,9.2.1)'
diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun
index 2c6191793..8b6fb140c 100644
--- a/itests/org.openhab.binding.modbus.tests/itest.bndrun
+++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun
@@ -27,7 +27,6 @@ Fragment-Host: org.openhab.binding.modbus
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	com.google.gson;version='[2.8.6,2.8.7)',\
 	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
@@ -75,4 +74,5 @@ Fragment-Host: org.openhab.binding.modbus
 	org.openhab.core.thing.xml;version='[3.3.0,3.3.1)',\
 	org.openhab.core.transform;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	xstream;version='[1.4.19,1.4.20)'
+	xstream;version='[1.4.19,1.4.20)',\
+	com.google.gson;version='[2.8.9,2.8.10)'
diff --git a/itests/org.openhab.binding.nest.tests/itest.bndrun b/itests/org.openhab.binding.nest.tests/itest.bndrun
index dfc49379b..9162a74fa 100644
--- a/itests/org.openhab.binding.nest.tests/itest.bndrun
+++ b/itests/org.openhab.binding.nest.tests/itest.bndrun
@@ -26,9 +26,7 @@ Fragment-Host: org.openhab.binding.nest
 	com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	com.google.gson;version='[2.8.6,2.8.7)',\
 	org.apache.aries.javax.jax.rs-api;version='[1.0.1,1.0.2)',\
-	org.objectweb.asm;version='[9.1.0,9.1.1)',\
 	org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
 	org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
 	jakarta.annotation-api;version='[1.3.5,1.3.6)',\
@@ -104,4 +102,6 @@ Fragment-Host: org.openhab.binding.nest
 	org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\
 	org.apache.xbean.finder;version='[4.20.0,4.20.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	xstream;version='[1.4.19,1.4.20)'
+	xstream;version='[1.4.19,1.4.20)',\
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	org.objectweb.asm;version='[9.2.0,9.2.1)'
diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun
index 581544e03..b9306ff65 100644
--- a/itests/org.openhab.binding.ntp.tests/itest.bndrun
+++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun
@@ -26,7 +26,6 @@ Fragment-Host: org.openhab.binding.ntp
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	com.google.gson;version='[2.8.6,2.8.7)',\
 	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
@@ -70,4 +69,5 @@ Fragment-Host: org.openhab.binding.ntp
 	org.openhab.core.thing;version='[3.3.0,3.3.1)',\
 	org.openhab.core.thing.xml;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	xstream;version='[1.4.19,1.4.20)'
+	xstream;version='[1.4.19,1.4.20)',\
+	com.google.gson;version='[2.8.9,2.8.10)'
diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
index 339dfbc2a..4b2aa6d23 100644
--- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
@@ -27,7 +27,6 @@ Fragment-Host: org.openhab.binding.systeminfo
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	com.google.gson;version='[2.8.6,2.8.7)',\
 	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
@@ -73,4 +72,5 @@ Fragment-Host: org.openhab.binding.systeminfo
 	org.openhab.core.thing;version='[3.3.0,3.3.1)',\
 	org.openhab.core.thing.xml;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	xstream;version='[1.4.19,1.4.20)'
+	xstream;version='[1.4.19,1.4.20)',\
+	com.google.gson;version='[2.8.9,2.8.10)'
diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
index 724689476..16b6f9a94 100644
--- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun
+++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
@@ -29,7 +29,6 @@ Fragment-Host: org.openhab.binding.tradfri
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	com.google.gson;version='[2.8.6,2.8.7)',\
 	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
@@ -76,4 +75,5 @@ Fragment-Host: org.openhab.binding.tradfri
 	org.openhab.core.thing;version='[3.3.0,3.3.1)',\
 	org.openhab.core.thing.xml;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	xstream;version='[1.4.19,1.4.20)'
+	xstream;version='[1.4.19,1.4.20)',\
+	com.google.gson;version='[2.8.9,2.8.10)'
diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun
index acd0f2fae..4e9ccdf38 100644
--- a/itests/org.openhab.binding.wemo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun
@@ -26,8 +26,6 @@ Fragment-Host: org.openhab.binding.wemo
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	com.google.gson;version='[2.8.6,2.8.7)',\
-	org.objectweb.asm;version='[9.1.0,9.1.1)',\
 	org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
 	org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
 	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -83,4 +81,6 @@ Fragment-Host: org.openhab.binding.wemo
 	org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\
 	org.apache.xbean.finder;version='[4.20.0,4.20.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	xstream;version='[1.4.19,1.4.20)'
+	xstream;version='[1.4.19,1.4.20)',\
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	org.objectweb.asm;version='[9.2.0,9.2.1)'
diff --git a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
index d7c8ab608..255b9af3e 100644
--- a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
+++ b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
@@ -25,7 +25,6 @@ Fragment-Host: org.openhab.persistence.mapdb
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	com.google.gson;version='[2.8.6,2.8.7)',\
 	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
@@ -57,4 +56,5 @@ Fragment-Host: org.openhab.persistence.mapdb
 	org.openhab.core.test;version='[3.3.0,3.3.1)',\
 	org.openhab.persistence.mapdb;version='[3.3.0,3.3.1)',\
 	org.openhab.persistence.mapdb.tests;version='[3.3.0,3.3.1)',\
-	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)'
+	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
+	com.google.gson;version='[2.8.9,2.8.10)'