Upgrade Mockito to 5.19, junit-jupiter to 5.13.4 (#4991)

* Upgrade Mockito from 4.11 to 5.19.
  Changelog: https://github.com/mockito/mockito/releases
* Upgrade junit-jupiter from 5.11.4 to 5.13.4
  Changelog: https://docs.junit.org/5.13.4/release-notes
* Add workaround to allow junit-jupiter>=5.12 with OSGI

* Activate javaagent for tests to avoid JDK warnings

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

bom/test-index/pom.xml

@@ -19,19 +19,17 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <!-- junit 5.12.0 to 5.13.0-M3 fails silently with bnd 7.1.0, not executing unit tests;
-           not sure if this is a bnd/junit issue or due to wrong configuration -->
-      <version>5.11.4</version>
+      <version>5.13.4</version>
     </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-launcher</artifactId>
-      <version>1.11.4</version>
+      <version>1.13.4</version>
     </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-engine</artifactId>
-      <version>1.11.4</version>
+      <version>1.13.4</version>
     </dependency>
     <dependency>
       <groupId>biz.aQute.bnd</groupId>

bundles/org.openhab.core.addon/src/test/java/org/openhab/core/addon/AddonInfoRegistryMergeTest.java

@@ -13,7 +13,6 @@
 package org.openhab.core.addon;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.List;

bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioConsoleTest.java

@@ -14,7 +14,8 @@ package org.openhab.core.audio.internal;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.io.File;
 import java.io.IOException;

bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerTest.java

@@ -16,7 +16,8 @@ import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.io.File;
 import java.io.IOException;

bundles/org.openhab.core.auth.oauth2client/src/test/java/org/openhab/core/auth/oauth2client/internal/OAuthRFC8628ClientTest.java

@@ -13,7 +13,6 @@
 package org.openhab.core.auth.oauth2client.internal;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;

bundles/org.openhab.core.automation.module.script.rulesupport/src/test/java/org/openhab/core/automation/module/script/rulesupport/loader/AbstractScriptFileWatcherTest.java

@@ -15,7 +15,6 @@ package org.openhab.core.automation.module.script.rulesupport.loader;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.fail;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 import static org.openhab.core.OpenHAB.CONFIG_DIR_PROG_ARGUMENT;
 import static org.openhab.core.service.WatchService.Kind.*;

bundles/org.openhab.core.automation.module.script/src/test/java/org/openhab/core/automation/module/script/ScriptTransformationServiceTest.java

@@ -15,7 +15,6 @@ package org.openhab.core.automation.module.script;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 

bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/module/factory/EphemerisModuleHandlerFactoryTest.java

@@ -15,7 +15,8 @@ package org.openhab.core.automation.internal.module.factory;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.util.Map;
 

bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/module/handler/DateTimeTriggerHandlerTest.java

@@ -14,7 +14,8 @@ package org.openhab.core.automation.internal.module.handler;
 
 import static java.util.Map.entry;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.time.ZoneId;
 import java.time.ZoneOffset;

bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java

@@ -13,7 +13,8 @@
 package org.openhab.core.config.core.internal.metadata;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 import static org.openhab.core.config.core.internal.metadata.MetadataConfigDescriptionProviderImpl.*;
 

bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorTest.java

@@ -16,7 +16,8 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.lang.reflect.Field;
 import java.math.BigDecimal;

bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusServiceTest.java

@@ -14,7 +14,6 @@ package org.openhab.core.config.core.status;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 

bundles/org.openhab.core.config.discovery.addon.mdns/src/test/java/org/openhab/core/config/discovery/addon/mdns/tests/MDNSAddonFinderTests.java

@@ -13,7 +13,6 @@
 package org.openhab.core.config.discovery.addon.mdns.tests;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 import static org.openhab.core.config.discovery.addon.mdns.MDNSAddonFinder.MDNS_SERVICE_TYPE;
 

bundles/org.openhab.core.config.discovery.addon/src/test/java/org/openhab/core/config/discovery/addon/tests/AddonSuggestionServiceTests.java

@@ -14,7 +14,8 @@ package org.openhab.core.config.discovery.addon.tests;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 import static org.openhab.core.config.discovery.addon.AddonFinderConstants.*;
 
 import java.io.IOException;

bundles/org.openhab.core.config.discovery.usbserial.ser2net/src/test/java/org/openhab/core/config/discovery/usbserial/ser2net/internal/Ser2NetUsbSerialDiscoveryTest.java

@@ -12,7 +12,7 @@
  */
 package org.openhab.core.config.discovery.usbserial.ser2net.internal;
 
-import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 import static org.openhab.core.config.discovery.usbserial.ser2net.internal.Ser2NetUsbSerialDiscovery.*;
 

bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessorTest.java

@@ -14,7 +14,6 @@ package org.openhab.core.config.discovery.internal;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 import static org.openhab.core.config.discovery.inbox.InboxPredicates.withFlag;

bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/PersistentInboxTest.java

@@ -15,7 +15,6 @@ package org.openhab.core.config.discovery.internal;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsMapContaining.hasEntry;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.net.URI;

bundles/org.openhab.core.io.console.karaf/src/test/java/org/openhab/core/io/console/karaf/internal/CompleterWrapperTest.java

@@ -13,7 +13,8 @@
 package org.openhab.core.io.console.karaf.internal;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 

bundles/org.openhab.core.io.console/src/test/java/org/openhab/core/io/console/internal/extension/ItemConsoleCommandCompleterTest.java

@@ -14,7 +14,7 @@ package org.openhab.core.io.console.internal.extension;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 import java.util.List;

bundles/org.openhab.core.io.console/src/test/java/org/openhab/core/io/console/internal/extension/ItemConsoleCommandExtensionTest.java

@@ -14,7 +14,7 @@ package org.openhab.core.io.console.internal.extension;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 import java.util.List;

bundles/org.openhab.core.io.http/src/test/java/org/openhab/core/io/http/internal/HttpContextFactoryServiceImplTest.java

@@ -14,7 +14,8 @@ package org.openhab.core.io.http.internal;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.junit.jupiter.api.BeforeEach;

bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/BaseHttpUtilTest.java

@@ -12,7 +12,8 @@
  */
 package org.openhab.core.io.net.http;
 
-import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.when;
 
 import java.lang.reflect.Field;

bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/HttpUtilTest.java

@@ -13,7 +13,8 @@
 package org.openhab.core.io.net.http;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.net.URI;
 import java.util.concurrent.TimeUnit;

bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/config/ConfigDescriptionResourceTest.java

@@ -14,7 +14,8 @@ package org.openhab.core.io.rest.core.internal.config;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 
 import java.io.ByteArrayOutputStream;

bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/persistence/PersistenceResourceTest.java

@@ -17,7 +17,6 @@ import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.time.ZoneId;

bundles/org.openhab.core.io.rest.sse/src/test/java/org/openhab/core/io/rest/sse/internal/SseItemStatesEventBuilderTest.java

@@ -13,7 +13,8 @@
 package org.openhab.core.io.rest.sse.internal;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 
 import java.util.Locale;
 

bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/ProxyFilterTest.java

@@ -12,7 +12,6 @@
  */
 package org.openhab.core.io.rest.internal.filter;
 
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 import static org.openhab.core.io.rest.internal.filter.ProxyFilter.*;
 

bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionEx.java

@@ -12,7 +12,6 @@
  */
 package org.openhab.core.io.transport.mqtt;
 
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.Map;

bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionTests.java

@@ -15,7 +15,6 @@ package org.openhab.core.io.transport.mqtt;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 

bundles/org.openhab.core.io.transport.upnp/src/test/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceTest.java

@@ -13,7 +13,8 @@
 package org.openhab.core.io.transport.upnp.internal;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;

bundles/org.openhab.core.model.thing/src.moved/test/java/org/openhab/core/model/thing/internal/GenericThingProviderMultipleBundlesTest.java

@@ -12,7 +12,6 @@
  */
 package org.openhab.core.model.thing.internal;
 
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import org.eclipse.emf.common.util.BasicEList;

bundles/org.openhab.core.model.yaml/src/test/java/org/openhab/core/model/yaml/internal/YamlModelRepositoryImplTest.java

@@ -15,7 +15,6 @@ package org.openhab.core.model.yaml.internal;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.hamcrest.Matchers.contains;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 

bundles/org.openhab.core.persistence/src/test/java/org/openhab/core/persistence/internal/PersistenceManagerTest.java

@@ -15,7 +15,6 @@ package org.openhab.core.persistence.internal;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.math.BigDecimal;

bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/SemanticTagsTest.java

@@ -13,7 +13,8 @@
 package org.openhab.core.semantics;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.io.BufferedReader;
 import java.io.FileReader;

bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/SemanticsPredicatesTest.java

@@ -13,7 +13,8 @@
 package org.openhab.core.semantics;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.util.List;
 import java.util.Objects;

bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/internal/MagicHandlerFactoryTest.java

@@ -14,7 +14,8 @@ package org.openhab.core.magic.binding.internal;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.junit.jupiter.api.BeforeEach;

bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ThingManagerImplTest.java

@@ -13,7 +13,6 @@
 package org.openhab.core.thing.internal;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;

bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/SystemDefaultProfileTest.java

@@ -13,7 +13,8 @@
 package org.openhab.core.thing.internal.profiles;
 
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.junit.jupiter.api.Test;

bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/SystemFollowProfileTest.java

@@ -13,7 +13,8 @@
 package org.openhab.core.thing.internal.profiles;
 
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.junit.jupiter.api.Test;

bundles/org.openhab.core.ui.icon/src/test/java/org/openhab/core/ui/icon/internal/IconServletTest.java

@@ -13,7 +13,6 @@
 package org.openhab.core.ui.icon.internal;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 import static org.openhab.core.ui.icon.internal.IconServlet.*;
 

bundles/org.openhab.core.ui/src/test/java/org/openhab/core/ui/internal/proxy/ProxyServletServiceTest.java

@@ -13,7 +13,6 @@
 package org.openhab.core.ui.internal.proxy;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.net.URI;

bundles/org.openhab.core/src/test/java/org/openhab/core/common/osgi/ResourceBundleClassLoaderTest.java

@@ -13,7 +13,6 @@
 package org.openhab.core.common.osgi;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.io.File;

bundles/org.openhab.core/src/test/java/org/openhab/core/events/TopicGlobEventFilterTest.java

@@ -13,7 +13,8 @@
 package org.openhab.core.events;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.junit.jupiter.api.Test;

bundles/org.openhab.core/src/test/java/org/openhab/core/internal/auth/UserRegistryImplTest.java

@@ -13,7 +13,6 @@
 package org.openhab.core.internal.auth;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.Map;

bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ExpireManagerTest.java

@@ -13,7 +13,6 @@
 package org.openhab.core.internal.items;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.time.Duration;

bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemBuilderTest.java

@@ -13,7 +13,6 @@
 package org.openhab.core.internal.items;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.List;

bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/MetadataCommandDescriptionProviderTest.java

@@ -13,7 +13,6 @@
 package org.openhab.core.internal.items;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.Iterator;

bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/MetadataRegistryImplTest.java

@@ -13,7 +13,6 @@
 package org.openhab.core.internal.items;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.Map;

bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/MetadataStateDescriptionFragmentProviderTest.java

@@ -13,7 +13,6 @@
 package org.openhab.core.internal.items;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.math.BigDecimal;

bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/DelegatedSchedulerTest.java

@@ -14,7 +14,8 @@ package org.openhab.core.internal.scheduler;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.when;
 
 import java.time.Duration;
 import java.time.Instant;

bundles/org.openhab.core/src/test/java/org/openhab/core/internal/service/StateDescriptionServiceImplTest.java

@@ -14,7 +14,8 @@ package org.openhab.core.internal.service;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.math.BigDecimal;
 import java.util.List;

bundles/org.openhab.core/src/test/java/org/openhab/core/items/GenericItemTest.java

@@ -17,7 +17,6 @@ import static org.hamcrest.Matchers.closeTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.time.ZonedDateTime;

bundles/org.openhab.core/src/test/java/org/openhab/core/net/HttpServiceUtilTest.java

@@ -14,7 +14,8 @@ package org.openhab.core.net;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
 import java.util.stream.Stream;

itests/itest-include.bndrun

@@ -38,8 +38,11 @@ Export-Package:
 	bnd.identity;id='biz.aQute.tester.junit-platform',\
 	bnd.identity;id='junit-jupiter-engine'
 
+# Defining the proprerty bootdelegation is a necessary workaround for junit-jupiter>=5.12
+# on OSGI, otherwise itests would not run.
 -runproperties: \
-	org.ops4j.pax.logging.DefaultServiceLog.level=WARN
+	org.ops4j.pax.logging.DefaultServiceLog.level=WARN,\
+	org.osgi.framework.bootdelegation=org.mockito.internal.creation.bytebuddy.inject
 
 -runvm.java9plus: \
 	--add-opens=java.base/java.io=ALL-UNNAMED,\

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

@@ -37,11 +37,11 @@ Fragment-Host: org.openhab.core.addon
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.13.1,2.13.2)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

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

@@ -22,9 +22,9 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
-	net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
-	net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
-	org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
+	net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
+	org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
 	tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -36,11 +36,11 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.13.1,2.13.2)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/cipher/CipherTest.java

@@ -14,7 +14,8 @@ package org.openhab.core.auth.oauth2client.test.internal.cipher;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;

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

@@ -23,9 +23,9 @@ Fragment-Host: org.openhab.core.automation
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.21,1.4.22)',\
-	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)',\
+	net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
+	org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
 	tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -37,11 +37,11 @@ Fragment-Host: org.openhab.core.automation
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.13.1,2.13.2)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/RuleSimulationTest.java

@@ -15,7 +15,8 @@ package org.openhab.core.automation.integration.test;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.time.ZoneId;
 import java.time.ZonedDateTime;

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

@@ -23,9 +23,9 @@ Fragment-Host: org.openhab.core.automation
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.21,1.4.22)',\
-	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)',\
+	net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
+	org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
 	tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -37,11 +37,11 @@ Fragment-Host: org.openhab.core.automation
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.13.1,2.13.2)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RunRuleModuleTest.java

@@ -14,7 +14,8 @@ package org.openhab.core.automation.internal.module;
 
 import static java.util.Map.entry;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.util.Collection;
 import java.util.LinkedList;

itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RuntimeRuleTest.java

@@ -14,7 +14,8 @@ package org.openhab.core.automation.internal.module;
 
 import static java.util.Map.entry;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.util.Collection;
 import java.util.Collections;

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

@@ -33,11 +33,11 @@ Fragment-Host: org.openhab.core.automation.module.script
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.13.1,2.13.2)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

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

@@ -23,9 +23,9 @@ Fragment-Host: org.openhab.core.automation
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.21,1.4.22)',\
-	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)',\
+	net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
+	org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
 	tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -37,11 +37,11 @@ Fragment-Host: org.openhab.core.automation
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.13.1,2.13.2)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/BasicConditionHandlerTest.java

@@ -15,7 +15,8 @@ package org.openhab.core.automation.module.timer.internal;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.util.Collection;
 import java.util.HashMap;

itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/IntervalConditionHandlerTest.java

@@ -15,7 +15,6 @@ package org.openhab.core.automation.module.timer.internal;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.*;
 
 import java.math.BigDecimal;
 import java.util.HashMap;

itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/RuntimeRuleTest.java

@@ -15,7 +15,8 @@ package org.openhab.core.automation.module.timer.internal;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.util.Collection;
 import java.util.HashMap;

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

@@ -23,9 +23,9 @@ Fragment-Host: org.openhab.core.automation
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.21,1.4.22)',\
-	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)',\
+	net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
+	org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
 	tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -37,11 +37,11 @@ Fragment-Host: org.openhab.core.automation
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.13.1,2.13.2)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/event/RuleEventTest.java

@@ -16,7 +16,8 @@ import static java.util.Map.entry;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 import java.util.Collection;

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

@@ -24,10 +24,10 @@ Fragment-Host: org.openhab.core.config.core
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.21,1.4.22)',\
-	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)',\
+	net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
+	org.mockito.junit-jupiter;version='[5.19.0,5.19.1)',\
+	org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
 	tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -39,11 +39,11 @@ Fragment-Host: org.openhab.core.config.core
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.13.1,2.13.2)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

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

@@ -24,9 +24,9 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.21,1.4.22)',\
-	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)',\
+	net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
+	org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
 	tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -38,11 +38,11 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.13.1,2.13.2)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

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

@@ -24,10 +24,10 @@ Fragment-Host: org.openhab.core.config.discovery
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.21,1.4.22)',\
-	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)',\
+	net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
+	org.mockito.junit-jupiter;version='[5.19.0,5.19.1)',\
+	org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
 	tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -39,11 +39,11 @@ Fragment-Host: org.openhab.core.config.discovery
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.13.1,2.13.2)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistryOSGiTest.java

@@ -15,7 +15,6 @@ package org.openhab.core.config.discovery;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.time.Instant;

itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/inbox/DynamicThingUpdateOSGiTest.java

@@ -13,7 +13,6 @@
 package org.openhab.core.config.discovery.inbox;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.Map;

itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/internal/InboxOSGiTest.java

@@ -15,7 +15,8 @@ package org.openhab.core.config.discovery.internal;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 import static org.openhab.core.config.discovery.inbox.InboxPredicates.*;
 
 import java.math.BigDecimal;

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

@@ -23,10 +23,10 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.21,1.4.22)',\
-	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)',\
+	net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
+	org.mockito.junit-jupiter;version='[5.19.0,5.19.1)',\
+	org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
 	tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -38,11 +38,11 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.13.1,2.13.2)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

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

@@ -33,9 +33,9 @@ Provide-Capability: \
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.21,1.4.22)',\
-	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)',\
+	net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
+	org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
 	tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -47,11 +47,11 @@ Provide-Capability: \
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.13.1,2.13.2)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryServiceTest.java

@@ -16,7 +16,6 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsEmptyCollection.empty;
 import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 import static org.openhab.core.config.discovery.DiscoveryService.CONFIG_PROPERTY_BACKGROUND_DISCOVERY;
 

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

@@ -32,11 +32,11 @@ Fragment-Host: org.openhab.core.config.dispatch
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.13.1,2.13.2)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

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

@@ -38,11 +38,11 @@ feature.openhab-config: \
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.13.1,2.13.2)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

itests/org.openhab.core.io.net.tests/itest.bndrun

@@ -33,11 +33,11 @@ Fragment-Host: org.openhab.core.io.net
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.13.1,2.13.2)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

itests/org.openhab.core.io.rest.core.tests/itest.bndrun

@@ -30,10 +30,10 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.21,1.4.22)',\
-	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)',\
+	net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
+	org.mockito.junit-jupiter;version='[5.19.0,5.19.1)',\
+	org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
 	tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -53,12 +53,12 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.apache.cxf.cxf-rt-security;version='[3.6.8,3.6.9)',\
 	org.apache.cxf.cxf-rt-transports-http;version='[3.6.8,3.6.9)',\
 	org.apache.ws.xmlschema.core;version='[2.3.1,2.3.2)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-jupiter-params;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-jupiter-params;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResourceOSGiTest.java

@@ -17,7 +17,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
 import static org.hamcrest.core.IsIterableContaining.hasItems;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.io.ByteArrayOutputStream;

itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/link/ItemChannelLinkResourceOSGiTest.java

@@ -16,7 +16,8 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
 import static org.hamcrest.core.IsIterableContaining.hasItems;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
 
 import java.io.ByteArrayOutputStream;

itests/org.openhab.core.model.item.tests/itest.bndrun

@@ -41,11 +41,11 @@ Fragment-Host: org.openhab.core.model.item
 	org.eclipse.emf.common;version='[2.30.0,2.30.1)',\
 	org.eclipse.emf.ecore;version='[2.36.0,2.36.1)',\
 	org.eclipse.equinox.common;version='[3.19.0,3.19.1)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

itests/org.openhab.core.model.rule.tests/itest.bndrun

@@ -45,11 +45,11 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.eclipse.emf.common;version='[2.30.0,2.30.1)',\
 	org.eclipse.emf.ecore;version='[2.36.0,2.36.1)',\
 	org.eclipse.equinox.common;version='[3.19.0,3.19.1)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

itests/org.openhab.core.model.script.tests/itest.bndrun

@@ -31,10 +31,10 @@ Fragment-Host: org.openhab.core.model.script
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.21,1.4.22)',\
-	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)',\
+	net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
+	org.mockito.junit-jupiter;version='[5.19.0,5.19.1)',\
+	org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
 	tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -50,11 +50,11 @@ Fragment-Host: org.openhab.core.model.script
 	org.eclipse.emf.common;version='[2.30.0,2.30.1)',\
 	org.eclipse.emf.ecore;version='[2.36.0,2.36.1)',\
 	org.eclipse.equinox.common;version='[3.19.0,3.19.1)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

itests/org.openhab.core.model.thing.tests/itest.bndrun

@@ -28,10 +28,10 @@ Fragment-Host: org.openhab.core.model.thing
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.21,1.4.22)',\
-	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)',\
+	net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
+	org.mockito.junit-jupiter;version='[5.19.0,5.19.1)',\
+	org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
 	tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -47,12 +47,12 @@ Fragment-Host: org.openhab.core.model.thing
 	org.eclipse.emf.common;version='[2.30.0,2.30.1)',\
 	org.eclipse.emf.ecore;version='[2.36.0,2.36.1)',\
 	org.eclipse.equinox.common;version='[3.19.0,3.19.1)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-jupiter-params;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-jupiter-params;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/GenericItemChannelLinkProviderJavaTest.java

@@ -15,7 +15,6 @@ package org.openhab.core.model.thing.test;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.io.ByteArrayInputStream;

itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest2.java

@@ -14,7 +14,8 @@ package org.openhab.core.model.thing.test.hue;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.io.ByteArrayInputStream;
 import java.util.Collection;

itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest3.java

@@ -16,7 +16,8 @@ import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.io.ByteArrayInputStream;
 import java.net.URI;

itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest4.java

@@ -14,7 +14,8 @@ package org.openhab.core.model.thing.test.hue;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.io.ByteArrayInputStream;
 import java.util.stream.Stream;

itests/org.openhab.core.storage.json.tests/itest.bndrun

@@ -33,11 +33,11 @@ Fragment-Host: org.openhab.core.storage.json
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.13.1,2.13.2)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

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

@@ -22,10 +22,10 @@ Fragment-Host: org.openhab.core
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
-	net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
-	net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
-	org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\
-	org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
+	net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
+	org.mockito.junit-jupiter;version='[5.19.0,5.19.1)',\
+	org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
 	tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -37,11 +37,11 @@ Fragment-Host: org.openhab.core
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.13.1,2.13.2)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

itests/org.openhab.core.thing.tests/itest.bndrun

@@ -27,10 +27,10 @@ Fragment-Host: org.openhab.core.thing
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.21,1.4.22)',\
-	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)',\
+	net.bytebuddy.byte-buddy;version='[1.17.6,1.17.7)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.17.6,1.17.7)',\
+	org.mockito.junit-jupiter;version='[5.19.0,5.19.1)',\
+	org.mockito.mockito-core;version='[5.19.0,5.19.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
 	tech.units.indriya;version='[2.2.3,2.2.4)',\
@@ -42,11 +42,11 @@ Fragment-Host: org.openhab.core.thing
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.13.1,2.13.2)',\
-	junit-jupiter-api;version='[5.11.4,5.11.5)',\
-	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
-	junit-platform-commons;version='[1.11.4,1.11.5)',\
-	junit-platform-engine;version='[1.11.4,1.11.5)',\
-	junit-platform-launcher;version='[1.11.4,1.11.5)',\
+	junit-jupiter-api;version='[5.13.4,5.13.5)',\
+	junit-jupiter-engine;version='[5.13.4,5.13.5)',\
+	junit-platform-commons;version='[1.13.4,1.13.5)',\
+	junit-platform-engine;version='[1.13.4,1.13.5)',\
+	junit-platform-launcher;version='[1.13.4,1.13.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.5.18,1.5.19)',\
 	ch.qos.logback.core;version='[1.5.18,1.5.19)',\

itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ChangeThingTypeOSGiTest.java

@@ -16,7 +16,8 @@ import static java.util.Map.entry;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.net.URI;
 import java.net.URISyntaxException;

itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ThingFactoryTest.java

@@ -17,7 +17,8 @@ import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.math.BigDecimal;
 import java.net.URI;

itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java

@@ -15,7 +15,8 @@ package org.openhab.core.thing.firmware;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.util.HashMap;
 import java.util.Map;

itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java

@@ -16,7 +16,8 @@ import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.util.Locale;
 import java.util.Map;

itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/i18n/ThingStatusInfoI18nLocalizationServiceOSGiTest.java

@@ -15,7 +15,6 @@ package org.openhab.core.thing.i18n;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;