From 2f7b727d145b354db2f4a71be5cc0aad361a3d18 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Tue, 17 Dec 2024 13:26:36 +0100 Subject: [PATCH] Resolve runbundles for reverting LinkedTransferQueue high CPU usage workaround (#17914) Related to openhab/openhab-core#4499 Signed-off-by: Wouter Born --- itests/itest-common.bndrun | 2 +- .../org.openhab.automation.groovyscripting.tests/itest.bndrun | 1 - .../itest.bndrun | 1 - itests/org.openhab.binding.astro.tests/itest.bndrun | 1 - itests/org.openhab.binding.avmfritz.tests/itest.bndrun | 1 - itests/org.openhab.binding.feed.tests/itest.bndrun | 1 - itests/org.openhab.binding.hue.tests/itest.bndrun | 1 - itests/org.openhab.binding.max.tests/itest.bndrun | 1 - itests/org.openhab.binding.mielecloud.tests/itest.bndrun | 1 - itests/org.openhab.binding.modbus.tests/itest.bndrun | 1 - .../org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun | 1 - itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun | 1 - itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun | 1 - itests/org.openhab.binding.ntp.tests/itest.bndrun | 1 - itests/org.openhab.binding.systeminfo.tests/itest.bndrun | 1 - itests/org.openhab.binding.tradfri.tests/itest.bndrun | 1 - itests/org.openhab.binding.wemo.tests/itest.bndrun | 1 - itests/org.openhab.persistence.mapdb.tests/itest.bndrun | 1 - 18 files changed, 1 insertion(+), 18 deletions(-) diff --git a/itests/itest-common.bndrun b/itests/itest-common.bndrun index aad8d953a8a..e4aa2908ccf 100644 --- a/itests/itest-common.bndrun +++ b/itests/itest-common.bndrun @@ -19,7 +19,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.automation.groovyscripting.tests/itest.bndrun b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun index 65931805269..8c0250d6d80 100644 --- a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun +++ b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun @@ -30,7 +30,6 @@ Fragment-Host: org.openhab.automation.groovyscripting 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.automation.jsscriptingnashorn.tests/itest.bndrun b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun index 0be3e6cdee6..08f7a07efe1 100644 --- a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun +++ b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun @@ -30,7 +30,6 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn 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.binding.astro.tests/itest.bndrun b/itests/org.openhab.binding.astro.tests/itest.bndrun index be390f09f56..5a5cf63bde5 100644 --- a/itests/org.openhab.binding.astro.tests/itest.bndrun +++ b/itests/org.openhab.binding.astro.tests/itest.bndrun @@ -25,7 +25,6 @@ Fragment-Host: org.openhab.binding.astro org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ 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.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun index f6d5c6ae56f..ca832364f3e 100644 --- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun +++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun @@ -31,7 +31,6 @@ Fragment-Host: org.openhab.binding.avmfritz org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ 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.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun index 22deea55c48..c73eca776b0 100644 --- a/itests/org.openhab.binding.feed.tests/itest.bndrun +++ b/itests/org.openhab.binding.feed.tests/itest.bndrun @@ -30,7 +30,6 @@ Fragment-Host: org.openhab.binding.feed 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.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun index 3b9210553b7..824c0cd1c42 100644 --- a/itests/org.openhab.binding.hue.tests/itest.bndrun +++ b/itests/org.openhab.binding.hue.tests/itest.bndrun @@ -35,7 +35,6 @@ Fragment-Host: org.openhab.binding.hue org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ 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.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun index c69d904ab8b..6d231b3f373 100644 --- a/itests/org.openhab.binding.max.tests/itest.bndrun +++ b/itests/org.openhab.binding.max.tests/itest.bndrun @@ -28,7 +28,6 @@ Fragment-Host: org.openhab.binding.max 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.binding.mielecloud.tests/itest.bndrun b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun index d4bcdf4cb54..64a2d8f8b57 100644 --- a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun +++ b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun @@ -32,7 +32,6 @@ Fragment-Host: org.openhab.binding.mielecloud org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ 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.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun index c6da2a97ae6..96be191176c 100644 --- a/itests/org.openhab.binding.modbus.tests/itest.bndrun +++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun @@ -35,7 +35,6 @@ Fragment-Host: org.openhab.binding.modbus org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ 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.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun index 722d0632f86..f8fa7f9b7b7 100644 --- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun +++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun @@ -53,7 +53,6 @@ Import-Package: \ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ 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.binding.mqtt.homie.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun index dec7c91ebea..03b1b611215 100644 --- a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun +++ b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun @@ -53,7 +53,6 @@ Import-Package: \ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ 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.binding.mqtt.ruuvigateway.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun index 56bcac47e7c..576832a11a3 100644 --- a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun +++ b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun @@ -53,7 +53,6 @@ Import-Package: \ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ org.mockito.junit-jupiter;version='[4.11.0,4.11.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.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun index 41e823de482..cb3ff5d2135 100644 --- a/itests/org.openhab.binding.ntp.tests/itest.bndrun +++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun @@ -33,7 +33,6 @@ Fragment-Host: org.openhab.binding.ntp org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ 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.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun index 98e47d326b3..ef24f60a152 100644 --- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun +++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun @@ -35,7 +35,6 @@ Fragment-Host: org.openhab.binding.systeminfo org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ 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.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun index 1e24f0ac719..3527e1ecbf0 100644 --- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun +++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun @@ -38,7 +38,6 @@ Fragment-Host: org.openhab.binding.tradfri org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ 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.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun index 44661361624..9a631cbe800 100644 --- a/itests/org.openhab.binding.wemo.tests/itest.bndrun +++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun @@ -35,7 +35,6 @@ Fragment-Host: org.openhab.binding.wemo org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ 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.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun index 679b69131fb..42fdf02f329 100644 --- a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun +++ b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun @@ -30,7 +30,6 @@ Fragment-Host: org.openhab.persistence.mapdb 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)',\