Revert LinkedTransferQueue high CPU usage workaround (#4499)

Reverts the workaround #3756 that was introduced for JDK-8301341 because it is fixed in OpenJDK 21

Signed-off-by: Wouter Born <github@maindrain.net>

bom/compile/pom.xml

@@ -427,14 +427,6 @@
       <version>5.14.0</version>
       <scope>compile</scope>
     </dependency>
-
-    <!-- Provides the Java 11 LinkedTransferQueue used in workarounds for JDK-8301341 -->
-    <dependency>
-      <groupId>org.openhab</groupId>
-      <artifactId>base-fixes</artifactId>
-      <version>1.0.0</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 
 </project>

bom/openhab-core/pom.xml

@@ -388,12 +388,6 @@
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.openhab.core.bundles</groupId>
-      <artifactId>org.openhab.core.config.jupnp</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>
       <artifactId>org.openhab.core.config.serial</artifactId>

bom/runtime/pom.xml

@@ -1075,14 +1075,6 @@
       <version>5.14.0</version>
       <scope>compile</scope>
     </dependency>
-
-    <!-- Provides the Java 11 LinkedTransferQueue used in workarounds for JDK-8301341 -->
-    <dependency>
-      <groupId>org.openhab</groupId>
-      <artifactId>base-fixes</artifactId>
-      <version>1.0.0</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 
 </project>

bundles/org.openhab.core.config.jupnp/.classpath

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="annotationpath" value="target/dependency"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="annotationpath" value="target/dependency"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

bundles/org.openhab.core.config.jupnp/.project

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.openhab.core.config.jupnp</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>

bundles/org.openhab.core.config.jupnp/NOTICE

@@ -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
-

bundles/org.openhab.core.config.jupnp/pom.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.openhab.core.bundles</groupId>
-    <artifactId>org.openhab.core.reactor.bundles</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.openhab.core.config.jupnp</artifactId>
-
-  <name>openHAB Core :: Bundles :: Configuration jUPnP</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.jupnp</groupId>
-      <artifactId>org.jupnp</artifactId>
-      <version>3.0.1</version>
-    </dependency>
-  </dependencies>
-
-</project>

bundles/org.openhab.core.config.jupnp/src/main/java/org/openhab/core/config/jupnp/internal/OHUpnpServiceConfiguration.java

@@ -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 <a href="https://bugs.openjdk.org/browse/JDK-8301341">JDK-8301341: LinkedTransferQueue does not respect timeout
- *      for poll()</a>
- * @see <a href="https://github.com/openhab/openhab-core/issues/3755">openhab-core#3755: LinkedTransferQueue in OpenJDK
- *      17 sometimes causes high CPU usage</a>
- *
- * @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<>());
-    }
-}

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;
 

bundles/pom.xml

@@ -45,7 +45,6 @@
     <module>org.openhab.core.config.discovery.usbserial.windowsregistry</module>
     <module>org.openhab.core.config.discovery.upnp</module>
     <module>org.openhab.core.config.dispatch</module>
-    <module>org.openhab.core.config.jupnp</module>
     <module>org.openhab.core.config.serial</module>
     <module>org.openhab.core</module>
     <module>org.openhab.core.audio</module>

features/karaf/openhab-tp/src/main/feature/feature.xml

@@ -198,9 +198,6 @@
 		<feature dependency="true">http</feature>
 		<feature dependency="true">scr</feature>
 		<feature dependency="true">openhab.tp-httpclient</feature>
-		<!-- Use the Java 11 LinkedTransferQueue as workaround for JDK-8301341 -->
-		<bundle>mvn:org.openhab/base-fixes/1.0.0</bundle>
-		<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.jupnp/${project.version}</bundle>
 		<bundle>mvn:org.jupnp/org.jupnp/3.0.1</bundle>
 	</feature>
 

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

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)',\

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)',\

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)',\

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)',\

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)',\

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)',\

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)',\

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)',\

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)',\

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)',\

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)',\

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)',\

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)',\

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)',\

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)',\

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)',\

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)'

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)'

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)'

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)'

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)',\

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)',\

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)',\

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)',\