Skip to content

Commit

Permalink
[WIP] Upgrade Karaf from 4.4.6 to 4.4.7
Browse files Browse the repository at this point in the history
* Sync runtime dependencies with Karaf 4.4.7, most notably:
   * BouncyCastle 1.78.1
   * CXF 3.6.4
   * Jackson 2.17.2
   * JNA 5.15.0
   * JAXB 2.3.9
   * commons-io 2.17.0
   * commons-lang3 3.17.0
   * commons-logging 1.3.4
 * Resolve itest runbundles

Signed-off-by: Holger Friedrich <[email protected]>
  • Loading branch information
holgerfriedrich committed Nov 6, 2024
1 parent f37f39c commit 237c2d7
Show file tree
Hide file tree
Showing 25 changed files with 60 additions and 56 deletions.
2 changes: 1 addition & 1 deletion bundles/org.openhab.binding.amplipi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<name>openHAB Add-ons :: Bundles :: AmpliPi Binding</name>

<properties>
<cxf-version>3.6.2</cxf-version>
<cxf-version>3.6.4</cxf-version>
</properties>

<build>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.binding.ihc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
<version>1.3.4</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<feature>openhab-runtime-base</feature>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.10</bundle>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.8</bundle>
<bundle dependency="true">mvn:commons-logging/commons-logging/1.2</bundle>
<bundle dependency="true">mvn:commons-logging/commons-logging/1.3.4</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.ihc/${project.version}</bundle>
</feature>
</features>
2 changes: 1 addition & 1 deletion bundles/org.openhab.binding.ipp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
<version>2.17.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.binding.logreader/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
<version>2.17.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<feature name="openhab-binding-zway" description="Z-Way Binding" version="${project.version}">
<feature>openhab-runtime-base</feature>
<feature dependency="true">openhab.tp-commons-net</feature>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.4</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.17.0</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.zway/${project.version}</bundle>
</feature>
</features>
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.13</bundle>
<bundle dependency="true">mvn:org.openhab.osgiify/com.amazonaws.aws-java-sdk-core/1.12.626</bundle>
<bundle dependency="true">mvn:org.openhab.osgiify/com.amazonaws.aws-java-sdk-polly/1.12.626</bundle>
<bundle dependency="true">mvn:commons-logging/commons-logging/1.2</bundle>
<bundle dependency="true">mvn:commons-logging/commons-logging/1.3.4</bundle>
<bundle dependency="true">mvn:joda-time/joda-time/2.8.1</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.voice.pollytts/${project.version}</bundle>
</feature>
Expand Down
11 changes: 7 additions & 4 deletions itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Fragment-Host: org.openhab.automation.groovyscripting
tech.units.indriya;version='[2.2.0,2.2.1)',\
uom-lib-common;version='[2.2.0,2.2.1)',\
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
Expand All @@ -51,12 +51,15 @@ Fragment-Host: org.openhab.automation.groovyscripting
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
ch.qos.logback.core;version='[1.3.14,1.3.15)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.17.2,2.17.3)',\
com.fasterxml.jackson.core.jackson-core;version='[2.17.2,2.17.3)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.17.2,2.17.3)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.17.2,2.17.3)',\
org.yaml.snakeyaml;version='[2.2.0,2.2.1)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.2,2.17.3)',\
org.threeten.extra;version='[1.8.0,1.8.1)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
com.sun.jna;version='[5.15.0,5.15.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.io;version='[9.4.54,9.4.55)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
tech.units.indriya;version='[2.2.0,2.2.1)',\
uom-lib-common;version='[2.2.0,2.2.1)',\
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
Expand All @@ -52,12 +52,12 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
ch.qos.logback.core;version='[1.3.14,1.3.15)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.core.jackson-core;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.17.2,2.17.3)',\
com.fasterxml.jackson.core.jackson-core;version='[2.17.2,2.17.3)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.17.2,2.17.3)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.2,2.17.3)',\
org.threeten.extra;version='[1.8.0,1.8.1)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
com.sun.jna;version='[5.15.0,5.15.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.io;version='[9.4.54,9.4.55)',\
Expand Down
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.astro.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Fragment-Host: org.openhab.binding.astro
tech.units.indriya;version='[2.2.0,2.2.1)',\
uom-lib-common;version='[2.2.0,2.2.1)',\
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
Expand All @@ -46,7 +46,7 @@ Fragment-Host: org.openhab.binding.astro
junit-platform-launcher;version='[1.10.0,1.10.1)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
com.sun.jna;version='[5.15.0,5.15.1)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
org.openhab.binding.astro;version='[4.3.0,4.3.1)',\
org.openhab.binding.astro.tests;version='[4.3.0,4.3.1)',\
Expand Down
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.avmfritz.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Fragment-Host: org.openhab.binding.avmfritz
tech.units.indriya;version='[2.2.0,2.2.1)',\
uom-lib-common;version='[2.2.0,2.2.1)',\
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
Expand All @@ -54,7 +54,7 @@ Fragment-Host: org.openhab.binding.avmfritz
ch.qos.logback.core;version='[1.3.14,1.3.15)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
org.jupnp;version='[3.0.1,3.0.2)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
com.sun.jna;version='[5.15.0,5.15.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.eclipse.jetty.alpn.client;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.client;version='[9.4.54,9.4.55)',\
Expand Down
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.feed.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Fragment-Host: org.openhab.binding.feed
tech.units.indriya;version='[2.2.0,2.2.1)',\
uom-lib-common;version='[2.2.0,2.2.1)',\
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
Expand All @@ -52,7 +52,7 @@ Fragment-Host: org.openhab.binding.feed
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
ch.qos.logback.core;version='[1.3.14,1.3.15)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
com.sun.jna;version='[5.15.0,5.15.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.io;version='[9.4.54,9.4.55)',\
Expand Down
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.hue.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Fragment-Host: org.openhab.binding.hue
tech.units.indriya;version='[2.2.0,2.2.1)',\
uom-lib-common;version='[2.2.0,2.2.1)',\
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
Expand All @@ -58,7 +58,7 @@ Fragment-Host: org.openhab.binding.hue
ch.qos.logback.core;version='[1.3.14,1.3.15)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
org.jupnp;version='[3.0.1,3.0.2)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
com.sun.jna;version='[5.15.0,5.15.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.eclipse.jetty.alpn.client;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.client;version='[9.4.54,9.4.55)',\
Expand Down
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.max.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Fragment-Host: org.openhab.binding.max
tech.units.indriya;version='[2.2.0,2.2.1)',\
uom-lib-common;version='[2.2.0,2.2.1)',\
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
Expand All @@ -50,7 +50,7 @@ Fragment-Host: org.openhab.binding.max
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
ch.qos.logback.core;version='[1.3.14,1.3.15)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
com.sun.jna;version='[5.15.0,5.15.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.io;version='[9.4.54,9.4.55)',\
Expand Down
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.mielecloud.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Fragment-Host: org.openhab.binding.mielecloud
tech.units.indriya;version='[2.2.0,2.2.1)',\
uom-lib-common;version='[2.2.0,2.2.1)',\
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
Expand All @@ -54,7 +54,7 @@ Fragment-Host: org.openhab.binding.mielecloud
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
ch.qos.logback.core;version='[1.3.14,1.3.15)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
com.sun.jna;version='[5.15.0,5.15.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.eclipse.jetty.alpn.client;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.client;version='[9.4.54,9.4.55)',\
Expand Down
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.modbus.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Fragment-Host: org.openhab.binding.modbus
tech.units.indriya;version='[2.2.0,2.2.1)',\
uom-lib-common;version='[2.2.0,2.2.1)',\
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
Expand All @@ -58,7 +58,7 @@ Fragment-Host: org.openhab.binding.modbus
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
ch.qos.logback.core;version='[1.3.14,1.3.15)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
com.sun.jna;version='[5.15.0,5.15.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.io;version='[9.4.54,9.4.55)',\
Expand Down
17 changes: 9 additions & 8 deletions itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Import-Package: \
tech.units.indriya;version='[2.2.0,2.2.1)',\
uom-lib-common;version='[2.2.0,2.2.1)',\
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
org.apache.aries.javax.jax.rs-api;version='[1.0.4,1.0.5)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
Expand Down Expand Up @@ -89,7 +89,7 @@ Import-Package: \
io.netty.transport;version='[4.1.104,4.1.105)',\
io.netty.transport-native-unix-common;version='[4.1.104,4.1.105)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
com.sun.jna;version='[5.15.0,5.15.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.io;version='[9.4.54,9.4.55)',\
Expand Down Expand Up @@ -118,17 +118,18 @@ Import-Package: \
org.openhab.core.thing;version='[4.3.0,4.3.1)',\
org.openhab.core.transform;version='[4.3.0,4.3.1)',\
ch.obermuhlner.math.big;version='[2.3.2,2.3.3)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.core.jackson-core;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.17.2,2.17.3)',\
com.fasterxml.jackson.core.jackson-core;version='[2.17.2,2.17.3)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.17.2,2.17.3)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.17.2,2.17.3)',\
com.google.guava;version='[33.3.0,33.3.1)',\
com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
com.google.re2j.re2j;version='[1.2.0,1.2.1)',\
com.hubspot.jinjava.jinjava;version='[2.7.3,2.7.4)',\
javassist;version='[3.29.2,3.29.3)',\
org.apache.commons.commons-net;version='[3.9.0,3.9.1)',\
org.apache.commons.lang3;version='[3.14.0,3.14.1)',\
org.apache.commons.lang3;version='[3.17.0,3.17.1)',\
org.yaml.snakeyaml;version='[2.2.0,2.2.1)',\
com.fasterxml.jackson.datatype.jackson-datatype-jdk8;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.datatype.jackson-datatype-jdk8;version='[2.17.2,2.17.3)',\
com.google.guava;version='[33.3.0,33.3.1)',\
com.hubspot.immutables.immutables-exceptions;version='[1.9.0,1.9.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Import-Package: \
tech.units.indriya;version='[2.2.0,2.2.1)',\
uom-lib-common;version='[2.2.0,2.2.1)',\
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
org.apache.aries.javax.jax.rs-api;version='[1.0.4,1.0.5)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
Expand Down Expand Up @@ -89,7 +89,7 @@ Import-Package: \
io.netty.transport;version='[4.1.104,4.1.105)',\
io.netty.transport-native-unix-common;version='[4.1.104,4.1.105)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
com.sun.jna;version='[5.15.0,5.15.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.io;version='[9.4.54,9.4.55)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Import-Package: \
tech.units.indriya;version='[2.2.0,2.2.1)',\
uom-lib-common;version='[2.2.0,2.2.1)',\
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
org.apache.aries.javax.jax.rs-api;version='[1.0.4,1.0.5)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
Expand Down Expand Up @@ -90,7 +90,7 @@ Import-Package: \
io.netty.transport;version='[4.1.104,4.1.105)',\
io.netty.transport-native-unix-common;version='[4.1.104,4.1.105)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
com.sun.jna;version='[5.15.0,5.15.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.io;version='[9.4.54,9.4.55)',\
Expand Down
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.ntp.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Fragment-Host: org.openhab.binding.ntp
tech.units.indriya;version='[2.2.0,2.2.1)',\
uom-lib-common;version='[2.2.0,2.2.1)',\
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
Expand All @@ -55,7 +55,7 @@ Fragment-Host: org.openhab.binding.ntp
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
ch.qos.logback.core;version='[1.3.14,1.3.15)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
com.sun.jna;version='[5.15.0,5.15.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.io;version='[9.4.54,9.4.55)',\
Expand Down
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.systeminfo.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Fragment-Host: org.openhab.binding.systeminfo
tech.units.indriya;version='[2.2.0,2.2.1)',\
uom-lib-common;version='[2.2.0,2.2.1)',\
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
Expand All @@ -57,7 +57,7 @@ Fragment-Host: org.openhab.binding.systeminfo
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
ch.qos.logback.core;version='[1.3.14,1.3.15)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
com.sun.jna;version='[5.15.0,5.15.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.io;version='[9.4.54,9.4.55)',\
Expand Down
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.tradfri.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Fragment-Host: org.openhab.binding.tradfri
tech.units.indriya;version='[2.2.0,2.2.1)',\
uom-lib-common;version='[2.2.0,2.2.1)',\
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
Expand All @@ -60,7 +60,7 @@ Fragment-Host: org.openhab.binding.tradfri
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
ch.qos.logback.core;version='[1.3.14,1.3.15)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
com.sun.jna;version='[5.15.0,5.15.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.io;version='[9.4.54,9.4.55)',\
Expand Down
Loading

0 comments on commit 237c2d7

Please sign in to comment.