Update Shelly and Tradfri bindings for upgrade to Californium 2.7.3 (#13407)

* Update Shelly and Tradfri bindings for upgrade to Californium 2.7.3

* Fixes deprecated API usages
* Resolves itest runbundles

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2022-09-21 12:19:19 +02:00
committed by GitHub
parent fafdf2d7a3
commit 487811fdfd
4 changed files with 14 additions and 12 deletions

View File

@@ -20,9 +20,6 @@ Fragment-Host: org.openhab.binding.tradfri
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
javax.jmdns;version='[3.5.8,3.5.9)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.eclipse.californium.core;version='[2.0.0,2.0.1)',\
org.eclipse.californium.element-connector;version='[2.0.0,2.0.1)',\
org.eclipse.californium.scandium;version='[2.0.0,2.0.1)',\
org.hamcrest;version='[2.2.0,2.2.1)',\
org.opentest4j;version='[1.2.0,1.2.1)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
@@ -77,4 +74,9 @@ Fragment-Host: org.openhab.binding.tradfri
org.openhab.core.io.transport.mdns;version='[3.4.0,3.4.1)',\
org.openhab.core.test;version='[3.4.0,3.4.1)',\
org.openhab.core.thing;version='[3.4.0,3.4.1)',\
org.openhab.core.thing.xml;version='[3.4.0,3.4.1)'
org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
net.i2p.crypto.eddsa;version='[0.3.0,0.3.1)',\
org.eclipse.californium.core;version='[2.7.3,2.7.4)',\
org.eclipse.californium.element-connector;version='[2.7.3,2.7.4)',\
org.eclipse.californium.scandium;version='[2.7.3,2.7.4)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)'

View File

@@ -18,6 +18,7 @@ import static org.hamcrest.core.Is.is;
import static org.openhab.binding.tradfri.internal.TradfriBindingConstants.*;
import static org.openhab.binding.tradfri.internal.config.TradfriDeviceConfig.CONFIG_ID;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
@@ -103,6 +104,6 @@ public class TradfriHandlerOSGiTest extends JavaOSGiTest {
Configuration configuration = thing.getConfiguration();
assertThat(configuration, is(notNullValue()));
assertThat(configuration.get(CONFIG_ID), is("65537"));
assertThat(configuration.get(CONFIG_ID), is(BigDecimal.valueOf(65537)));
}
}