From 3b91692be142cc0b1293416655825d201cb75c5c Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Mon, 24 Jul 2023 09:02:01 +0200 Subject: [PATCH] Fix build (#3726) Signed-off-by: Wouter Born --- .../org.openhab.core.addon.tests/itest.bndrun | 12 ++-- .../itest.bndrun | 14 ++--- .../itest.bndrun | 19 +++---- .../itest.bndrun | 19 +++---- .../itest.bndrun | 22 +++---- .../itest.bndrun | 19 +++---- .../itest.bndrun | 19 +++---- .../itest.bndrun | 10 ++-- .../itest.bndrun | 21 ++++--- .../itest.bndrun | 17 +++--- .../itest.bndrun | 21 ++++--- .../itest.bndrun | 19 +++---- .../itest.bndrun | 10 ++-- .../itest.bndrun | 12 ++-- .../itest.bndrun | 11 ++-- .../itest.bndrun | 27 +++++---- .../itest.bndrun | 52 ++++++++--------- .../itest.bndrun | 51 ++++++++--------- .../itest.bndrun | 52 ++++++++--------- .../itest.bndrun | 57 ++++++++++--------- .../itest.bndrun | 17 +++--- itests/org.openhab.core.tests/itest.bndrun | 8 +-- .../org.openhab.core.thing.tests/itest.bndrun | 14 ++--- .../org.openhab.core.voice.tests/itest.bndrun | 19 +++---- .../checkstyle/ruleset.properties | 2 +- 25 files changed, 266 insertions(+), 278 deletions(-) diff --git a/itests/org.openhab.core.addon.tests/itest.bndrun b/itests/org.openhab.core.addon.tests/itest.bndrun index d4b73fbea..6bed7a950 100644 --- a/itests/org.openhab.core.addon.tests/itest.bndrun +++ b/itests/org.openhab.core.addon.tests/itest.bndrun @@ -36,13 +36,8 @@ Fragment-Host: org.openhab.core.addon ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ - org.openhab.core.addon;version='[4.0.0,4.0.1)',\ - org.openhab.core.addon.tests;version='[4.0.0,4.0.1)',\ 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.apache.felix.scr;version='[2.2.4,2.2.5)',\ @@ -60,4 +55,9 @@ Fragment-Host: org.openhab.core.addon junit-jupiter-engine;version='[5.9.2,5.9.3)',\ junit-platform-commons;version='[1.9.2,1.9.3)',\ junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)' + junit-platform-launcher;version='[1.9.2,1.9.3)',\ + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.addon;version='[4.1.0,4.1.1)',\ + org.openhab.core.addon.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun index 3cbb98750..4a4ce243c 100644 --- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun +++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun @@ -32,12 +32,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.auth.oauth2client;version='[4.0.0,4.0.1)',\ - org.openhab.core.auth.oauth2client.tests;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.console;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.net;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -68,4 +62,10 @@ Fragment-Host: org.openhab.core.auth.oauth2client 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)',\ - org.objenesis;version='[3.3.0,3.3.1)' + org.objenesis;version='[3.3.0,3.3.1)',\ + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.auth.oauth2client;version='[4.1.0,4.1.1)',\ + org.openhab.core.auth.oauth2client.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.net;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index 9323415d0..7e0167eb8 100644 --- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun @@ -34,14 +34,6 @@ Fragment-Host: org.openhab.core.automation ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation.integration.tests;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.ephemeris;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.console;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ - org.openhab.core.thing;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -66,5 +58,12 @@ Fragment-Host: org.openhab.core.automation net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - org.openhab.core.transform;version='[4.0.0,4.0.1)' + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation.integration.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.ephemeris;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)',\ + org.openhab.core.thing;version='[4.1.0,4.1.1)',\ + org.openhab.core.transform;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun index f87b5a710..cf1fa0f01 100644 --- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun @@ -34,14 +34,6 @@ Fragment-Host: org.openhab.core.automation ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation.module.core.tests;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.ephemeris;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.console;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ - org.openhab.core.thing;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -66,5 +58,12 @@ Fragment-Host: org.openhab.core.automation net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - org.openhab.core.transform;version='[4.0.0,4.0.1)' + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation.module.core.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.ephemeris;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)',\ + org.openhab.core.thing;version='[4.1.0,4.1.1)',\ + org.openhab.core.transform;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun index 452232f72..a37ae6570 100644 --- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun @@ -34,16 +34,6 @@ Fragment-Host: org.openhab.core.automation.module.script ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation.module.script;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation.module.script.tests;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.ephemeris;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.console;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ - org.openhab.core.thing;version='[4.0.0,4.0.1)',\ - org.openhab.core.transform;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -63,4 +53,14 @@ Fragment-Host: org.openhab.core.automation.module.script junit-jupiter-engine;version='[5.9.2,5.9.3)',\ junit-platform-commons;version='[1.9.2,1.9.3)',\ junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)' + junit-platform-launcher;version='[1.9.2,1.9.3)',\ + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation.module.script;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation.module.script.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.ephemeris;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)',\ + org.openhab.core.thing;version='[4.1.0,4.1.1)',\ + org.openhab.core.transform;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun index 5e6f415c4..002c12fc7 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun @@ -34,14 +34,6 @@ Fragment-Host: org.openhab.core.automation ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation.module.timer.tests;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.ephemeris;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.console;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ - org.openhab.core.thing;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -66,5 +58,12 @@ Fragment-Host: org.openhab.core.automation net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - org.openhab.core.transform;version='[4.0.0,4.0.1)' + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation.module.timer.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.ephemeris;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)',\ + org.openhab.core.thing;version='[4.1.0,4.1.1)',\ + org.openhab.core.transform;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index 98fb146d9..dd9c25b98 100644 --- a/itests/org.openhab.core.automation.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.tests/itest.bndrun @@ -34,14 +34,6 @@ Fragment-Host: org.openhab.core.automation ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation.tests;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.ephemeris;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.console;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ - org.openhab.core.thing;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -66,5 +58,12 @@ Fragment-Host: org.openhab.core.automation net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - org.openhab.core.transform;version='[4.0.0,4.0.1)' + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.ephemeris;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)',\ + org.openhab.core.thing;version='[4.1.0,4.1.1)',\ + org.openhab.core.transform;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun index b61fcb498..6b546af61 100644 --- a/itests/org.openhab.core.config.core.tests/itest.bndrun +++ b/itests/org.openhab.core.config.core.tests/itest.bndrun @@ -33,10 +33,6 @@ Fragment-Host: org.openhab.core.config.core ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.core.tests;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -61,4 +57,8 @@ Fragment-Host: org.openhab.core.config.core net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ - org.objenesis;version='[3.3.0,3.3.1)' + org.objenesis;version='[3.3.0,3.3.1)',\ + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.core.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun index b283f7cac..9c56f25b3 100644 --- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun @@ -33,15 +33,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns javax.jmdns;version='[3.5.8,3.5.9)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.discovery.mdns;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.discovery.mdns.tests;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.console;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.transport.mdns;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ - org.openhab.core.thing;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -66,5 +57,13 @@ Fragment-Host: org.openhab.core.config.discovery.mdns net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.openhab.core.transform;version='[4.0.0,4.0.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)' + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.discovery;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.discovery.mdns;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.discovery.mdns.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.transport.mdns;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)',\ + org.openhab.core.thing;version='[4.1.0,4.1.1)',\ + org.openhab.core.transform;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun index ad2ab040a..2c9765d12 100644 --- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun @@ -33,13 +33,6 @@ Fragment-Host: org.openhab.core.config.discovery ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.discovery.tests;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.console;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ - org.openhab.core.thing;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -65,5 +58,11 @@ Fragment-Host: org.openhab.core.config.discovery org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.openhab.core.transform;version='[4.0.0,4.0.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)' + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.discovery;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.discovery.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)',\ + org.openhab.core.thing;version='[4.1.0,4.1.1)',\ + org.openhab.core.transform;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun index 5f27c6222..272f51848 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun @@ -32,15 +32,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.discovery.usbserial;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.discovery.usbserial.linuxsysfs;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.discovery.usbserial.linuxsysfs.tests;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.console;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ - org.openhab.core.thing;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -66,5 +57,13 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.openhab.core.transform;version='[4.0.0,4.0.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)' + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.discovery;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.discovery.usbserial;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.discovery.usbserial.linuxsysfs;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.discovery.usbserial.linuxsysfs.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)',\ + org.openhab.core.thing;version='[4.1.0,4.1.1)',\ + org.openhab.core.transform;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun index 20edb85c9..a0f6bff13 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun @@ -42,14 +42,6 @@ Provide-Capability: \ ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.discovery.usbserial;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.discovery.usbserial.tests;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.console;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ - org.openhab.core.thing;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -74,5 +66,12 @@ Provide-Capability: \ net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.openhab.core.transform;version='[4.0.0,4.0.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)' + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.discovery;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.discovery.usbserial;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.discovery.usbserial.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)',\ + org.openhab.core.thing;version='[4.1.0,4.1.1)',\ + org.openhab.core.transform;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun index bfeaed60e..041c09e5e 100644 --- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun +++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun @@ -32,10 +32,6 @@ Fragment-Host: org.openhab.core.config.dispatch ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.dispatch;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.dispatch.tests;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -54,4 +50,8 @@ Fragment-Host: org.openhab.core.config.dispatch junit-jupiter-engine;version='[5.9.2,5.9.3)',\ junit-platform-commons;version='[1.9.2,1.9.3)',\ junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)' + junit-platform-launcher;version='[1.9.2,1.9.3)',\ + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.dispatch;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.dispatch.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index 7d71c334c..6eccdf29a 100644 --- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun +++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun @@ -39,11 +39,6 @@ feature.openhab-config: \ ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.ephemeris;version='[4.0.0,4.0.1)',\ - org.openhab.core.ephemeris.tests;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -63,4 +58,9 @@ feature.openhab-config: \ junit-jupiter-engine;version='[5.9.2,5.9.3)',\ junit-platform-commons;version='[1.9.2,1.9.3)',\ junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)' + junit-platform-launcher;version='[1.9.2,1.9.3)',\ + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.ephemeris;version='[4.1.0,4.1.1)',\ + org.openhab.core.ephemeris.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.io.net.tests/itest.bndrun b/itests/org.openhab.core.io.net.tests/itest.bndrun index 9d4983c50..d091b905e 100644 --- a/itests/org.openhab.core.io.net.tests/itest.bndrun +++ b/itests/org.openhab.core.io.net.tests/itest.bndrun @@ -50,13 +50,8 @@ Fragment-Host: org.openhab.core.io.net org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.net;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.net.tests;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ org.opentest4j;version='[1.2.0,1.2.1)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ @@ -73,4 +68,8 @@ Fragment-Host: org.openhab.core.io.net org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)' + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.net;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.net.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun index 21cf13493..8d7c0e47c 100644 --- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun +++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun @@ -55,18 +55,6 @@ Fragment-Host: org.openhab.core.io.rest.core biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ org.objectweb.asm;version='[9.4.0,9.4.1)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.console;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.rest;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.rest.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.rest.core.tests;version='[4.0.0,4.0.1)',\ - org.openhab.core.persistence;version='[4.0.0,4.0.1)',\ - org.openhab.core.semantics;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ - org.openhab.core.thing;version='[4.0.0,4.0.1)',\ - org.openhab.core.transform;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ com.fasterxml.woodstox.woodstox-core;version='[6.4.0,6.4.1)',\ @@ -82,7 +70,6 @@ Fragment-Host: org.openhab.core.io.rest.core org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ org.eclipse.jetty.xml;version='[9.4.50,9.4.51)',\ - org.openhab.core.addon;version='[4.0.0,4.0.1)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\ org.ops4j.pax.web.pax-web-api;version='[8.0.15,8.0.16)',\ org.ops4j.pax.web.pax-web-jetty;version='[8.0.15,8.0.16)',\ @@ -107,4 +94,16 @@ Fragment-Host: org.openhab.core.io.rest.core org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)' + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.addon;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.discovery;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.rest;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.rest.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.rest.core.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.persistence;version='[4.1.0,4.1.1)',\ + org.openhab.core.semantics;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)',\ + org.openhab.core.thing;version='[4.1.0,4.1.1)',\ + org.openhab.core.transform;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index 19c699af9..e1bf65fd2 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -54,31 +54,6 @@ Fragment-Host: org.openhab.core.model.item org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\ org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\ org.objectweb.asm;version='[9.4.0,9.4.1)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.audio;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation.module.script;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation.module.script.rulesupport;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.ephemeris;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.console;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.net;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.item;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.item.runtime;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.item.tests;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.persistence;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.rule;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.script;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.script.runtime;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.sitemap;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.thing;version='[4.0.0,4.0.1)',\ - org.openhab.core.persistence;version='[4.0.0,4.0.1)',\ - org.openhab.core.semantics;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ - org.openhab.core.thing;version='[4.0.0,4.0.1)',\ - org.openhab.core.transform;version='[4.0.0,4.0.1)',\ - org.openhab.core.voice;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -114,4 +89,29 @@ Fragment-Host: org.openhab.core.model.item junit-platform-commons;version='[1.9.2,1.9.3)',\ junit-platform-engine;version='[1.9.2,1.9.3)',\ junit-platform-launcher;version='[1.9.2,1.9.3)',\ - org.openhab.core.model.thing.runtime;version='[4.0.0,4.0.1)' + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.audio;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation.module.script;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation.module.script.rulesupport;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.ephemeris;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.net;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.item;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.item.runtime;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.item.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.persistence;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.rule;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.rule.runtime;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.script;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.script.runtime;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.sitemap;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.thing;version='[4.1.0,4.1.1)',\ + org.openhab.core.persistence;version='[4.1.0,4.1.1)',\ + org.openhab.core.semantics;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)',\ + org.openhab.core.thing;version='[4.1.0,4.1.1)',\ + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.core.voice;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index 0956d07ec..cf58e39a8 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -58,31 +58,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\ org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\ org.objectweb.asm;version='[9.4.0,9.4.1)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.audio;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation.module.script;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation.module.script.rulesupport;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.ephemeris;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.console;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.net;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.item;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.persistence;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.rule;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.rule.runtime;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.rule.tests;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.script;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.script.runtime;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.sitemap;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.thing;version='[4.0.0,4.0.1)',\ - org.openhab.core.persistence;version='[4.0.0,4.0.1)',\ - org.openhab.core.semantics;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ - org.openhab.core.thing;version='[4.0.0,4.0.1)',\ - org.openhab.core.transform;version='[4.0.0,4.0.1)',\ - org.openhab.core.voice;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -118,4 +93,28 @@ Fragment-Host: org.openhab.core.model.rule.runtime junit-platform-commons;version='[1.9.2,1.9.3)',\ junit-platform-engine;version='[1.9.2,1.9.3)',\ junit-platform-launcher;version='[1.9.2,1.9.3)',\ - org.openhab.core.model.thing.runtime;version='[4.0.0,4.0.1)' + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.audio;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation.module.script;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation.module.script.rulesupport;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.ephemeris;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.net;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.item;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.persistence;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.rule;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.rule.runtime;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.rule.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.script;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.script.runtime;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.sitemap;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.thing;version='[4.1.0,4.1.1)',\ + org.openhab.core.persistence;version='[4.1.0,4.1.1)',\ + org.openhab.core.semantics;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)',\ + org.openhab.core.thing;version='[4.1.0,4.1.1)',\ + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.core.voice;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun index b9de3468e..a76292b37 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -57,30 +57,6 @@ Fragment-Host: org.openhab.core.model.script org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\ org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\ org.objectweb.asm;version='[9.4.0,9.4.1)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.audio;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation.module.script;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation.module.script.rulesupport;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.ephemeris;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.console;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.net;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.item;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.persistence;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.rule;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.script;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.script.runtime;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.script.tests;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.sitemap;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.thing;version='[4.0.0,4.0.1)',\ - org.openhab.core.persistence;version='[4.0.0,4.0.1)',\ - org.openhab.core.semantics;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ - org.openhab.core.thing;version='[4.0.0,4.0.1)',\ - org.openhab.core.transform;version='[4.0.0,4.0.1)',\ - org.openhab.core.voice;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -116,9 +92,33 @@ Fragment-Host: org.openhab.core.model.script junit-platform-commons;version='[1.9.2,1.9.3)',\ junit-platform-engine;version='[1.9.2,1.9.3)',\ junit-platform-launcher;version='[1.9.2,1.9.3)',\ - org.openhab.core.model.thing.runtime;version='[4.0.0,4.0.1)',\ 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.junit-jupiter;version='[4.11.0,4.11.1)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ - org.objenesis;version='[3.3.0,3.3.1)' + org.objenesis;version='[3.3.0,3.3.1)',\ + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.audio;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation.module.script;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation.module.script.rulesupport;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.ephemeris;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.net;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.item;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.persistence;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.rule;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.rule.runtime;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.script;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.script.runtime;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.script.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.sitemap;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.thing;version='[4.1.0,4.1.1)',\ + org.openhab.core.persistence;version='[4.1.0,4.1.1)',\ + org.openhab.core.semantics;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)',\ + org.openhab.core.thing;version='[4.1.0,4.1.1)',\ + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.core.voice;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index 25c8c33ec..6fc408947 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -55,33 +55,6 @@ Fragment-Host: org.openhab.core.model.thing org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\ org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\ org.objectweb.asm;version='[9.4.0,9.4.1)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.audio;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation.module.script;version='[4.0.0,4.0.1)',\ - org.openhab.core.automation.module.script.rulesupport;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.ephemeris;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.console;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.net;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.item;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.item.runtime;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.persistence;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.rule;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.script;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.script.runtime;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.sitemap;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.thing;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.thing.runtime;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.thing.tests;version='[4.0.0,4.0.1)',\ - org.openhab.core.model.thing.testsupport;version='[4.0.0,4.0.1)',\ - org.openhab.core.persistence;version='[4.0.0,4.0.1)',\ - org.openhab.core.semantics;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ - org.openhab.core.thing;version='[4.0.0,4.0.1)',\ - org.openhab.core.transform;version='[4.0.0,4.0.1)',\ - org.openhab.core.voice;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -122,4 +95,32 @@ Fragment-Host: org.openhab.core.model.thing net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ - org.objenesis;version='[3.3.0,3.3.1)' + org.objenesis;version='[3.3.0,3.3.1)',\ + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.audio;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation.module.script;version='[4.1.0,4.1.1)',\ + org.openhab.core.automation.module.script.rulesupport;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.ephemeris;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.net;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.item;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.item.runtime;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.persistence;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.rule;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.rule.runtime;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.script;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.script.runtime;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.sitemap;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.thing;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.thing.runtime;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.thing.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.model.thing.testsupport;version='[4.1.0,4.1.1)',\ + org.openhab.core.persistence;version='[4.1.0,4.1.1)',\ + org.openhab.core.semantics;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)',\ + org.openhab.core.thing;version='[4.1.0,4.1.1)',\ + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.core.voice;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun index d029def72..ecafe773e 100644 --- a/itests/org.openhab.core.storage.json.tests/itest.bndrun +++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun @@ -32,13 +32,6 @@ Fragment-Host: org.openhab.core.storage.json ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.console;version='[4.0.0,4.0.1)',\ - org.openhab.core.storage.json;version='[4.0.0,4.0.1)',\ - org.openhab.core.storage.json.tests;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ - org.openhab.core.thing;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -59,5 +52,11 @@ Fragment-Host: org.openhab.core.storage.json junit-platform-commons;version='[1.9.2,1.9.3)',\ junit-platform-engine;version='[1.9.2,1.9.3)',\ junit-platform-launcher;version='[1.9.2,1.9.3)',\ - org.openhab.core.transform;version='[4.0.0,4.0.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)' + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ + org.openhab.core.storage.json;version='[4.1.0,4.1.1)',\ + org.openhab.core.storage.json.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)',\ + org.openhab.core.thing;version='[4.1.0,4.1.1)',\ + org.openhab.core.transform;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun index 5a229a51c..45bafe358 100644 --- a/itests/org.openhab.core.tests/itest.bndrun +++ b/itests/org.openhab.core.tests/itest.bndrun @@ -32,9 +32,6 @@ Fragment-Host: org.openhab.core ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ - org.openhab.core.tests;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -58,4 +55,7 @@ Fragment-Host: org.openhab.core net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ - org.objenesis;version='[3.3.0,3.3.1)' + org.objenesis;version='[3.3.0,3.3.1)',\ + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)',\ + org.openhab.core.tests;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun index dc229ee0a..85765748f 100644 --- a/itests/org.openhab.core.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.tests/itest.bndrun @@ -36,12 +36,6 @@ Fragment-Host: org.openhab.core.thing ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.console;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ - org.openhab.core.thing;version='[4.0.0,4.0.1)',\ - org.openhab.core.thing.tests;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -67,4 +61,10 @@ Fragment-Host: org.openhab.core.thing org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.openhab.core.transform;version='[4.0.0,4.0.1)' + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)',\ + org.openhab.core.thing;version='[4.1.0,4.1.1)',\ + org.openhab.core.thing.tests;version='[4.1.0,4.1.1)',\ + org.openhab.core.transform;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun index 5d0738bd7..334784caa 100644 --- a/itests/org.openhab.core.voice.tests/itest.bndrun +++ b/itests/org.openhab.core.voice.tests/itest.bndrun @@ -36,15 +36,6 @@ Fragment-Host: org.openhab.core.voice ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.audio;version='[4.0.0,4.0.1)',\ - org.openhab.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.config.core;version='[4.0.0,4.0.1)',\ - org.openhab.core.io.console;version='[4.0.0,4.0.1)',\ - org.openhab.core.test;version='[4.0.0,4.0.1)',\ - org.openhab.core.thing;version='[4.0.0,4.0.1)',\ - org.openhab.core.voice;version='[4.0.0,4.0.1)',\ - org.openhab.core.voice.tests;version='[4.0.0,4.0.1)',\ io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\ com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -73,4 +64,12 @@ Fragment-Host: org.openhab.core.voice junit-platform-commons;version='[1.9.2,1.9.3)',\ junit-platform-engine;version='[1.9.2,1.9.3)',\ junit-platform-launcher;version='[1.9.2,1.9.3)',\ - org.openhab.core.transform;version='[4.0.0,4.0.1)' + org.openhab.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.audio;version='[4.1.0,4.1.1)',\ + org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ + org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ + org.openhab.core.test;version='[4.1.0,4.1.1)',\ + org.openhab.core.thing;version='[4.1.0,4.1.1)',\ + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.core.voice;version='[4.1.0,4.1.1)',\ + org.openhab.core.voice.tests;version='[4.1.0,4.1.1)' diff --git a/tools/static-code-analysis/checkstyle/ruleset.properties b/tools/static-code-analysis/checkstyle/ruleset.properties index 6efa34365..1ad8d4ca4 100644 --- a/tools/static-code-analysis/checkstyle/ruleset.properties +++ b/tools/static-code-analysis/checkstyle/ruleset.properties @@ -3,6 +3,6 @@ checkstyle.forbiddenPackageUsageCheck.exceptions= checkstyle.forbiddenPackageUsageCheck.forbiddenPackages=com.google.common,org.junit.Assert,org.junit.Test checkstyle.headerCheck.content=^/\\*\\*$\\n^ \\* Copyright \\(c\\) {0}-{1} Contributors to the openHAB project$\\n^ \\*$\\n^ \\* See the NOTICE file\\(s\\) distributed with this work for additional$\\n^ \\* information.$\\n^ \\*$\\n^ \\* This program and the accompanying materials are made available under the$\\n^ \\* terms of the Eclipse Public License 2\\.0 which is available at$\\n^ \\* http://www.eclipse.org/legal/epl\\-2\\.0$\\n^ \\*$\\n^ \\* SPDX-License-Identifier: EPL-2.0$ checkstyle.headerCheck.values=2010,2023 -checkstyle.pomXmlCheck.currentVersionRegex=^3\.0\.0 +checkstyle.pomXmlCheck.currentVersionRegex=^4\.1\.0 checkstyle.requiredFilesCheck.files=pom.xml checkstyle.karafFeatureCheck.featureXmlPath=features/karaf/openhab-core/src/main/feature/feature.xml