Skip to content

Commit 8feb1ba

Browse files
lolodomololodomo
committed
Merge branch 'main' into fix_circular_ref
2 parents f0c6780 + 8eb6eea commit 8feb1ba

File tree

31 files changed

+151
-139
lines changed

31 files changed

+151
-139
lines changed

‎bom/test-index/pom.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,19 @@
1919
<dependency>
2020
<groupId>org.junit.jupiter</groupId>
2121
<artifactId>junit-jupiter-engine</artifactId>
22-
<version>5.12.1</version>
22+
<!-- junit 5.12.0 to 5.13.0-M3 fails silently with bnd 7.1.0, not executing unit tests;
23+
not sure if this is a bnd/junit issue or due to wrong configuration -->
24+
<version>5.11.4</version>
2325
</dependency>
2426
<dependency>
2527
<groupId>org.junit.platform</groupId>
2628
<artifactId>junit-platform-launcher</artifactId>
27-
<version>1.12.1</version>
29+
<version>1.11.4</version>
2830
</dependency>
2931
<dependency>
3032
<groupId>org.junit.platform</groupId>
3133
<artifactId>junit-platform-engine</artifactId>
32-
<version>1.12.1</version>
34+
<version>1.11.4</version>
3335
</dependency>
3436
<dependency>
3537
<groupId>biz.aQute.bnd</groupId>

‎bom/test/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
<properties>
1919
<!-- cxf can be updated independently, karaf only uses it in tests -->
2020
<cxf.version>3.6.5</cxf.version>
21-
<junit.version>5.12.1</junit.version>
21+
<!-- junit 5.12.0 to 5.13.0-M3 fails silently with bnd 7.1.0, not executing itests;
22+
not sure if this is a bnd/junit issue or due to wrong configuration -->
23+
<junit.version>5.11.4</junit.version>
2224
<mockito.version>4.11.0</mockito.version>
2325
</properties>
2426

‎bundles/org.openhab.core.io.http.auth/pages/authorize.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<input class="field" type="{repeatPasswordFieldType}" placeholder="{repeatPasswordPlaceholder}" name="password_repeat" />
115115
</div>
116116
<div>
117-
<input class="field" type="{tokenNameFieldType}" placeholder="{tokenNamePlaceholder}" name="token_name" />
117+
<input class="field" type="{tokenNameFieldType}" placeholder="{tokenNamePlaceholder}" name="token_name" required pattern="[a-zA-Z0-9]+" />
118118
</div>
119119
<div>
120120
<input class="field" type="{tokenScopeFieldType}" placeholder="{tokenScopePlaceholder}" name="token_scope" />

‎bundles/org.openhab.core.io.http.auth/src/main/resources/messages.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ auth.placeholder.username = User Name
1616
auth.placeholder.password = Password
1717
auth.placeholder.newpassword = New Password
1818
auth.placeholder.repeatpassword = Confirm New Password
19-
auth.placeholder.tokenname = Token Name
19+
auth.placeholder.tokenname = Token Name (alphanumeric)
2020
auth.placeholder.tokenscope = Token Scope (optional)
2121
2222
auth.button.signin = Sign In

‎bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/fileformat/FileFormatResource.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,9 @@ public Response createFileFormatForItems(final @Context HttpHeaders httpHeaders,
249249
return Response.status(Response.Status.UNSUPPORTED_MEDIA_TYPE)
250250
.entity("Unsupported media type '" + acceptHeader + "'!").build();
251251
}
252-
Collection<Item> items = null;
252+
List<Item> items;
253253
if (itemNames == null || itemNames.isEmpty()) {
254-
items = itemRegistry.getAll();
254+
items = getAllItemsSorted();
255255
} else {
256256
items = new ArrayList<>();
257257
for (String itemname : itemNames) {
@@ -264,7 +264,7 @@ public Response createFileFormatForItems(final @Context HttpHeaders httpHeaders,
264264
}
265265
}
266266
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
267-
generator.generateFileFormat(outputStream, sortItems(items), getMetadata(items), hideDefaultParameters);
267+
generator.generateFileFormat(outputStream, items, getMetadata(items), hideDefaultParameters);
268268
return Response.ok(new String(outputStream.toByteArray())).build();
269269
}
270270

@@ -290,9 +290,9 @@ public Response createFileFormatForThings(final @Context HttpHeaders httpHeaders
290290
return Response.status(Response.Status.UNSUPPORTED_MEDIA_TYPE)
291291
.entity("Unsupported media type '" + acceptHeader + "'!").build();
292292
}
293-
Collection<Thing> things = null;
293+
List<Thing> things;
294294
if (thingUIDs == null || thingUIDs.isEmpty()) {
295-
things = thingRegistry.getAll();
295+
things = getAllThingsSorted();
296296
} else {
297297
try {
298298
things = getThingsOrDiscoveryResult(thingUIDs);
@@ -301,7 +301,7 @@ public Response createFileFormatForThings(final @Context HttpHeaders httpHeaders
301301
}
302302
}
303303
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
304-
generator.generateFileFormat(outputStream, sortThings(things), hideDefaultParameters);
304+
generator.generateFileFormat(outputStream, things, hideDefaultParameters);
305305
return Response.ok(new String(outputStream.toByteArray())).build();
306306
}
307307

@@ -326,14 +326,15 @@ private Collection<Metadata> getMetadata(Collection<Item> items) {
326326
}
327327

328328
/*
329-
* Sort the items in such a way:
329+
* Get all items from registry sorted in such a way:
330330
* - group items are before non group items
331331
* - group items are sorted to have as much as possible ancestors before their children
332332
* - items not linked to a channel are before items linked to a channel
333333
* - items linked to a channel are grouped by thing UID
334334
* - items linked to the same thing UID are sorted by item name
335335
*/
336-
private List<Item> sortItems(Collection<Item> items) {
336+
private List<Item> getAllItemsSorted() {
337+
Collection<Item> items = itemRegistry.getAll();
337338
List<Item> groups = items.stream().filter(item -> item instanceof GroupItem).sorted((item1, item2) -> {
338339
return item1.getName().compareTo(item2.getName());
339340
}).toList();
@@ -387,12 +388,13 @@ private void fillGroupTree(List<Item> groups, Item item) {
387388
}
388389

389390
/*
390-
* Sort the things in such a way:
391+
* Get all things from registry sorted in such a way:
391392
* - things are grouped by binding, sorted by natural order of binding name
392393
* - all things of a binding are sorted to follow the tree, that is bridge thing is before its sub-things
393394
* - all things of a binding at a certain tree depth are sorted by thing UID
394395
*/
395-
private List<Thing> sortThings(Collection<Thing> things) {
396+
private List<Thing> getAllThingsSorted() {
397+
Collection<Thing> things = thingRegistry.getAll();
396398
List<Thing> thingTree = new ArrayList<>();
397399
Set<String> bindings = things.stream().map(thing -> thing.getUID().getBindingId()).collect(Collectors.toSet());
398400
for (String binding : bindings.stream().sorted().toList()) {

‎bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/fileconverter/DslItemFileConverter.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@ public String getFileFormatGenerator() {
8282
@Override
8383
public synchronized void generateFileFormat(OutputStream out, List<Item> items, Collection<Metadata> metadata,
8484
boolean hideDefaultParameters) {
85+
if (items.isEmpty()) {
86+
return;
87+
}
8588
ItemModel model = ItemsFactory.eINSTANCE.createItemModel();
8689
for (Item item : items) {
8790
model.getItems().add(buildModelItem(item, getChannelLinks(metadata, item.getName()),

‎bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/fileconverter/DslThingFileConverter.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ public String getFileFormatGenerator() {
7676

7777
@Override
7878
public synchronized void generateFileFormat(OutputStream out, List<Thing> things, boolean hideDefaultParameters) {
79+
if (things.isEmpty()) {
80+
return;
81+
}
7982
ThingModel model = ThingFactory.eINSTANCE.createThingModel();
8083
Set<Thing> handledThings = new HashSet<>();
8184
for (Thing thing : things) {

‎itests/org.openhab.core.addon.tests/itest.bndrun

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ Fragment-Host: org.openhab.core.addon
3737
org.osgi.service.event;version='[1.4.1,1.4.2)',\
3838
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
3939
com.google.gson;version='[2.11.0,2.11.1)',\
40-
junit-jupiter-api;version='[5.12.1,5.12.2)',\
41-
junit-jupiter-engine;version='[5.12.1,5.12.2)',\
42-
junit-platform-commons;version='[1.12.1,1.12.2)',\
43-
junit-platform-engine;version='[1.12.1,1.12.2)',\
44-
junit-platform-launcher;version='[1.12.1,1.12.2)',\
40+
junit-jupiter-api;version='[5.11.4,5.11.5)',\
41+
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
42+
junit-platform-commons;version='[1.11.4,1.11.5)',\
43+
junit-platform-engine;version='[1.11.4,1.11.5)',\
44+
junit-platform-launcher;version='[1.11.4,1.11.5)',\
4545
org.opentest4j;version='[1.3.0,1.3.1)',\
4646
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
4747
ch.qos.logback.core;version='[1.3.14,1.3.15)',\

‎itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ Fragment-Host: org.openhab.core.auth.oauth2client
3636
org.osgi.service.event;version='[1.4.1,1.4.2)',\
3737
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
3838
com.google.gson;version='[2.11.0,2.11.1)',\
39-
junit-jupiter-api;version='[5.12.1,5.12.2)',\
40-
junit-jupiter-engine;version='[5.12.1,5.12.2)',\
41-
junit-platform-commons;version='[1.12.1,1.12.2)',\
42-
junit-platform-engine;version='[1.12.1,1.12.2)',\
43-
junit-platform-launcher;version='[1.12.1,1.12.2)',\
39+
junit-jupiter-api;version='[5.11.4,5.11.5)',\
40+
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
41+
junit-platform-commons;version='[1.11.4,1.11.5)',\
42+
junit-platform-engine;version='[1.11.4,1.11.5)',\
43+
junit-platform-launcher;version='[1.11.4,1.11.5)',\
4444
org.opentest4j;version='[1.3.0,1.3.1)',\
4545
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
4646
ch.qos.logback.core;version='[1.3.14,1.3.15)',\

‎itests/org.openhab.core.automation.integration.tests/itest.bndrun

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ Fragment-Host: org.openhab.core.automation
3737
org.osgi.service.event;version='[1.4.1,1.4.2)',\
3838
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
3939
com.google.gson;version='[2.11.0,2.11.1)',\
40-
junit-jupiter-api;version='[5.12.1,5.12.2)',\
41-
junit-jupiter-engine;version='[5.12.1,5.12.2)',\
42-
junit-platform-commons;version='[1.12.1,1.12.2)',\
43-
junit-platform-engine;version='[1.12.1,1.12.2)',\
44-
junit-platform-launcher;version='[1.12.1,1.12.2)',\
40+
junit-jupiter-api;version='[5.11.4,5.11.5)',\
41+
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
42+
junit-platform-commons;version='[1.11.4,1.11.5)',\
43+
junit-platform-engine;version='[1.11.4,1.11.5)',\
44+
junit-platform-launcher;version='[1.11.4,1.11.5)',\
4545
org.opentest4j;version='[1.3.0,1.3.1)',\
4646
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
4747
ch.qos.logback.core;version='[1.3.14,1.3.15)',\

‎itests/org.openhab.core.automation.module.core.tests/itest.bndrun

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ Fragment-Host: org.openhab.core.automation
3737
org.osgi.service.event;version='[1.4.1,1.4.2)',\
3838
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
3939
com.google.gson;version='[2.11.0,2.11.1)',\
40-
junit-jupiter-api;version='[5.12.1,5.12.2)',\
41-
junit-jupiter-engine;version='[5.12.1,5.12.2)',\
42-
junit-platform-commons;version='[1.12.1,1.12.2)',\
43-
junit-platform-engine;version='[1.12.1,1.12.2)',\
44-
junit-platform-launcher;version='[1.12.1,1.12.2)',\
40+
junit-jupiter-api;version='[5.11.4,5.11.5)',\
41+
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
42+
junit-platform-commons;version='[1.11.4,1.11.5)',\
43+
junit-platform-engine;version='[1.11.4,1.11.5)',\
44+
junit-platform-launcher;version='[1.11.4,1.11.5)',\
4545
org.opentest4j;version='[1.3.0,1.3.1)',\
4646
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
4747
ch.qos.logback.core;version='[1.3.14,1.3.15)',\

‎itests/org.openhab.core.automation.module.script.tests/itest.bndrun

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ Fragment-Host: org.openhab.core.automation.module.script
3333
org.osgi.service.event;version='[1.4.1,1.4.2)',\
3434
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
3535
com.google.gson;version='[2.11.0,2.11.1)',\
36-
junit-jupiter-api;version='[5.12.1,5.12.2)',\
37-
junit-jupiter-engine;version='[5.12.1,5.12.2)',\
38-
junit-platform-commons;version='[1.12.1,1.12.2)',\
39-
junit-platform-engine;version='[1.12.1,1.12.2)',\
40-
junit-platform-launcher;version='[1.12.1,1.12.2)',\
36+
junit-jupiter-api;version='[5.11.4,5.11.5)',\
37+
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
38+
junit-platform-commons;version='[1.11.4,1.11.5)',\
39+
junit-platform-engine;version='[1.11.4,1.11.5)',\
40+
junit-platform-launcher;version='[1.11.4,1.11.5)',\
4141
org.opentest4j;version='[1.3.0,1.3.1)',\
4242
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
4343
ch.qos.logback.core;version='[1.3.14,1.3.15)',\

‎itests/org.openhab.core.automation.module.timer.tests/itest.bndrun

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ Fragment-Host: org.openhab.core.automation
3737
org.osgi.service.event;version='[1.4.1,1.4.2)',\
3838
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
3939
com.google.gson;version='[2.11.0,2.11.1)',\
40-
junit-jupiter-api;version='[5.12.1,5.12.2)',\
41-
junit-jupiter-engine;version='[5.12.1,5.12.2)',\
42-
junit-platform-commons;version='[1.12.1,1.12.2)',\
43-
junit-platform-engine;version='[1.12.1,1.12.2)',\
44-
junit-platform-launcher;version='[1.12.1,1.12.2)',\
40+
junit-jupiter-api;version='[5.11.4,5.11.5)',\
41+
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
42+
junit-platform-commons;version='[1.11.4,1.11.5)',\
43+
junit-platform-engine;version='[1.11.4,1.11.5)',\
44+
junit-platform-launcher;version='[1.11.4,1.11.5)',\
4545
org.opentest4j;version='[1.3.0,1.3.1)',\
4646
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
4747
ch.qos.logback.core;version='[1.3.14,1.3.15)',\

‎itests/org.openhab.core.automation.tests/itest.bndrun

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ Fragment-Host: org.openhab.core.automation
3737
org.osgi.service.event;version='[1.4.1,1.4.2)',\
3838
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
3939
com.google.gson;version='[2.11.0,2.11.1)',\
40-
junit-jupiter-api;version='[5.12.1,5.12.2)',\
41-
junit-jupiter-engine;version='[5.12.1,5.12.2)',\
42-
junit-platform-commons;version='[1.12.1,1.12.2)',\
43-
junit-platform-engine;version='[1.12.1,1.12.2)',\
44-
junit-platform-launcher;version='[1.12.1,1.12.2)',\
40+
junit-jupiter-api;version='[5.11.4,5.11.5)',\
41+
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
42+
junit-platform-commons;version='[1.11.4,1.11.5)',\
43+
junit-platform-engine;version='[1.11.4,1.11.5)',\
44+
junit-platform-launcher;version='[1.11.4,1.11.5)',\
4545
org.opentest4j;version='[1.3.0,1.3.1)',\
4646
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
4747
ch.qos.logback.core;version='[1.3.14,1.3.15)',\

‎itests/org.openhab.core.config.core.tests/itest.bndrun

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ Fragment-Host: org.openhab.core.config.core
3939
org.osgi.service.event;version='[1.4.1,1.4.2)',\
4040
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
4141
com.google.gson;version='[2.11.0,2.11.1)',\
42-
junit-jupiter-api;version='[5.12.1,5.12.2)',\
43-
junit-jupiter-engine;version='[5.12.1,5.12.2)',\
44-
junit-platform-commons;version='[1.12.1,1.12.2)',\
45-
junit-platform-engine;version='[1.12.1,1.12.2)',\
46-
junit-platform-launcher;version='[1.12.1,1.12.2)',\
42+
junit-jupiter-api;version='[5.11.4,5.11.5)',\
43+
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
44+
junit-platform-commons;version='[1.11.4,1.11.5)',\
45+
junit-platform-engine;version='[1.11.4,1.11.5)',\
46+
junit-platform-launcher;version='[1.11.4,1.11.5)',\
4747
org.opentest4j;version='[1.3.0,1.3.1)',\
4848
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
4949
ch.qos.logback.core;version='[1.3.14,1.3.15)',\

‎itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
3838
org.osgi.service.event;version='[1.4.1,1.4.2)',\
3939
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
4040
com.google.gson;version='[2.11.0,2.11.1)',\
41-
junit-jupiter-api;version='[5.12.1,5.12.2)',\
42-
junit-jupiter-engine;version='[5.12.1,5.12.2)',\
43-
junit-platform-commons;version='[1.12.1,1.12.2)',\
44-
junit-platform-engine;version='[1.12.1,1.12.2)',\
45-
junit-platform-launcher;version='[1.12.1,1.12.2)',\
41+
junit-jupiter-api;version='[5.11.4,5.11.5)',\
42+
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
43+
junit-platform-commons;version='[1.11.4,1.11.5)',\
44+
junit-platform-engine;version='[1.11.4,1.11.5)',\
45+
junit-platform-launcher;version='[1.11.4,1.11.5)',\
4646
org.opentest4j;version='[1.3.0,1.3.1)',\
4747
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
4848
ch.qos.logback.core;version='[1.3.14,1.3.15)',\

‎itests/org.openhab.core.config.discovery.tests/itest.bndrun

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ Fragment-Host: org.openhab.core.config.discovery
3939
org.osgi.service.event;version='[1.4.1,1.4.2)',\
4040
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
4141
com.google.gson;version='[2.11.0,2.11.1)',\
42-
junit-jupiter-api;version='[5.12.1,5.12.2)',\
43-
junit-jupiter-engine;version='[5.12.1,5.12.2)',\
44-
junit-platform-commons;version='[1.12.1,1.12.2)',\
45-
junit-platform-engine;version='[1.12.1,1.12.2)',\
46-
junit-platform-launcher;version='[1.12.1,1.12.2)',\
42+
junit-jupiter-api;version='[5.11.4,5.11.5)',\
43+
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
44+
junit-platform-commons;version='[1.11.4,1.11.5)',\
45+
junit-platform-engine;version='[1.11.4,1.11.5)',\
46+
junit-platform-launcher;version='[1.11.4,1.11.5)',\
4747
org.opentest4j;version='[1.3.0,1.3.1)',\
4848
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
4949
ch.qos.logback.core;version='[1.3.14,1.3.15)',\

‎itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
3939
org.osgi.service.event;version='[1.4.1,1.4.2)',\
4040
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
4141
com.google.gson;version='[2.11.0,2.11.1)',\
42-
junit-jupiter-api;version='[5.12.1,5.12.2)',\
43-
junit-jupiter-engine;version='[5.12.1,5.12.2)',\
44-
junit-platform-commons;version='[1.12.1,1.12.2)',\
45-
junit-platform-engine;version='[1.12.1,1.12.2)',\
46-
junit-platform-launcher;version='[1.12.1,1.12.2)',\
42+
junit-jupiter-api;version='[5.11.4,5.11.5)',\
43+
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
44+
junit-platform-commons;version='[1.11.4,1.11.5)',\
45+
junit-platform-engine;version='[1.11.4,1.11.5)',\
46+
junit-platform-launcher;version='[1.11.4,1.11.5)',\
4747
org.opentest4j;version='[1.3.0,1.3.1)',\
4848
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
4949
ch.qos.logback.core;version='[1.3.14,1.3.15)',\

‎itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ Provide-Capability: \
4747
org.osgi.service.event;version='[1.4.1,1.4.2)',\
4848
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
4949
com.google.gson;version='[2.11.0,2.11.1)',\
50-
junit-jupiter-api;version='[5.12.1,5.12.2)',\
51-
junit-jupiter-engine;version='[5.12.1,5.12.2)',\
52-
junit-platform-commons;version='[1.12.1,1.12.2)',\
53-
junit-platform-engine;version='[1.12.1,1.12.2)',\
54-
junit-platform-launcher;version='[1.12.1,1.12.2)',\
50+
junit-jupiter-api;version='[5.11.4,5.11.5)',\
51+
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
52+
junit-platform-commons;version='[1.11.4,1.11.5)',\
53+
junit-platform-engine;version='[1.11.4,1.11.5)',\
54+
junit-platform-launcher;version='[1.11.4,1.11.5)',\
5555
org.opentest4j;version='[1.3.0,1.3.1)',\
5656
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
5757
ch.qos.logback.core;version='[1.3.14,1.3.15)',\

‎itests/org.openhab.core.config.dispatch.tests/itest.bndrun

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ Fragment-Host: org.openhab.core.config.dispatch
3232
org.osgi.service.event;version='[1.4.1,1.4.2)',\
3333
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
3434
com.google.gson;version='[2.11.0,2.11.1)',\
35-
junit-jupiter-api;version='[5.12.1,5.12.2)',\
36-
junit-jupiter-engine;version='[5.12.1,5.12.2)',\
37-
junit-platform-commons;version='[1.12.1,1.12.2)',\
38-
junit-platform-engine;version='[1.12.1,1.12.2)',\
39-
junit-platform-launcher;version='[1.12.1,1.12.2)',\
35+
junit-jupiter-api;version='[5.11.4,5.11.5)',\
36+
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
37+
junit-platform-commons;version='[1.11.4,1.11.5)',\
38+
junit-platform-engine;version='[1.11.4,1.11.5)',\
39+
junit-platform-launcher;version='[1.11.4,1.11.5)',\
4040
org.opentest4j;version='[1.3.0,1.3.1)',\
4141
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
4242
ch.qos.logback.core;version='[1.3.14,1.3.15)',\

‎itests/org.openhab.core.ephemeris.tests/itest.bndrun

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ feature.openhab-config: \
3838
org.osgi.service.event;version='[1.4.1,1.4.2)',\
3939
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
4040
com.google.gson;version='[2.11.0,2.11.1)',\
41-
junit-jupiter-api;version='[5.12.1,5.12.2)',\
42-
junit-jupiter-engine;version='[5.12.1,5.12.2)',\
43-
junit-platform-commons;version='[1.12.1,1.12.2)',\
44-
junit-platform-engine;version='[1.12.1,1.12.2)',\
45-
junit-platform-launcher;version='[1.12.1,1.12.2)',\
41+
junit-jupiter-api;version='[5.11.4,5.11.5)',\
42+
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
43+
junit-platform-commons;version='[1.11.4,1.11.5)',\
44+
junit-platform-engine;version='[1.11.4,1.11.5)',\
45+
junit-platform-launcher;version='[1.11.4,1.11.5)',\
4646
org.opentest4j;version='[1.3.0,1.3.1)',\
4747
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
4848
ch.qos.logback.core;version='[1.3.14,1.3.15)',\

0 commit comments

Comments
 (0)