Skip to content

Commit d5ab402

Browse files
wbornNickWaterton
authored andcommitted
Resolve runbundles for Xtext upgrade (openhab#12385)
Depends on openhab/openhab-core#2786 Signed-off-by: Wouter Born <github@maindrain.net> Signed-off-by: Nick Waterton <n.waterton@outlook.com>
1 parent 4e98bc7 commit d5ab402

File tree

13 files changed

+32
-32
lines changed

13 files changed

+32
-32
lines changed

itests/org.openhab.binding.astro.tests/itest.bndrun

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ Fragment-Host: org.openhab.binding.astro
1616
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
1717
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
1818
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
19-
com.google.gson;version='[2.8.6,2.8.7)',\
2019
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
2120
jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
2221
javax.measure.unit-api;version='[2.1.2,2.1.3)',\
@@ -50,4 +49,5 @@ Fragment-Host: org.openhab.binding.astro
5049
org.openhab.core.io.console;version='[3.3.0,3.3.1)',\
5150
org.openhab.core.storage.json;version='[3.3.0,3.3.1)',\
5251
org.openhab.core.thing;version='[3.3.0,3.3.1)',\
53-
org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)'
52+
org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
53+
com.google.gson;version='[2.8.9,2.8.10)'

itests/org.openhab.binding.avmfritz.tests/itest.bndrun

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ Fragment-Host: org.openhab.binding.avmfritz
2323
com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
2424
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
2525
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
26-
com.google.gson;version='[2.8.6,2.8.7)',\
27-
org.objectweb.asm;version='[9.1.0,9.1.1)',\
2826
org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
2927
org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
3028
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -75,4 +73,6 @@ Fragment-Host: org.openhab.binding.avmfritz
7573
org.openhab.core.thing;version='[3.3.0,3.3.1)',\
7674
org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\
7775
org.apache.xbean.finder;version='[4.20.0,4.20.1)',\
78-
org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)'
76+
org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
77+
com.google.gson;version='[2.8.9,2.8.10)',\
78+
org.objectweb.asm;version='[9.2.0,9.2.1)'

itests/org.openhab.binding.feed.tests/itest.bndrun

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ Fragment-Host: org.openhab.binding.feed
2727
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
2828
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
2929
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
30-
com.google.gson;version='[2.8.6,2.8.7)',\
31-
org.objectweb.asm;version='[9.1.0,9.1.1)',\
3230
org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
3331
org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
3432
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -75,4 +73,6 @@ Fragment-Host: org.openhab.binding.feed
7573
org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\
7674
org.apache.xbean.finder;version='[4.20.0,4.20.1)',\
7775
org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
78-
xstream;version='[1.4.19,1.4.20)'
76+
xstream;version='[1.4.19,1.4.20)',\
77+
com.google.gson;version='[2.8.9,2.8.10)',\
78+
org.objectweb.asm;version='[9.2.0,9.2.1)'

itests/org.openhab.binding.hue.tests/itest.bndrun

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ Fragment-Host: org.openhab.binding.hue
2727
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
2828
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
2929
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
30-
com.google.gson;version='[2.8.6,2.8.7)',\
31-
org.objectweb.asm;version='[9.1.0,9.1.1)',\
3230
org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
3331
org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
3432
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -79,4 +77,6 @@ Fragment-Host: org.openhab.binding.hue
7977
org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\
8078
org.apache.xbean.finder;version='[4.20.0,4.20.1)',\
8179
org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
82-
xstream;version='[1.4.19,1.4.20)'
80+
xstream;version='[1.4.19,1.4.20)',\
81+
com.google.gson;version='[2.8.9,2.8.10)',\
82+
org.objectweb.asm;version='[9.2.0,9.2.1)'

itests/org.openhab.binding.max.tests/itest.bndrun

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ Fragment-Host: org.openhab.binding.max
2525
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
2626
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
2727
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
28-
com.google.gson;version='[2.8.6,2.8.7)',\
2928
org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
3029
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
3130
jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
@@ -66,4 +65,5 @@ Fragment-Host: org.openhab.binding.max
6665
org.openhab.core.thing;version='[3.3.0,3.3.1)',\
6766
org.openhab.core.thing.xml;version='[3.3.0,3.3.1)',\
6867
org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
69-
xstream;version='[1.4.19,1.4.20)'
68+
xstream;version='[1.4.19,1.4.20)',\
69+
com.google.gson;version='[2.8.9,2.8.10)'

itests/org.openhab.binding.mielecloud.tests/itest.bndrun

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ Fragment-Host: org.openhab.binding.mielecloud
2525
org.opentest4j;version='[1.2.0,1.2.1)',\
2626
org.hamcrest;version='[2.2.0,2.2.1)',\
2727
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
28-
com.google.gson;version='[2.8.6,2.8.7)',\
29-
org.objectweb.asm;version='[9.1.0,9.1.1)',\
3028
org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
3129
org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
3230
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -85,4 +83,6 @@ Fragment-Host: org.openhab.binding.mielecloud
8583
org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\
8684
org.apache.xbean.finder;version='[4.20.0,4.20.1)',\
8785
org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
88-
xstream;version='[1.4.19,1.4.20)'
86+
xstream;version='[1.4.19,1.4.20)',\
87+
com.google.gson;version='[2.8.9,2.8.10)',\
88+
org.objectweb.asm;version='[9.2.0,9.2.1)'

itests/org.openhab.binding.modbus.tests/itest.bndrun

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ Fragment-Host: org.openhab.binding.modbus
2727
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
2828
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
2929
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
30-
com.google.gson;version='[2.8.6,2.8.7)',\
3130
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
3231
jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
3332
javax.measure.unit-api;version='[2.1.2,2.1.3)',\
@@ -75,4 +74,5 @@ Fragment-Host: org.openhab.binding.modbus
7574
org.openhab.core.thing.xml;version='[3.3.0,3.3.1)',\
7675
org.openhab.core.transform;version='[3.3.0,3.3.1)',\
7776
org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
78-
xstream;version='[1.4.19,1.4.20)'
77+
xstream;version='[1.4.19,1.4.20)',\
78+
com.google.gson;version='[2.8.9,2.8.10)'

itests/org.openhab.binding.nest.tests/itest.bndrun

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ Fragment-Host: org.openhab.binding.nest
2626
com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
2727
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
2828
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
29-
com.google.gson;version='[2.8.6,2.8.7)',\
3029
org.apache.aries.javax.jax.rs-api;version='[1.0.1,1.0.2)',\
31-
org.objectweb.asm;version='[9.1.0,9.1.1)',\
3230
org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
3331
org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
3432
jakarta.annotation-api;version='[1.3.5,1.3.6)',\
@@ -104,4 +102,6 @@ Fragment-Host: org.openhab.binding.nest
104102
org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\
105103
org.apache.xbean.finder;version='[4.20.0,4.20.1)',\
106104
org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
107-
xstream;version='[1.4.19,1.4.20)'
105+
xstream;version='[1.4.19,1.4.20)',\
106+
com.google.gson;version='[2.8.9,2.8.10)',\
107+
org.objectweb.asm;version='[9.2.0,9.2.1)'

itests/org.openhab.binding.ntp.tests/itest.bndrun

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ Fragment-Host: org.openhab.binding.ntp
2626
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
2727
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
2828
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
29-
com.google.gson;version='[2.8.6,2.8.7)',\
3029
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
3130
jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
3231
javax.measure.unit-api;version='[2.1.2,2.1.3)',\
@@ -70,4 +69,5 @@ Fragment-Host: org.openhab.binding.ntp
7069
org.openhab.core.thing;version='[3.3.0,3.3.1)',\
7170
org.openhab.core.thing.xml;version='[3.3.0,3.3.1)',\
7271
org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
73-
xstream;version='[1.4.19,1.4.20)'
72+
xstream;version='[1.4.19,1.4.20)',\
73+
com.google.gson;version='[2.8.9,2.8.10)'

itests/org.openhab.binding.systeminfo.tests/itest.bndrun

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ Fragment-Host: org.openhab.binding.systeminfo
2727
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
2828
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
2929
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
30-
com.google.gson;version='[2.8.6,2.8.7)',\
3130
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
3231
jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
3332
javax.measure.unit-api;version='[2.1.2,2.1.3)',\
@@ -73,4 +72,5 @@ Fragment-Host: org.openhab.binding.systeminfo
7372
org.openhab.core.thing;version='[3.3.0,3.3.1)',\
7473
org.openhab.core.thing.xml;version='[3.3.0,3.3.1)',\
7574
org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
76-
xstream;version='[1.4.19,1.4.20)'
75+
xstream;version='[1.4.19,1.4.20)',\
76+
com.google.gson;version='[2.8.9,2.8.10)'

itests/org.openhab.binding.tradfri.tests/itest.bndrun

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ Fragment-Host: org.openhab.binding.tradfri
2929
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
3030
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
3131
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
32-
com.google.gson;version='[2.8.6,2.8.7)',\
3332
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
3433
jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
3534
javax.measure.unit-api;version='[2.1.2,2.1.3)',\
@@ -76,4 +75,5 @@ Fragment-Host: org.openhab.binding.tradfri
7675
org.openhab.core.thing;version='[3.3.0,3.3.1)',\
7776
org.openhab.core.thing.xml;version='[3.3.0,3.3.1)',\
7877
org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
79-
xstream;version='[1.4.19,1.4.20)'
78+
xstream;version='[1.4.19,1.4.20)',\
79+
com.google.gson;version='[2.8.9,2.8.10)'

itests/org.openhab.binding.wemo.tests/itest.bndrun

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ Fragment-Host: org.openhab.binding.wemo
2626
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
2727
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
2828
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
29-
com.google.gson;version='[2.8.6,2.8.7)',\
30-
org.objectweb.asm;version='[9.1.0,9.1.1)',\
3129
org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
3230
org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
3331
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -83,4 +81,6 @@ Fragment-Host: org.openhab.binding.wemo
8381
org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\
8482
org.apache.xbean.finder;version='[4.20.0,4.20.1)',\
8583
org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
86-
xstream;version='[1.4.19,1.4.20)'
84+
xstream;version='[1.4.19,1.4.20)',\
85+
com.google.gson;version='[2.8.9,2.8.10)',\
86+
org.objectweb.asm;version='[9.2.0,9.2.1)'

itests/org.openhab.persistence.mapdb.tests/itest.bndrun

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ Fragment-Host: org.openhab.persistence.mapdb
2525
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
2626
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
2727
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
28-
com.google.gson;version='[2.8.6,2.8.7)',\
2928
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
3029
jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
3130
javax.measure.unit-api;version='[2.1.2,2.1.3)',\
@@ -57,4 +56,5 @@ Fragment-Host: org.openhab.persistence.mapdb
5756
org.openhab.core.test;version='[3.3.0,3.3.1)',\
5857
org.openhab.persistence.mapdb;version='[3.3.0,3.3.1)',\
5958
org.openhab.persistence.mapdb.tests;version='[3.3.0,3.3.1)',\
60-
org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)'
59+
org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
60+
com.google.gson;version='[2.8.9,2.8.10)'

0 commit comments

Comments
 (0)