Skip to content

Commit

Permalink
Resolve runbundles for jUPnP upgrade
Browse files Browse the repository at this point in the history 
Related to openhab/openhab-core#4098

Signed-off-by: Wouter Born <github@maindrain.net>
  • Loading branch information
@wborn
wborn committed Feb 18, 2024
1 parent 51109f4 commit 1329f70
Show file tree
Hide file tree
Showing 17 changed files with 62 additions and 19 deletions.
3 changes: 2 additions & 1 deletion itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,5 @@ Fragment-Host: org.openhab.automation.groovyscripting
org.threeten.extra;version='[1.7.2,1.7.3)',\
stax2-api;version='[4.2.1,4.2.2)',\
de.focus_shift.jollyday-core;version='[0.23.2,0.23.3)',\
de.focus_shift.jollyday-jackson;version='[0.23.2,0.23.3)'
de.focus_shift.jollyday-jackson;version='[0.23.2,0.23.3)',\
org.openhab.core.addon;version='[4.2.0,4.2.1)'
3 changes: 2 additions & 1 deletion itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,5 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
org.threeten.extra;version='[1.7.2,1.7.3)',\
stax2-api;version='[4.2.1,4.2.2)',\
de.focus_shift.jollyday-core;version='[0.23.2,0.23.3)',\
de.focus_shift.jollyday-jackson;version='[0.23.2,0.23.3)'
de.focus_shift.jollyday-jackson;version='[0.23.2,0.23.3)',\
org.openhab.core.addon;version='[4.2.0,4.2.1)'
3 changes: 2 additions & 1 deletion itests/org.openhab.binding.astro.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,5 @@ Fragment-Host: org.openhab.binding.astro
org.openhab.core.storage.json;version='[4.2.0,4.2.1)',\
org.openhab.core.thing;version='[4.2.0,4.2.1)',\
org.openhab.core.transform;version='[4.2.0,4.2.1)',\
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
org.openhab.core.addon;version='[4.2.0,4.2.1)'
11 changes: 9 additions & 2 deletions itests/org.openhab.binding.avmfritz.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ Fragment-Host: org.openhab.binding.avmfritz
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.0,1.5.1)',\
org.jupnp;version='[2.7.1,2.7.2)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
Expand Down Expand Up @@ -88,4 +87,12 @@ Fragment-Host: org.openhab.binding.avmfritz
org.openhab.core.test;version='[4.2.0,4.2.1)',\
org.openhab.core.thing;version='[4.2.0,4.2.1)',\
org.openhab.core.transform;version='[4.2.0,4.2.1)',\
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
org.eclipse.jetty.jaas;version='[9.4.52,9.4.53)',\
org.eclipse.jetty.xml;version='[9.4.52,9.4.53)',\
org.jupnp;version='[3.0.0,3.0.1)',\
org.openhab.core.addon;version='[4.2.0,4.2.1)',\
org.ops4j.pax.web.pax-web-jetty;version='[8.0.22,8.0.23)',\
org.ops4j.pax.web.pax-web-runtime;version='[8.0.22,8.0.23)',\
org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\
org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)'
3 changes: 2 additions & 1 deletion itests/org.openhab.binding.feed.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,5 @@ Fragment-Host: org.openhab.binding.feed
org.openhab.core.test;version='[4.2.0,4.2.1)',\
org.openhab.core.thing;version='[4.2.0,4.2.1)',\
org.openhab.core.transform;version='[4.2.0,4.2.1)',\
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
org.openhab.core.addon;version='[4.2.0,4.2.1)'
11 changes: 9 additions & 2 deletions itests/org.openhab.binding.hue.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ Fragment-Host: org.openhab.binding.hue
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)',\
javax.jmdns;version='[3.5.9,3.5.10)',\
org.jupnp;version='[2.7.1,2.7.2)',\
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.0,1.5.1)',\
Expand Down Expand Up @@ -94,4 +93,12 @@ Fragment-Host: org.openhab.binding.hue
org.openhab.core.test;version='[4.2.0,4.2.1)',\
org.openhab.core.thing;version='[4.2.0,4.2.1)',\
org.openhab.core.transform;version='[4.2.0,4.2.1)',\
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
org.eclipse.jetty.jaas;version='[9.4.52,9.4.53)',\
org.eclipse.jetty.xml;version='[9.4.52,9.4.53)',\
org.jupnp;version='[3.0.0,3.0.1)',\
org.openhab.core.addon;version='[4.2.0,4.2.1)',\
org.ops4j.pax.web.pax-web-jetty;version='[8.0.22,8.0.23)',\
org.ops4j.pax.web.pax-web-runtime;version='[8.0.22,8.0.23)',\
org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\
org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)'
3 changes: 2 additions & 1 deletion itests/org.openhab.binding.max.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,5 @@ Fragment-Host: org.openhab.binding.max
org.openhab.core.test;version='[4.2.0,4.2.1)',\
org.openhab.core.thing;version='[4.2.0,4.2.1)',\
org.openhab.core.transform;version='[4.2.0,4.2.1)',\
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
org.openhab.core.addon;version='[4.2.0,4.2.1)'
3 changes: 2 additions & 1 deletion itests/org.openhab.binding.mielecloud.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,5 @@ Fragment-Host: org.openhab.binding.mielecloud
org.openhab.core.test;version='[4.2.0,4.2.1)',\
org.openhab.core.thing;version='[4.2.0,4.2.1)',\
org.openhab.core.transform;version='[4.2.0,4.2.1)',\
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
org.openhab.core.addon;version='[4.2.0,4.2.1)'
3 changes: 2 additions & 1 deletion itests/org.openhab.binding.modbus.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,5 @@ Fragment-Host: org.openhab.binding.modbus
org.openhab.core.test;version='[4.2.0,4.2.1)',\
org.openhab.core.thing;version='[4.2.0,4.2.1)',\
org.openhab.core.transform;version='[4.2.0,4.2.1)',\
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
org.openhab.core.addon;version='[4.2.0,4.2.1)'
3 changes: 2 additions & 1 deletion itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,5 @@ Import-Package: \
io.netty.resolver;version='[4.1.104,4.1.105)',\
io.netty.transport;version='[4.1.104,4.1.105)',\
io.netty.transport-native-unix-common;version='[4.1.104,4.1.105)',\
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
org.openhab.core.addon;version='[4.2.0,4.2.1)'
3 changes: 2 additions & 1 deletion itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,5 +115,6 @@ Import-Package: \
io.netty.resolver;version='[4.1.104,4.1.105)',\
io.netty.transport;version='[4.1.104,4.1.105)',\
io.netty.transport-native-unix-common;version='[4.1.104,4.1.105)',\
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
org.openhab.core.addon;version='[4.2.0,4.2.1)'

3 changes: 2 additions & 1 deletion itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,5 @@ Import-Package: \
io.netty.resolver;version='[4.1.104,4.1.105)',\
io.netty.transport;version='[4.1.104,4.1.105)',\
io.netty.transport-native-unix-common;version='[4.1.104,4.1.105)',\
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
org.openhab.core.addon;version='[4.2.0,4.2.1)'
3 changes: 2 additions & 1 deletion itests/org.openhab.binding.ntp.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,5 @@ Fragment-Host: org.openhab.binding.ntp
org.openhab.core.test;version='[4.2.0,4.2.1)',\
org.openhab.core.thing;version='[4.2.0,4.2.1)',\
org.openhab.core.transform;version='[4.2.0,4.2.1)',\
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
org.openhab.core.addon;version='[4.2.0,4.2.1)'
3 changes: 2 additions & 1 deletion itests/org.openhab.binding.systeminfo.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,5 @@ Fragment-Host: org.openhab.binding.systeminfo
org.openhab.core.test;version='[4.2.0,4.2.1)',\
org.openhab.core.thing;version='[4.2.0,4.2.1)',\
org.openhab.core.transform;version='[4.2.0,4.2.1)',\
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
org.openhab.core.addon;version='[4.2.0,4.2.1)'
3 changes: 2 additions & 1 deletion itests/org.openhab.binding.tradfri.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,5 @@ Fragment-Host: org.openhab.binding.tradfri
org.openhab.core.test;version='[4.2.0,4.2.1)',\
org.openhab.core.thing;version='[4.2.0,4.2.1)',\
org.openhab.core.transform;version='[4.2.0,4.2.1)',\
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
org.openhab.core.addon;version='[4.2.0,4.2.1)'
14 changes: 12 additions & 2 deletions itests/org.openhab.binding.wemo.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
Bundle-SymbolicName: ${project.artifactId}
Fragment-Host: org.openhab.binding.wemo

-includeresource: \
@org.jupnp-*-tests.jar!/org/jupnp/mock/*

-runrequires: \
bnd.identity;id='org.openhab.binding.wemo.tests'

Expand All @@ -27,7 +30,6 @@ Fragment-Host: org.openhab.binding.wemo
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.0,1.5.1)',\
org.jupnp;version='[2.7.1,2.7.2)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
Expand Down Expand Up @@ -90,4 +92,12 @@ Fragment-Host: org.openhab.binding.wemo
org.openhab.core.test;version='[4.2.0,4.2.1)',\
org.openhab.core.thing;version='[4.2.0,4.2.1)',\
org.openhab.core.transform;version='[4.2.0,4.2.1)',\
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
org.eclipse.jetty.jaas;version='[9.4.52,9.4.53)',\
org.eclipse.jetty.xml;version='[9.4.52,9.4.53)',\
org.jupnp;version='[3.0.0,3.0.1)',\
org.openhab.core.addon;version='[4.2.0,4.2.1)',\
org.ops4j.pax.web.pax-web-jetty;version='[8.0.22,8.0.23)',\
org.ops4j.pax.web.pax-web-runtime;version='[8.0.22,8.0.23)',\
org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\
org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)'
6 changes: 6 additions & 0 deletions itests/org.openhab.binding.wemo.tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
<name>openHAB Add-ons :: Integration Tests :: Wemo Binding Tests</name>

<dependencies>
<dependency>
<groupId>org.jupnp</groupId>
<artifactId>org.jupnp</artifactId>
<version>3.0.0</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.openhab.addons.bundles</groupId>
<artifactId>org.openhab.binding.wemo</artifactId>
Expand Down

0 comments on commit 1329f70

Please sign in to comment.