Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update bnd to 6.1.0 #11650

Merged
merged 1 commit into from
Nov 28, 2021
Merged

Update bnd to 6.1.0 #11650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.astro.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ Fragment-Host: org.openhab.binding.astro
org.openhab.core.thing;version='[3.2.0,3.2.1)',\
org.apache.felix.scr;version='[2.1.28,2.1.29)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
junit-jupiter-api;version='[5.8.1,5.8.2)',\
Expand All @@ -50,4 +49,5 @@ Fragment-Host: org.openhab.binding.astro
net.bytebuddy.byte-buddy;version='[1.12.1,1.12.2)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
org.objenesis;version='[3.2.0,3.2.1)'
org.objenesis;version='[3.2.0,3.2.1)',\
biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.avmfritz.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ Fragment-Host: org.openhab.binding.avmfritz
org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\
biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
junit-jupiter-api;version='[5.8.1,5.8.2)',\
Expand All @@ -75,4 +74,5 @@ Fragment-Host: org.openhab.binding.avmfritz
net.bytebuddy.byte-buddy;version='[1.12.1,1.12.2)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
org.objenesis;version='[3.2.0,3.2.1)'
org.objenesis;version='[3.2.0,3.2.1)',\
biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.feed.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ Fragment-Host: org.openhab.binding.feed
org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.3.19,7.3.20)',\
org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\
biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
junit-jupiter-api;version='[5.8.1,5.8.2)',\
junit-jupiter-engine;version='[5.8.1,5.8.2)',\
junit-platform-commons;version='[1.8.1,1.8.2)',\
junit-platform-engine;version='[1.8.1,1.8.2)',\
junit-platform-launcher;version='[1.8.1,1.8.2)'
junit-platform-launcher;version='[1.8.1,1.8.2)',\
biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.hue.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ Fragment-Host: org.openhab.binding.hue
org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\
biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
junit-jupiter-api;version='[5.8.1,5.8.2)',\
junit-jupiter-engine;version='[5.8.1,5.8.2)',\
junit-platform-commons;version='[1.8.1,1.8.2)',\
junit-platform-engine;version='[1.8.1,1.8.2)',\
junit-platform-launcher;version='[1.8.1,1.8.2)'
junit-platform-launcher;version='[1.8.1,1.8.2)',\
biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.max.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ Fragment-Host: org.openhab.binding.max
org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
junit-jupiter-api;version='[5.8.1,5.8.2)',\
junit-jupiter-engine;version='[5.8.1,5.8.2)',\
junit-platform-commons;version='[1.8.1,1.8.2)',\
junit-platform-engine;version='[1.8.1,1.8.2)',\
junit-platform-launcher;version='[1.8.1,1.8.2)'
junit-platform-launcher;version='[1.8.1,1.8.2)',\
biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.mielecloud.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ Fragment-Host: org.openhab.binding.mielecloud
org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.3.19,7.3.20)',\
org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\
biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
junit-jupiter-api;version='[5.8.1,5.8.2)',\
Expand All @@ -85,4 +84,5 @@ Fragment-Host: org.openhab.binding.mielecloud
net.bytebuddy.byte-buddy;version='[1.12.1,1.12.2)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
org.objenesis;version='[3.2.0,3.2.1)'
org.objenesis;version='[3.2.0,3.2.1)',\
biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.modbus.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ Fragment-Host: org.openhab.binding.modbus
org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
junit-jupiter-api;version='[5.8.1,5.8.2)',\
Expand All @@ -75,4 +74,5 @@ Fragment-Host: org.openhab.binding.modbus
net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\
org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
org.objenesis;version='[3.2.0,3.2.1)'
org.objenesis;version='[3.2.0,3.2.1)',\
biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.nest.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ Fragment-Host: org.openhab.binding.nest
org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\
org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\
org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\
biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
com.fasterxml.woodstox.woodstox-core;version='[6.2.6,6.2.7)',\
org.apache.aries.jax.rs.whiteboard;version='[2.0.1,2.0.2)',\
org.apache.cxf.cxf-core;version='[3.4.5,3.4.6)',\
Expand All @@ -104,4 +103,5 @@ Fragment-Host: org.openhab.binding.nest
net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\
org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
org.objenesis;version='[3.2.0,3.2.1)'
org.objenesis;version='[3.2.0,3.2.1)',\
biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.ntp.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ Fragment-Host: org.openhab.binding.ntp
org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
junit-jupiter-api;version='[5.8.1,5.8.2)',\
Expand All @@ -70,4 +69,5 @@ Fragment-Host: org.openhab.binding.ntp
net.bytebuddy.byte-buddy;version='[1.12.1,1.12.2)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
org.objenesis;version='[3.2.0,3.2.1)'
org.objenesis;version='[3.2.0,3.2.1)',\
biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.systeminfo.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ Fragment-Host: org.openhab.binding.systeminfo
org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
com.sun.jna;version='[5.9.0,5.9.1)',\
com.sun.jna.platform;version='[5.9.0,5.9.1)',\
biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
junit-jupiter-api;version='[5.8.1,5.8.2)',\
Expand All @@ -73,4 +72,5 @@ Fragment-Host: org.openhab.binding.systeminfo
net.bytebuddy.byte-buddy;version='[1.12.1,1.12.2)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
org.objenesis;version='[3.2.0,3.2.1)'
org.objenesis;version='[3.2.0,3.2.1)',\
biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.tradfri.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ Fragment-Host: org.openhab.binding.tradfri
org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
junit-jupiter-api;version='[5.8.1,5.8.2)',\
Expand All @@ -76,4 +75,5 @@ Fragment-Host: org.openhab.binding.tradfri
net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\
org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
org.objenesis;version='[3.2.0,3.2.1)'
org.objenesis;version='[3.2.0,3.2.1)',\
biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.wemo.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ Fragment-Host: org.openhab.binding.wemo
org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\
biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
junit-jupiter-api;version='[5.8.1,5.8.2)',\
Expand All @@ -83,4 +82,5 @@ Fragment-Host: org.openhab.binding.wemo
net.bytebuddy.byte-buddy;version='[1.12.1,1.12.2)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
org.objenesis;version='[3.2.0,3.2.1)'
org.objenesis;version='[3.2.0,3.2.1)',\
biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.persistence.mapdb.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ Fragment-Host: org.openhab.persistence.mapdb
org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
junit-jupiter-api;version='[5.8.1,5.8.2)',\
junit-jupiter-engine;version='[5.8.1,5.8.2)',\
junit-platform-commons;version='[1.8.1,1.8.2)',\
junit-platform-engine;version='[1.8.1,1.8.2)',\
junit-platform-launcher;version='[1.8.1,1.8.2)'
junit-platform-launcher;version='[1.8.1,1.8.2)',\
biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)'
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>

<ohc.version>3.2.0-SNAPSHOT</ohc.version>
<bnd.version>6.0.0</bnd.version>
<bnd.version>6.1.0</bnd.version>
<commons.net.version>3.7.2</commons.net.version>
<eea.version>2.2.1</eea.version>
<jackson.version>2.12.5</jackson.version>
Expand Down