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

Update bnd to 5.3.0 #2217

Merged
merged 1 commit into from
Feb 28, 2021
Merged

Update bnd to 5.3.0 #2217

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.core.auth.oauth2client.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,5 @@ Fragment-Host: org.openhab.core.auth.oauth2client
net.bytebuddy.byte-buddy-agent;version='[1.10.19,1.10.20)',\
org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
org.objenesis;version='[3.1.0,3.1.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.core.automation.integration.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,5 @@ Fragment-Host: org.openhab.core.automation
junit-platform-commons;version='[1.7.0,1.7.1)',\
junit-platform-engine;version='[1.7.0,1.7.1)',\
junit-platform-launcher;version='[1.7.0,1.7.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.core.automation.module.core.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ Fragment-Host: org.openhab.core.automation
junit-platform-engine;version='[1.7.0,1.7.1)',\
junit-platform-launcher;version='[1.7.0,1.7.1)',\
org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.core.automation.module.script.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ Fragment-Host: org.openhab.core.automation.module.script
junit-platform-commons;version='[1.7.0,1.7.1)',\
junit-platform-engine;version='[1.7.0,1.7.1)',\
junit-platform-launcher;version='[1.7.0,1.7.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ Fragment-Host: org.openhab.core.automation
junit-platform-engine;version='[1.7.0,1.7.1)',\
junit-platform-launcher;version='[1.7.0,1.7.1)',\
org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.core.automation.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ Fragment-Host: org.openhab.core.automation
junit-platform-engine;version='[1.7.0,1.7.1)',\
junit-platform-launcher;version='[1.7.0,1.7.1)',\
org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.core.binding.xml.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ Fragment-Host: org.openhab.core.binding.xml
junit-platform-commons;version='[1.7.0,1.7.1)',\
junit-platform-engine;version='[1.7.0,1.7.1)',\
junit-platform-launcher;version='[1.7.0,1.7.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.core.config.core.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ Fragment-Host: org.openhab.core.config.core
net.bytebuddy.byte-buddy-agent;version='[1.10.19,1.10.20)',\
org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
org.objenesis;version='[3.1.0,3.1.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
junit-platform-commons;version='[1.7.0,1.7.1)',\
junit-platform-engine;version='[1.7.0,1.7.1)',\
junit-platform-launcher;version='[1.7.0,1.7.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.core.config.discovery.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ Fragment-Host: org.openhab.core.config.discovery
org.mockito.junit-jupiter;version='[3.7.0,3.7.1)',\
org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
org.objenesis;version='[3.1.0,3.1.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
org.mockito.junit-jupiter;version='[3.7.0,3.7.1)',\
org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
org.objenesis;version='[3.1.0,3.1.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'

4 changes: 2 additions & 2 deletions itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,5 @@ Provide-Capability: \
net.bytebuddy.byte-buddy-agent;version='[1.10.19,1.10.20)',\
org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
org.objenesis;version='[3.1.0,3.1.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.core.config.dispatch.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ Fragment-Host: org.openhab.core.config.dispatch
junit-platform-commons;version='[1.7.0,1.7.1)',\
junit-platform-engine;version='[1.7.0,1.7.1)',\
junit-platform-launcher;version='[1.7.0,1.7.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.core.config.xml.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ Fragment-Host: org.openhab.core.config.xml
junit-platform-commons;version='[1.7.0,1.7.1)',\
junit-platform-engine;version='[1.7.0,1.7.1)',\
junit-platform-launcher;version='[1.7.0,1.7.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.core.ephemeris.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,5 @@ feature.openhab-config: \
junit-platform-commons;version='[1.7.0,1.7.1)',\
junit-platform-engine;version='[1.7.0,1.7.1)',\
junit-platform-launcher;version='[1.7.0,1.7.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.core.io.rest.core.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,5 @@ Fragment-Host: org.openhab.core.io.rest.core
org.mockito.junit-jupiter;version='[3.7.0,3.7.1)',\
org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
org.objenesis;version='[3.1.0,3.1.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
6 changes: 3 additions & 3 deletions itests/org.openhab.core.model.core.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Fragment-Host: org.openhab.core.model.core
org.mockito.junit-jupiter;version='[3.7.0,3.7.1)',\
org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
org.objenesis;version='[3.1.0,3.1.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
org.openhab.core.model.persistence.runtime;version='[3.1.0,3.1.1)',\
org.openhab.core.semantics;version='[3.1.0,3.1.1)'
org.openhab.core.semantics;version='[3.1.0,3.1.1)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
org.openhab.core.model.rule.runtime;version='[3.1.0,3.1.1)'
6 changes: 3 additions & 3 deletions itests/org.openhab.core.model.item.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Fragment-Host: org.openhab.core.model.item
junit-platform-commons;version='[1.7.0,1.7.1)',\
junit-platform-engine;version='[1.7.0,1.7.1)',\
junit-platform-launcher;version='[1.7.0,1.7.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
org.openhab.core.model.persistence.runtime;version='[3.1.0,3.1.1)',\
org.openhab.core.semantics;version='[3.1.0,3.1.1)'
org.openhab.core.semantics;version='[3.1.0,3.1.1)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
org.openhab.core.model.rule.runtime;version='[3.1.0,3.1.1)'
5 changes: 2 additions & 3 deletions itests/org.openhab.core.model.rule.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,7 @@ Fragment-Host: org.openhab.core.model.rule.runtime
junit-platform-commons;version='[1.7.0,1.7.1)',\
junit-platform-engine;version='[1.7.0,1.7.1)',\
junit-platform-launcher;version='[1.7.0,1.7.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
org.openhab.core.model.persistence.runtime;version='[3.1.0,3.1.1)',\
org.openhab.core.semantics;version='[3.1.0,3.1.1)'
org.openhab.core.semantics;version='[3.1.0,3.1.1)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
-runblacklist: bnd.identity;id='jakarta.activation-api'
6 changes: 3 additions & 3 deletions itests/org.openhab.core.model.script.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Fragment-Host: org.openhab.core.model.script
junit-platform-commons;version='[1.7.0,1.7.1)',\
junit-platform-engine;version='[1.7.0,1.7.1)',\
junit-platform-launcher;version='[1.7.0,1.7.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
org.openhab.core.model.persistence.runtime;version='[3.1.0,3.1.1)',\
org.openhab.core.semantics;version='[3.1.0,3.1.1)'
org.openhab.core.semantics;version='[3.1.0,3.1.1)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
org.openhab.core.model.rule.runtime;version='[3.1.0,3.1.1)'
6 changes: 3 additions & 3 deletions itests/org.openhab.core.model.thing.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Fragment-Host: org.openhab.core.model.thing
org.mockito.junit-jupiter;version='[3.7.0,3.7.1)',\
org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
org.objenesis;version='[3.1.0,3.1.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
org.openhab.core.model.persistence.runtime;version='[3.1.0,3.1.1)',\
org.openhab.core.semantics;version='[3.1.0,3.1.1)'
org.openhab.core.semantics;version='[3.1.0,3.1.1)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
org.openhab.core.model.rule.runtime;version='[3.1.0,3.1.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.core.storage.json.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ Fragment-Host: org.openhab.core.storage.json
junit-platform-commons;version='[1.7.0,1.7.1)',\
junit-platform-engine;version='[1.7.0,1.7.1)',\
junit-platform-launcher;version='[1.7.0,1.7.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.core.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ Fragment-Host: org.openhab.core
org.mockito.junit-jupiter;version='[3.7.0,3.7.1)',\
org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
org.objenesis;version='[3.1.0,3.1.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.core.thing.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ Fragment-Host: org.openhab.core.thing
org.mockito.junit-jupiter;version='[3.7.0,3.7.1)',\
org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
org.objenesis;version='[3.1.0,3.1.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.core.thing.xml.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ Fragment-Host: org.openhab.core.thing.xml
junit-platform-commons;version='[1.7.0,1.7.1)',\
junit-platform-engine;version='[1.7.0,1.7.1)',\
junit-platform-launcher;version='[1.7.0,1.7.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.core.voice.tests/itest.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,5 @@ Fragment-Host: org.openhab.core.voice
junit-platform-commons;version='[1.7.0,1.7.1)',\
junit-platform-engine;version='[1.7.0,1.7.1)',\
junit-platform-launcher;version='[1.7.0,1.7.1)',\
biz.aQute.tester.junit-platform;version='[5.2.0,5.2.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.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.target>${oh.java.version}</maven.compiler.target>
<maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>

<bnd.version>5.2.0</bnd.version>
<bnd.version>5.3.0</bnd.version>
<commons.net.version>3.7.2</commons.net.version>
<eea.version>2.2.1</eea.version>
<karaf.compile.version>4.2.1</karaf.compile.version>
Expand Down