Skip to content

Commit

Permalink
Resolve runbundles for reverting LinkedTransferQueue high CPU usage w…
Browse files Browse the repository at this point in the history
…orkaround (#17914)

Related to openhab/openhab-core#4499

Signed-off-by: Wouter Born <[email protected]>
  • Loading branch information
wborn authored Dec 17, 2024
1 parent 2d14d4f commit 2f7b727
Show file tree
Hide file tree
Showing 18 changed files with 1 addition and 18 deletions.
2 changes: 1 addition & 1 deletion itests/itest-common.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.binding.astro.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.binding.avmfritz.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.binding.feed.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.binding.hue.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.binding.max.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.binding.mielecloud.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.binding.modbus.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.binding.ntp.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.binding.systeminfo.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.binding.tradfri.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.binding.wemo.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.persistence.mapdb.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down

0 comments on commit 2f7b727

Please sign in to comment.