diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml index b513b0e2e..2937bb90c 100644 --- a/bom/compile/pom.xml +++ b/bom/compile/pom.xml @@ -427,14 +427,6 @@ 5.14.0 compile - - - - org.openhab - base-fixes - 1.0.0 - compile - diff --git a/bom/openhab-core/pom.xml b/bom/openhab-core/pom.xml index 2a3aeb7b3..4388de7ea 100644 --- a/bom/openhab-core/pom.xml +++ b/bom/openhab-core/pom.xml @@ -388,12 +388,6 @@ ${project.version} compile - - org.openhab.core.bundles - org.openhab.core.config.jupnp - ${project.version} - compile - org.openhab.core.bundles org.openhab.core.config.serial diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index 31c1b1741..4df792501 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -1075,14 +1075,6 @@ 5.14.0 compile - - - - org.openhab - base-fixes - 1.0.0 - compile - diff --git a/bundles/org.openhab.core.config.jupnp/.classpath b/bundles/org.openhab.core.config.jupnp/.classpath deleted file mode 100644 index 58cd399d6..000000000 --- a/bundles/org.openhab.core.config.jupnp/.classpath +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.openhab.core.config.jupnp/.project b/bundles/org.openhab.core.config.jupnp/.project deleted file mode 100644 index 2ce193699..000000000 --- a/bundles/org.openhab.core.config.jupnp/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - org.openhab.core.config.jupnp - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/bundles/org.openhab.core.config.jupnp/NOTICE b/bundles/org.openhab.core.config.jupnp/NOTICE deleted file mode 100644 index 6c17d0d8a..000000000 --- a/bundles/org.openhab.core.config.jupnp/NOTICE +++ /dev/null @@ -1,14 +0,0 @@ -This content is produced and maintained by the openHAB project. - -* Project home: https://www.openhab.org - -== Declared Project Licenses - -This program and the accompanying materials are made available under the terms -of the Eclipse Public License 2.0 which is available at -https://www.eclipse.org/legal/epl-2.0/. - -== Source Code - -https://github.com/openhab/openhab-core - diff --git a/bundles/org.openhab.core.config.jupnp/pom.xml b/bundles/org.openhab.core.config.jupnp/pom.xml deleted file mode 100644 index 5810fe1c9..000000000 --- a/bundles/org.openhab.core.config.jupnp/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - 4.0.0 - - - org.openhab.core.bundles - org.openhab.core.reactor.bundles - 5.0.0-SNAPSHOT - - - org.openhab.core.config.jupnp - - openHAB Core :: Bundles :: Configuration jUPnP - - - - org.jupnp - org.jupnp - 3.0.1 - - - - diff --git a/bundles/org.openhab.core.config.jupnp/src/main/java/org/openhab/core/config/jupnp/internal/OHUpnpServiceConfiguration.java b/bundles/org.openhab.core.config.jupnp/src/main/java/org/openhab/core/config/jupnp/internal/OHUpnpServiceConfiguration.java deleted file mode 100644 index 85793c29b..000000000 --- a/bundles/org.openhab.core.config.jupnp/src/main/java/org/openhab/core/config/jupnp/internal/OHUpnpServiceConfiguration.java +++ /dev/null @@ -1,60 +0,0 @@ -/** - * Copyright (c) 2010-2024 Contributors to the openHAB project - * - * See the NOTICE file(s) distributed with this work for additional - * information. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0 - * - * SPDX-License-Identifier: EPL-2.0 - */ -package org.openhab.core.config.jupnp.internal; - -import java.util.concurrent.ExecutorService; - -import org.jupnp.OSGiUpnpServiceConfiguration; -import org.jupnp.QueueingThreadPoolExecutor; -import org.jupnp.UpnpServiceConfiguration; -import org.openhab.basefixes.util.concurrent.LinkedTransferQueue; -import org.osgi.service.component.annotations.Component; -import org.osgi.service.component.annotations.ConfigurationPolicy; -import org.osgi.service.component.annotations.Reference; -import org.osgi.service.http.HttpService; - -/** - * Uses the Java 11 {@link LinkedTransferQueue} with jUPnP as workaround for the buggy OpenJDK 17 implementation. - * - * @see JDK-8301341: LinkedTransferQueue does not respect timeout - * for poll() - * @see openhab-core#3755: LinkedTransferQueue in OpenJDK - * 17 sometimes causes high CPU usage - * - * @author Wouter Born - Initial contribution - */ -@Component(configurationPid = "org.jupnp", configurationPolicy = ConfigurationPolicy.REQUIRE, service = UpnpServiceConfiguration.class) -public class OHUpnpServiceConfiguration extends OSGiUpnpServiceConfiguration { - @Reference - @Override - public void setHttpService(HttpService httpService) { - super.setHttpService(httpService); - } - - @Override - protected ExecutorService createMainExecutorService() { - return QueueingThreadPoolExecutor.createInstance("upnp-main", threadPoolSize, new LinkedTransferQueue<>()); - } - - @Override - protected ExecutorService createAsyncProtocolExecutorService() { - return QueueingThreadPoolExecutor.createInstance("upnp-async", asyncThreadPoolSize, - new LinkedTransferQueue<>()); - } - - @Override - protected ExecutorService createRemoteProtocolExecutorService() { - return QueueingThreadPoolExecutor.createInstance("upnp-remote", remoteThreadPoolSize, - new LinkedTransferQueue<>()); - } -} diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/QueueingThreadPoolExecutor.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/QueueingThreadPoolExecutor.java index 40050d832..ba68e3857 100644 --- a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/QueueingThreadPoolExecutor.java +++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/QueueingThreadPoolExecutor.java @@ -13,6 +13,7 @@ package org.openhab.core.common; import java.util.concurrent.BlockingQueue; +import java.util.concurrent.LinkedTransferQueue; import java.util.concurrent.RejectedExecutionHandler; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadFactory; @@ -23,7 +24,6 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.function.Consumer; -import org.openhab.basefixes.util.concurrent.LinkedTransferQueue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/pom.xml b/bundles/pom.xml index 153132c0b..a4e835324 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -45,7 +45,6 @@ org.openhab.core.config.discovery.usbserial.windowsregistry org.openhab.core.config.discovery.upnp org.openhab.core.config.dispatch - org.openhab.core.config.jupnp org.openhab.core.config.serial org.openhab.core org.openhab.core.audio diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml index e00fd101c..1613f8d44 100644 --- a/features/karaf/openhab-tp/src/main/feature/feature.xml +++ b/features/karaf/openhab-tp/src/main/feature/feature.xml @@ -198,9 +198,6 @@ http scr openhab.tp-httpclient - - mvn:org.openhab/base-fixes/1.0.0 - mvn:org.openhab.core.bundles/org.openhab.core.config.jupnp/${project.version} mvn:org.jupnp/org.jupnp/3.0.1 diff --git a/itests/itest-include.bndrun b/itests/itest-include.bndrun index e6a171cea..20051586b 100644 --- a/itests/itest-include.bndrun +++ b/itests/itest-include.bndrun @@ -15,7 +15,7 @@ Test-Cases: ${classes;CONCRETE;PUBLIC;NAMED;*Test} -runsystempackages: sun.reflect -runfw: org.eclipse.osgi --runee: JavaSE-17 +-runee: JavaSE-21 # An unused random HTTP port is used during tests to prevent resource conflicts # This property is set by the build-helper-maven-plugin in the itests pom.xml diff --git a/itests/org.openhab.core.addon.tests/itest.bndrun b/itests/org.openhab.core.addon.tests/itest.bndrun index 71a409056..50ee87222 100644 --- a/itests/org.openhab.core.addon.tests/itest.bndrun +++ b/itests/org.openhab.core.addon.tests/itest.bndrun @@ -27,7 +27,6 @@ Fragment-Host: org.openhab.core.addon 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)',\ - org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun index 9992d606f..9456a3995 100644 --- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun +++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun @@ -26,7 +26,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client 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.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index 74c3d9498..c506518e2 100644 --- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun @@ -27,7 +27,6 @@ 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.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.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 88bbe9039..0a679170e 100644 --- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun @@ -27,7 +27,6 @@ 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.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.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 d2c2155fe..2215bda54 100644 --- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun @@ -23,7 +23,6 @@ Fragment-Host: org.openhab.core.automation.module.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)',\ - org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.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 4ca6c0577..29fa29366 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun @@ -27,7 +27,6 @@ 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.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index 64e9e45a3..58cb07c85 100644 --- a/itests/org.openhab.core.automation.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.tests/itest.bndrun @@ -27,7 +27,6 @@ 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.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun index 4ff7357fc..a07b6bf76 100644 --- a/itests/org.openhab.core.config.core.tests/itest.bndrun +++ b/itests/org.openhab.core.config.core.tests/itest.bndrun @@ -29,7 +29,6 @@ Fragment-Host: org.openhab.core.config.core 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.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.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 be1087ec3..8657b5578 100644 --- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun @@ -28,7 +28,6 @@ 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.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun index 41f3a7ec5..218756726 100644 --- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun @@ -29,7 +29,6 @@ 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.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.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 0691270dc..f2fd0f468 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 @@ -28,7 +28,6 @@ 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.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.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 20499e482..b48656814 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun @@ -37,7 +37,6 @@ 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.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun index 1571f6294..9e9143ceb 100644 --- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun +++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun @@ -22,7 +22,6 @@ Fragment-Host: org.openhab.core.config.dispatch 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)',\ - org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index 0d5a654c9..d48c7d4cf 100644 --- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun +++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun @@ -28,7 +28,6 @@ feature.openhab-config: \ 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)',\ - org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ diff --git a/itests/org.openhab.core.io.net.tests/itest.bndrun b/itests/org.openhab.core.io.net.tests/itest.bndrun index 0744ffeaa..4ec628c78 100644 --- a/itests/org.openhab.core.io.net.tests/itest.bndrun +++ b/itests/org.openhab.core.io.net.tests/itest.bndrun @@ -23,7 +23,6 @@ Fragment-Host: org.openhab.core.io.net org.osgi.util.function;version='[1.2.0,1.2.1)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ - org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.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 61111aae7..bec325122 100644 --- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun +++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun @@ -35,7 +35,6 @@ Fragment-Host: org.openhab.core.io.rest.core 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.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index 7f3c8a617..6432d4c02 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -27,7 +27,6 @@ Fragment-Host: org.openhab.core.model.item 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)',\ - org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ @@ -128,4 +127,5 @@ Fragment-Host: org.openhab.core.model.item biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\ - de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)' + de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)',\ + org.openhab.core.model.rule.runtime;version='[5.0.0,5.0.1)' diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index 3d2d83c42..43e452e3b 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -31,7 +31,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime 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)',\ - org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ @@ -129,7 +128,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime stax2-api;version='[4.2.2,4.2.3)',\ com.google.guava;version='[33.3.0,33.3.1)',\ biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ - org.openhab.core.model.item.runtime;version='[5.0.0,5.0.1)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\ de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)' diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun index 7bc2f1397..8ecab29ac 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -36,7 +36,6 @@ Fragment-Host: org.openhab.core.model.script 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.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ @@ -133,6 +132,6 @@ Fragment-Host: org.openhab.core.model.script stax2-api;version='[4.2.2,4.2.3)',\ com.google.guava;version='[33.3.0,33.3.1)',\ biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ - org.openhab.core.model.item.runtime;version='[5.0.0,5.0.1)',\ de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\ - de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)' + de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)',\ + org.openhab.core.model.rule.runtime;version='[5.0.0,5.0.1)' diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index a0a3fe67d..4a07a2ea6 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -33,7 +33,6 @@ Fragment-Host: org.openhab.core.model.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.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ @@ -137,4 +136,5 @@ Fragment-Host: org.openhab.core.model.thing biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\ - de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)' + de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)',\ + org.openhab.core.model.rule.runtime;version='[5.0.0,5.0.1)' diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun index 51e6efaac..5e417d214 100644 --- a/itests/org.openhab.core.storage.json.tests/itest.bndrun +++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun @@ -23,7 +23,6 @@ Fragment-Host: org.openhab.core.storage.json 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)',\ - org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun index 834e92e34..d3c75ecb3 100644 --- a/itests/org.openhab.core.tests/itest.bndrun +++ b/itests/org.openhab.core.tests/itest.bndrun @@ -27,7 +27,6 @@ Fragment-Host: org.openhab.core 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.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun index 8d89fed0a..2d6069ee9 100644 --- a/itests/org.openhab.core.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.tests/itest.bndrun @@ -32,7 +32,6 @@ 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.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun index 1cc4a3c48..d795a0df5 100644 --- a/itests/org.openhab.core.voice.tests/itest.bndrun +++ b/itests/org.openhab.core.voice.tests/itest.bndrun @@ -27,7 +27,6 @@ Fragment-Host: org.openhab.core.voice 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)',\ - org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\