mirror of
https://github.com/openhab/openhab-addons.git
synced 2025-01-10 15:11:59 +01:00
Upgrade to Karaf 4.4.3 (#14040)
* Rework Servlets to use Http Whiteboard annotations in favor of proprietary `org.openhab.core.io.http.servlet` classes * Resolve itest runbundles * Fix dependency issues * Catch proper exception when starting hueemulation UpnpServer Also-by: Jan N. Klug <github@klug.nrw> Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
parent
db436a1dad
commit
b2bf7256db
@ -104,7 +104,7 @@ public class WundergroundUpdateReceiverDiscoveryService extends AbstractDiscover
|
||||
setScanning(true);
|
||||
if (servletControls != null && !servletControls.isActive()) {
|
||||
servletWasInactive = true;
|
||||
servletControls.activate();
|
||||
servletControls.enable();
|
||||
}
|
||||
thinglessStationIds.keySet().forEach(this::createDiscoveryResult);
|
||||
}
|
||||
@ -114,7 +114,7 @@ public class WundergroundUpdateReceiverDiscoveryService extends AbstractDiscover
|
||||
super.stopScan();
|
||||
thinglessStationIds.keySet().forEach(this::createDiscoveryResult);
|
||||
if (!isBackgroundDiscoveryEnabled() && servletControls != null && servletWasInactive) {
|
||||
servletControls.deactivate();
|
||||
servletControls.disable();
|
||||
}
|
||||
setScanning(false);
|
||||
}
|
||||
|
@ -42,24 +42,21 @@ public class WundergroundUpdateReceiverHandlerFactory extends BaseThingHandlerFa
|
||||
private final WundergroundUpdateReceiverDiscoveryService discoveryService;
|
||||
private final ChannelTypeRegistry channelTypeRegistry;
|
||||
private final WundergroundUpdateReceiverUnknownChannelTypeProvider channelTypeProvider;
|
||||
private final WundergroundUpdateReceiverServlet wunderGroundUpdateReceiverServlet;
|
||||
private final ManagedThingProvider managedThingProvider;
|
||||
private final WundergroundUpdateReceiverServlet wunderGroundUpdateReceiverServlet;
|
||||
|
||||
@Activate
|
||||
public WundergroundUpdateReceiverHandlerFactory(@Reference HttpService httpService,
|
||||
@Reference WundergroundUpdateReceiverDiscoveryService discoveryService,
|
||||
@Reference WundergroundUpdateReceiverUnknownChannelTypeProvider channelTypeProvider,
|
||||
@Reference ChannelTypeRegistry channelTypeRegistry, @Reference ManagedThingProvider managedThingProvider) {
|
||||
@Reference ChannelTypeRegistry channelTypeRegistry, @Reference ManagedThingProvider managedThingProvider,
|
||||
@Reference WundergroundUpdateReceiverServlet wunderGroundUpdateReceiverServlet) {
|
||||
this.discoveryService = discoveryService;
|
||||
this.channelTypeRegistry = channelTypeRegistry;
|
||||
this.channelTypeProvider = channelTypeProvider;
|
||||
this.managedThingProvider = managedThingProvider;
|
||||
this.wunderGroundUpdateReceiverServlet = new WundergroundUpdateReceiverServlet(httpService,
|
||||
this.discoveryService);
|
||||
this.discoveryService.servletControls = this.wunderGroundUpdateReceiverServlet;
|
||||
if (this.discoveryService.isBackgroundDiscoveryEnabled()) {
|
||||
this.wunderGroundUpdateReceiverServlet.activate();
|
||||
}
|
||||
this.wunderGroundUpdateReceiverServlet = wunderGroundUpdateReceiverServlet;
|
||||
this.discoveryService.servletControls = wunderGroundUpdateReceiverServlet;
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -82,8 +79,7 @@ public class WundergroundUpdateReceiverHandlerFactory extends BaseThingHandlerFa
|
||||
|
||||
@Override
|
||||
protected void deactivate(ComponentContext componentContext) {
|
||||
this.wunderGroundUpdateReceiverServlet.deactivate();
|
||||
this.wunderGroundUpdateReceiverServlet.dispose();
|
||||
this.wunderGroundUpdateReceiverServlet.disable();
|
||||
super.deactivate(componentContext);
|
||||
}
|
||||
}
|
||||
|
@ -20,25 +20,26 @@ import java.io.IOException;
|
||||
import java.io.PrintWriter;
|
||||
import java.time.Instant;
|
||||
import java.util.Collections;
|
||||
import java.util.Dictionary;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Hashtable;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import javax.servlet.ServletException;
|
||||
import javax.servlet.Servlet;
|
||||
import javax.servlet.http.HttpServlet;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.openhab.core.io.http.servlet.BaseOpenHABServlet;
|
||||
import org.osgi.service.http.HttpContext;
|
||||
import org.osgi.service.http.HttpService;
|
||||
import org.osgi.service.http.NamespaceException;
|
||||
import org.osgi.service.component.annotations.Activate;
|
||||
import org.osgi.service.component.annotations.Component;
|
||||
import org.osgi.service.component.annotations.Deactivate;
|
||||
import org.osgi.service.component.annotations.Reference;
|
||||
import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletName;
|
||||
import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletPattern;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -49,7 +50,10 @@ import org.slf4j.LoggerFactory;
|
||||
* @author Daniel Demus - Initial contribution
|
||||
*/
|
||||
@NonNullByDefault
|
||||
public class WundergroundUpdateReceiverServlet extends BaseOpenHABServlet
|
||||
@HttpWhiteboardServletName(WundergroundUpdateReceiverServlet.SERVLET_URL)
|
||||
@HttpWhiteboardServletPattern(WundergroundUpdateReceiverServlet.SERVLET_URL)
|
||||
@Component(immediate = true, service = { Servlet.class, WundergroundUpdateReceiverServlet.class })
|
||||
public class WundergroundUpdateReceiverServlet extends HttpServlet
|
||||
implements WundergroundUpdateReceiverServletControls {
|
||||
|
||||
public static final String SERVLET_URL = "/weatherstation/updateweatherstation.php";
|
||||
@ -65,10 +69,12 @@ public class WundergroundUpdateReceiverServlet extends BaseOpenHABServlet
|
||||
private boolean active = false;
|
||||
private String errorDetail = "";
|
||||
|
||||
public WundergroundUpdateReceiverServlet(HttpService httpService,
|
||||
WundergroundUpdateReceiverDiscoveryService discoveryService) {
|
||||
super(httpService);
|
||||
@Activate
|
||||
public WundergroundUpdateReceiverServlet(
|
||||
final @Reference WundergroundUpdateReceiverDiscoveryService discoveryService) {
|
||||
this.discoveryService = discoveryService;
|
||||
errorDetail = "";
|
||||
active = discoveryService.isBackgroundDiscoveryEnabled();
|
||||
}
|
||||
|
||||
public boolean isActive() {
|
||||
@ -87,10 +93,6 @@ public class WundergroundUpdateReceiverServlet extends BaseOpenHABServlet
|
||||
return this.handlers.keySet();
|
||||
}
|
||||
|
||||
public void activate() {
|
||||
activate(SERVLET_URL, httpService.createDefaultHttpContext());
|
||||
}
|
||||
|
||||
public void addHandler(WundergroundUpdateReceiverHandler handler) {
|
||||
synchronized (this.handlers) {
|
||||
if (this.handlers.containsKey(handler.getStationId())) {
|
||||
@ -102,7 +104,7 @@ public class WundergroundUpdateReceiverServlet extends BaseOpenHABServlet
|
||||
this.handlers.put(handler.getStationId(), handler);
|
||||
errorDetail = "";
|
||||
if (!isActive()) {
|
||||
activate();
|
||||
enable();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -114,23 +116,21 @@ public class WundergroundUpdateReceiverServlet extends BaseOpenHABServlet
|
||||
this.handlers.remove(stationId);
|
||||
}
|
||||
if (this.handlers.isEmpty() && !this.discoveryService.isBackgroundDiscoveryEnabled()) {
|
||||
deactivate();
|
||||
disable();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void deactivate() {
|
||||
synchronized (LOCK) {
|
||||
logger.debug("Stopping servlet {} at {}", getClass().getSimpleName(), SERVLET_URL);
|
||||
try {
|
||||
super.deactivate(SERVLET_URL);
|
||||
} catch (IllegalArgumentException ignored) {
|
||||
// SERVLET_URL is already unregistered
|
||||
@Override
|
||||
public void enable() {
|
||||
active = true;
|
||||
}
|
||||
|
||||
@Deactivate
|
||||
public void disable() {
|
||||
errorDetail = "";
|
||||
active = false;
|
||||
}
|
||||
}
|
||||
|
||||
public void handlerConfigUpdated(WundergroundUpdateReceiverHandler handler) {
|
||||
synchronized (this.handlers) {
|
||||
@ -150,28 +150,7 @@ public class WundergroundUpdateReceiverServlet extends BaseOpenHABServlet
|
||||
synchronized (this.handlers) {
|
||||
Set<String> stationIds = new HashSet<>(getStationIds());
|
||||
stationIds.forEach(this::removeHandler);
|
||||
deactivate();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void activate(String alias, HttpContext httpContext) {
|
||||
synchronized (LOCK) {
|
||||
try {
|
||||
logger.debug("Starting servlet {} at {}", getClass().getSimpleName(), alias);
|
||||
Dictionary<String, String> props = new Hashtable<>(1, 10);
|
||||
httpService.registerServlet(alias, this, props, httpContext);
|
||||
errorDetail = "";
|
||||
active = true;
|
||||
} catch (NamespaceException e) {
|
||||
active = false;
|
||||
errorDetail = "Servlet couldn't be registered - alias " + alias + " already in use";
|
||||
logger.warn("Error during servlet registration - alias {} already in use", alias, e);
|
||||
} catch (ServletException e) {
|
||||
active = false;
|
||||
errorDetail = "Servlet couldn't be registered - " + e.getMessage();
|
||||
logger.warn("Error during servlet registration", e);
|
||||
}
|
||||
disable();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -20,9 +20,9 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
@NonNullByDefault
|
||||
public interface WundergroundUpdateReceiverServletControls {
|
||||
|
||||
void activate();
|
||||
void enable();
|
||||
|
||||
void deactivate();
|
||||
void disable();
|
||||
|
||||
boolean isActive();
|
||||
}
|
||||
|
@ -89,7 +89,7 @@ class WundergroundUpdateReceiverDiscoveryServiceTest {
|
||||
WundergroundUpdateReceiverDiscoveryService discoveryService = new WundergroundUpdateReceiverDiscoveryService(
|
||||
true);
|
||||
HttpService httpService = mock(HttpService.class);
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(httpService, discoveryService);
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(discoveryService);
|
||||
discoveryService.addUnhandledStationId(REQ_STATION_ID, sut.normalizeParameterMap(req.getParameterMap()));
|
||||
Thing thing = ThingBuilder.create(SUPPORTED_THING_TYPES_UIDS.stream().findFirst().get(), TEST_THING_UID)
|
||||
.withConfiguration(new Configuration(Map.of(REPRESENTATION_PROPERTY, REQ_STATION_ID)))
|
||||
@ -138,15 +138,13 @@ class WundergroundUpdateReceiverDiscoveryServiceTest {
|
||||
+ "action=updateraw&" + "realtime=1&" + "rtfreq=5";
|
||||
WundergroundUpdateReceiverDiscoveryService discoveryService = mock(
|
||||
WundergroundUpdateReceiverDiscoveryService.class);
|
||||
HttpService httpService = mock(HttpService.class);
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(httpService, discoveryService);
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(discoveryService);
|
||||
WundergroundUpdateReceiverHandler handler = mock(WundergroundUpdateReceiverHandler.class);
|
||||
when(handler.getStationId()).thenReturn(STATION_ID_1);
|
||||
sut.addHandler(handler);
|
||||
when(discoveryService.isBackgroundDiscoveryEnabled()).thenReturn(false);
|
||||
|
||||
// Then
|
||||
verify(httpService).registerServlet(eq(WundergroundUpdateReceiverServlet.SERVLET_URL), eq(sut), any(), any());
|
||||
assertThat(sut.isActive(), is(true));
|
||||
|
||||
HttpChannel httpChannel = mock(HttpChannel.class);
|
||||
@ -182,7 +180,7 @@ class WundergroundUpdateReceiverDiscoveryServiceTest {
|
||||
WundergroundUpdateReceiverDiscoveryService discoveryService = new WundergroundUpdateReceiverDiscoveryService(
|
||||
false);
|
||||
HttpService httpService = mock(HttpService.class);
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(httpService, discoveryService);
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(discoveryService);
|
||||
discoveryService.addUnhandledStationId(REQ_STATION_ID, sut.normalizeParameterMap(req.getParameterMap()));
|
||||
Thing thing = ThingBuilder.create(SUPPORTED_THING_TYPES_UIDS.stream().findFirst().get(), TEST_THING_UID)
|
||||
.withConfiguration(new Configuration(Map.of(REPRESENTATION_PROPERTY, REQ_STATION_ID)))
|
||||
@ -196,7 +194,7 @@ class WundergroundUpdateReceiverDiscoveryServiceTest {
|
||||
sut.addHandler(handler);
|
||||
|
||||
// When
|
||||
sut.activate();
|
||||
sut.enable();
|
||||
|
||||
// Then
|
||||
assertThat(sut.isActive(), is(true));
|
||||
@ -228,7 +226,7 @@ class WundergroundUpdateReceiverDiscoveryServiceTest {
|
||||
WundergroundUpdateReceiverDiscoveryService discoveryService = new WundergroundUpdateReceiverDiscoveryService(
|
||||
true);
|
||||
HttpService httpService = mock(HttpService.class);
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(httpService, discoveryService);
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(discoveryService);
|
||||
discoveryService.addUnhandledStationId(REQ_STATION_ID, sut.normalizeParameterMap(req1.getParameterMap()));
|
||||
Thing thing = ThingBuilder.create(SUPPORTED_THING_TYPES_UIDS.stream().findFirst().get(), TEST_THING_UID)
|
||||
.withConfiguration(new Configuration(Map.of(REPRESENTATION_PROPERTY, REQ_STATION_ID)))
|
||||
@ -261,7 +259,7 @@ class WundergroundUpdateReceiverDiscoveryServiceTest {
|
||||
HttpVersion.HTTP_1_1, new HttpFields());
|
||||
Request req2 = new Request(httpChannel, null);
|
||||
req2.setMetaData(request);
|
||||
sut.activate();
|
||||
sut.enable();
|
||||
|
||||
// Then
|
||||
assertThat(sut.isActive(), is(true));
|
||||
@ -295,7 +293,7 @@ class WundergroundUpdateReceiverDiscoveryServiceTest {
|
||||
WundergroundUpdateReceiverDiscoveryService discoveryService = new WundergroundUpdateReceiverDiscoveryService(
|
||||
true);
|
||||
HttpService httpService = mock(HttpService.class);
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(httpService, discoveryService);
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(discoveryService);
|
||||
discoveryService.addUnhandledStationId(REQ_STATION_ID, sut.normalizeParameterMap(req1.getParameterMap()));
|
||||
Thing thing = ThingBuilder.create(SUPPORTED_THING_TYPES_UIDS.stream().findFirst().get(), TEST_THING_UID)
|
||||
.withConfiguration(new Configuration(Map.of(REPRESENTATION_PROPERTY, REQ_STATION_ID)))
|
||||
@ -328,7 +326,7 @@ class WundergroundUpdateReceiverDiscoveryServiceTest {
|
||||
HttpVersion.HTTP_1_1, new HttpFields());
|
||||
Request req2 = new Request(httpChannel, null);
|
||||
req2.setMetaData(request);
|
||||
sut.activate();
|
||||
sut.enable();
|
||||
|
||||
// Then
|
||||
assertThat(sut.isActive(), is(true));
|
||||
@ -359,7 +357,7 @@ class WundergroundUpdateReceiverDiscoveryServiceTest {
|
||||
WundergroundUpdateReceiverDiscoveryService discoveryService = new WundergroundUpdateReceiverDiscoveryService(
|
||||
true);
|
||||
HttpService httpService = mock(HttpService.class);
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(httpService, discoveryService);
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(discoveryService);
|
||||
discoveryService.addUnhandledStationId(REQ_STATION_ID, sut.normalizeParameterMap(req1.getParameterMap()));
|
||||
Thing thing = ThingBuilder.create(SUPPORTED_THING_TYPES_UIDS.stream().findFirst().get(), TEST_THING_UID)
|
||||
.withConfiguration(new Configuration(Map.of(REPRESENTATION_PROPERTY, REQ_STATION_ID)))
|
||||
@ -403,7 +401,7 @@ class WundergroundUpdateReceiverDiscoveryServiceTest {
|
||||
HttpVersion.HTTP_1_1, new HttpFields());
|
||||
Request req2 = new Request(httpChannel, null);
|
||||
req2.setMetaData(request);
|
||||
sut.activate();
|
||||
sut.enable();
|
||||
|
||||
// Then
|
||||
assertThat(sut.isActive(), is(true));
|
||||
|
@ -19,7 +19,6 @@ import static org.mockito.Mockito.any;
|
||||
import static org.mockito.Mockito.eq;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
import static org.mockito.MockitoAnnotations.openMocks;
|
||||
@ -75,7 +74,6 @@ import org.openhab.core.thing.binding.builder.ThingBuilder;
|
||||
import org.openhab.core.thing.type.ChannelKind;
|
||||
import org.openhab.core.thing.type.ChannelTypeBuilder;
|
||||
import org.openhab.core.thing.type.ChannelTypeRegistry;
|
||||
import org.osgi.service.http.HttpService;
|
||||
import org.osgi.service.http.NamespaceException;
|
||||
|
||||
/**
|
||||
@ -90,7 +88,6 @@ class WundergroundUpdateReceiverServletTest {
|
||||
private static final ThingUID TEST_THING_UID = new ThingUID(
|
||||
WundergroundUpdateReceiverBindingConstants.THING_TYPE_UPDATE_RECEIVER, "test-receiver");
|
||||
|
||||
private @Mock HttpService httpService;
|
||||
private @Mock ChannelTypeRegistry channelTypeRegistry;
|
||||
private @Mock WundergroundUpdateReceiverDiscoveryService discoveryService;
|
||||
private @Mock ManagedThingProvider managedThingProvider;
|
||||
@ -103,7 +100,7 @@ class WundergroundUpdateReceiverServletTest {
|
||||
@Test
|
||||
void theServletIsActiveAfterTheFirstHandlerIsAdded() throws ServletException, NamespaceException {
|
||||
// Given
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(httpService, discoveryService);
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(discoveryService);
|
||||
WundergroundUpdateReceiverHandler handler = mock(WundergroundUpdateReceiverHandler.class);
|
||||
when(handler.getStationId()).thenReturn(STATION_ID_1);
|
||||
|
||||
@ -111,7 +108,6 @@ class WundergroundUpdateReceiverServletTest {
|
||||
sut.addHandler(handler);
|
||||
|
||||
// Then
|
||||
verify(httpService).registerServlet(eq(WundergroundUpdateReceiverServlet.SERVLET_URL), eq(sut), any(), any());
|
||||
assertThat(sut.isActive(), is(true));
|
||||
}
|
||||
|
||||
@ -119,7 +115,7 @@ class WundergroundUpdateReceiverServletTest {
|
||||
void theServletIsInactiveAfterTheLastHandlerIsRemovedAndBackgroundDiscoveryIsDisabled()
|
||||
throws ServletException, NamespaceException {
|
||||
// Given
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(httpService, discoveryService);
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(discoveryService);
|
||||
WundergroundUpdateReceiverHandler handler = mock(WundergroundUpdateReceiverHandler.class);
|
||||
when(handler.getStationId()).thenReturn(STATION_ID_1);
|
||||
when(discoveryService.isBackgroundDiscoveryEnabled()).thenReturn(false);
|
||||
@ -128,14 +124,12 @@ class WundergroundUpdateReceiverServletTest {
|
||||
sut.addHandler(handler);
|
||||
|
||||
// Then
|
||||
verify(httpService).registerServlet(eq(WundergroundUpdateReceiverServlet.SERVLET_URL), eq(sut), any(), any());
|
||||
assertThat(sut.isActive(), is(true));
|
||||
|
||||
// When
|
||||
sut.removeHandler(handler.getStationId());
|
||||
|
||||
// Then
|
||||
verify(httpService).unregister(WundergroundUpdateReceiverServlet.SERVLET_URL);
|
||||
assertThat(sut.isActive(), is(false));
|
||||
}
|
||||
|
||||
@ -143,7 +137,7 @@ class WundergroundUpdateReceiverServletTest {
|
||||
void theServletIsActiveAfterTheLastHandlerIsRemovedButBackgroundDiscoveryIsEnabled()
|
||||
throws ServletException, NamespaceException {
|
||||
// Given
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(httpService, discoveryService);
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(discoveryService);
|
||||
WundergroundUpdateReceiverHandler handler = mock(WundergroundUpdateReceiverHandler.class);
|
||||
when(handler.getStationId()).thenReturn(STATION_ID_1);
|
||||
when(discoveryService.isBackgroundDiscoveryEnabled()).thenReturn(true);
|
||||
@ -152,21 +146,19 @@ class WundergroundUpdateReceiverServletTest {
|
||||
sut.addHandler(handler);
|
||||
|
||||
// Then
|
||||
verify(httpService).registerServlet(eq(WundergroundUpdateReceiverServlet.SERVLET_URL), eq(sut), any(), any());
|
||||
assertThat(sut.isActive(), is(true));
|
||||
|
||||
// When
|
||||
sut.removeHandler(handler.getStationId());
|
||||
|
||||
// Then
|
||||
verify(httpService, never()).unregister(WundergroundUpdateReceiverServlet.SERVLET_URL);
|
||||
assertThat(sut.isActive(), is(true));
|
||||
}
|
||||
|
||||
@Test
|
||||
void onDisposeAllHandlersAreRemovedAndServletIsInactive() throws ServletException, NamespaceException {
|
||||
// Given
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(httpService, discoveryService);
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(discoveryService);
|
||||
WundergroundUpdateReceiverHandler handler1 = mock(WundergroundUpdateReceiverHandler.class);
|
||||
when(handler1.getStationId()).thenReturn(STATION_ID_1);
|
||||
WundergroundUpdateReceiverHandler handler2 = mock(WundergroundUpdateReceiverHandler.class);
|
||||
@ -177,14 +169,12 @@ class WundergroundUpdateReceiverServletTest {
|
||||
sut.addHandler(handler2);
|
||||
|
||||
// Then
|
||||
verify(httpService).registerServlet(eq(WundergroundUpdateReceiverServlet.SERVLET_URL), eq(sut), any(), any());
|
||||
assertThat(sut.isActive(), is(true));
|
||||
|
||||
// When
|
||||
sut.dispose();
|
||||
|
||||
// Then
|
||||
verify(httpService, times(2)).unregister(WundergroundUpdateReceiverServlet.SERVLET_URL);
|
||||
assertThat(sut.isActive(), is(false));
|
||||
}
|
||||
|
||||
@ -192,7 +182,7 @@ class WundergroundUpdateReceiverServletTest {
|
||||
void OnDisposeAllHandlersAreRemovedAndServletIsInactiveEvenThoughBackgroundDiscoveryIsEnabled()
|
||||
throws ServletException, NamespaceException {
|
||||
// Given
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(httpService, discoveryService);
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(discoveryService);
|
||||
WundergroundUpdateReceiverHandler handler1 = mock(WundergroundUpdateReceiverHandler.class);
|
||||
when(handler1.getStationId()).thenReturn(STATION_ID_1);
|
||||
WundergroundUpdateReceiverHandler handler2 = mock(WundergroundUpdateReceiverHandler.class);
|
||||
@ -204,14 +194,12 @@ class WundergroundUpdateReceiverServletTest {
|
||||
sut.addHandler(handler2);
|
||||
|
||||
// Then
|
||||
verify(httpService).registerServlet(eq(WundergroundUpdateReceiverServlet.SERVLET_URL), eq(sut), any(), any());
|
||||
assertThat(sut.isActive(), is(true));
|
||||
|
||||
// When
|
||||
sut.dispose();
|
||||
|
||||
// Then
|
||||
verify(httpService).unregister(WundergroundUpdateReceiverServlet.SERVLET_URL);
|
||||
assertThat(sut.isActive(), is(false));
|
||||
}
|
||||
|
||||
@ -231,7 +219,7 @@ class WundergroundUpdateReceiverServletTest {
|
||||
.thenReturn(ChannelTypeBuilder.state(LAST_QUERY_STATE_CHANNELTYPEUID, "Label", "String").build());
|
||||
when(this.channelTypeRegistry.getChannelType(LAST_QUERY_TRIGGER_CHANNELTYPEUID))
|
||||
.thenReturn(ChannelTypeBuilder.trigger(LAST_QUERY_TRIGGER_CHANNELTYPEUID, "Label").build());
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(httpService, discoveryService);
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(discoveryService);
|
||||
WundergroundUpdateReceiverHandler handler = new WundergroundUpdateReceiverHandler(thing, sut, discoveryService,
|
||||
new WundergroundUpdateReceiverUnknownChannelTypeProvider(), channelTypeRegistry, managedThingProvider);
|
||||
ThingHandlerCallback mockCallback = mock(ThingHandlerCallback.class);
|
||||
@ -241,7 +229,6 @@ class WundergroundUpdateReceiverServletTest {
|
||||
handler.initialize();
|
||||
|
||||
// Then
|
||||
verify(httpService).registerServlet(eq(WundergroundUpdateReceiverServlet.SERVLET_URL), eq(sut), any(), any());
|
||||
assertThat(sut.isActive(), is(true));
|
||||
assertThat(sut.getStationIds(), hasItems(STATION_ID_1));
|
||||
|
||||
@ -263,7 +250,7 @@ class WundergroundUpdateReceiverServletTest {
|
||||
ThingUID testThingUID = new ThingUID(WundergroundUpdateReceiverBindingConstants.THING_TYPE_UPDATE_RECEIVER,
|
||||
"test-receiver");
|
||||
final String queryString = "ID=dfggger&PASSWORD=XXXXXX&tempf=26.1&humidity=74&dewptf=18.9&windchillf=26.1&winddir=14&windspeedmph=1.34&windgustmph=2.46&rainin=0.00&dailyrainin=0.00&weeklyrainin=0.00&monthlyrainin=0.08&yearlyrainin=3.06&solarradiation=42.24&UV=1&indoortempf=69.3&indoorhumidity=32&baromin=30.39&AqNOX=21&lowbatt=1&dateutc=2021-02-07%2014:04:03&softwaretype=WH2600%20V2.2.8&action=updateraw&realtime=1&rtfreq=5";
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(httpService, discoveryService);
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(discoveryService);
|
||||
List<Channel> channels = List.of(
|
||||
ChannelBuilder
|
||||
.create(new ChannelUID(testThingUID, METADATA_GROUP,
|
||||
@ -407,7 +394,7 @@ class WundergroundUpdateReceiverServletTest {
|
||||
ThingUID testThingUID = new ThingUID(WundergroundUpdateReceiverBindingConstants.THING_TYPE_UPDATE_RECEIVER,
|
||||
"test-receiver");
|
||||
final String queryString = "ID=dfggger&PASSWORD=XXXXXX&temp1f=26.1&humidity=74&temp2f=25.1&lowbatt=1&soilmoisture1=78&soilmoisture2=73&dateutc=2021-02-07%2014:04:03&softwaretype=WH2600%20V2.2.8&action=updateraw&realtime=1&rtfreq=5";
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(httpService, discoveryService);
|
||||
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(discoveryService);
|
||||
List<Channel> channels = List.of(
|
||||
ChannelBuilder
|
||||
.create(new ChannelUID(testThingUID, METADATA_GROUP,
|
||||
|
@ -194,7 +194,7 @@ public class UpnpServer extends HttpServlet implements Consumer<HueEmulationConf
|
||||
|
||||
try {
|
||||
httpService.unregister(DISCOVERY_FILE);
|
||||
} catch (IllegalArgumentException ignore) {
|
||||
} catch (RuntimeException ignore) {
|
||||
}
|
||||
|
||||
try {
|
||||
|
@ -32,6 +32,11 @@
|
||||
<artifactId>derby</artifactId>
|
||||
<version>10.14.2.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.el</groupId>
|
||||
<artifactId>el-api</artifactId>
|
||||
<version>2.2</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
@ -16,7 +16,6 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
|
||||
# done
|
||||
#
|
||||
-runbundles: \
|
||||
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
||||
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
||||
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
||||
org.hamcrest;version='[2.2.0,2.2.1)',\
|
||||
@ -39,17 +38,8 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
|
||||
junit-platform-commons;version='[1.8.1,1.8.2)',\
|
||||
junit-platform-engine;version='[1.8.1,1.8.2)',\
|
||||
junit-platform-launcher;version='[1.8.1,1.8.2)',\
|
||||
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
|
||||
org.osgi.util.function;version='[1.2.0,1.2.1)',\
|
||||
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
|
||||
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
|
||||
ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
|
||||
ch.qos.logback.core;version='[1.2.11,1.2.12)',\
|
||||
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
|
||||
@ -69,6 +59,17 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
|
||||
org.threeten.extra;version='[1.5.0,1.5.1)',\
|
||||
com.sun.jna;version='[5.12.1,5.12.2)',\
|
||||
io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
|
||||
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
|
||||
xstream;version='[1.4.19,1.4.20)'
|
||||
xstream;version='[1.4.19,1.4.20)',\
|
||||
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.apache.felix.scr;version='[2.2.4,2.2.5)',\
|
||||
org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
|
||||
org.osgi.service.component;version='[1.5.0,1.5.1)'
|
||||
|
@ -35,13 +35,9 @@ Fragment-Host: org.openhab.binding.astro
|
||||
net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
|
||||
org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
|
||||
org.objenesis;version='[3.2.0,3.2.1)',\
|
||||
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
|
||||
org.osgi.util.function;version='[1.2.0,1.2.1)',\
|
||||
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
|
||||
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
|
||||
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
|
||||
org.openhab.binding.astro;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.binding.astro.tests;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.core;version='[4.0.0,4.0.1)',\
|
||||
@ -53,4 +49,9 @@ Fragment-Host: org.openhab.binding.astro
|
||||
com.google.gson;version='[2.9.1,2.9.2)',\
|
||||
io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
|
||||
com.sun.jna;version='[5.12.1,5.12.2)',\
|
||||
xstream;version='[1.4.19,1.4.20)'
|
||||
xstream;version='[1.4.19,1.4.20)',\
|
||||
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
|
||||
org.apache.felix.scr;version='[2.2.4,2.2.5)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
|
||||
org.osgi.service.component;version='[1.5.0,1.5.1)'
|
||||
|
@ -14,7 +14,6 @@ Fragment-Host: org.openhab.binding.avmfritz
|
||||
#
|
||||
-runbundles: \
|
||||
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
||||
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
||||
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
||||
org.hamcrest;version='[2.2.0,2.2.1)',\
|
||||
org.opentest4j;version='[1.2.0,1.2.1)',\
|
||||
@ -22,8 +21,6 @@ Fragment-Host: org.openhab.binding.avmfritz
|
||||
com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
|
||||
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
|
||||
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
|
||||
org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
|
||||
org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
|
||||
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
|
||||
jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
|
||||
javax.measure.unit-api;version='[2.1.2,2.1.3)',\
|
||||
@ -42,30 +39,12 @@ Fragment-Host: org.openhab.binding.avmfritz
|
||||
net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
|
||||
org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
|
||||
org.objenesis;version='[3.2.0,3.2.1)',\
|
||||
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
|
||||
org.osgi.util.function;version='[1.2.0,1.2.1)',\
|
||||
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
|
||||
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
|
||||
org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
|
||||
org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
|
||||
org.eclipse.jetty.client;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.websocket.api;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.websocket.client;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.websocket.common;version='[9.4.46,9.4.47)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
|
||||
org.ops4j.pax.web.pax-web-api;version='[7.3.25,7.3.26)',\
|
||||
org.jupnp;version='[2.6.1,2.6.2)',\
|
||||
ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
|
||||
ch.qos.logback.core;version='[1.2.11,1.2.12)',\
|
||||
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
|
||||
org.openhab.binding.avmfritz;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.binding.avmfritz.tests;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.core;version='[4.0.0,4.0.1)',\
|
||||
@ -77,7 +56,24 @@ Fragment-Host: org.openhab.binding.avmfritz
|
||||
org.openhab.core.test;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
|
||||
com.google.gson;version='[2.9.1,2.9.2)',\
|
||||
org.objectweb.asm;version='[9.4.0,9.4.1)',\
|
||||
io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
|
||||
com.sun.jna;version='[5.12.1,5.12.2)',\
|
||||
xstream;version='[1.4.19,1.4.20)'
|
||||
xstream;version='[1.4.19,1.4.20)',\
|
||||
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.apache.felix.scr;version='[2.2.4,2.2.5)',\
|
||||
org.eclipse.jetty.client;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.websocket.api;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.websocket.client;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.websocket.common;version='[9.4.50,9.4.51)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
|
||||
org.ops4j.pax.web.pax-web-api;version='[8.0.15,8.0.16)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
|
||||
org.osgi.service.component;version='[1.5.0,1.5.1)'
|
||||
|
@ -18,15 +18,12 @@ Fragment-Host: org.openhab.binding.feed
|
||||
-runbundles: \
|
||||
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
||||
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
||||
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
||||
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)',\
|
||||
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
|
||||
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
|
||||
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
|
||||
org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
|
||||
org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
|
||||
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
|
||||
jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
|
||||
javax.measure.unit-api;version='[2.1.2,2.1.3)',\
|
||||
@ -41,26 +38,9 @@ Fragment-Host: org.openhab.binding.feed
|
||||
junit-platform-commons;version='[1.8.1,1.8.2)',\
|
||||
junit-platform-engine;version='[1.8.1,1.8.2)',\
|
||||
junit-platform-launcher;version='[1.8.1,1.8.2)',\
|
||||
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
|
||||
org.osgi.util.function;version='[1.2.0,1.2.1)',\
|
||||
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
|
||||
xstream;version='[1.4.19,1.4.20)',\
|
||||
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
|
||||
org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
|
||||
org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
|
||||
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.xml;version='[9.4.46,9.4.47)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
|
||||
org.ops4j.pax.web.pax-web-api;version='[7.3.25,7.3.26)',\
|
||||
org.ops4j.pax.web.pax-web-jetty;version='[7.3.25,7.3.26)',\
|
||||
org.ops4j.pax.web.pax-web-runtime;version='[7.3.25,7.3.26)',\
|
||||
org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)',\
|
||||
ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
|
||||
ch.qos.logback.core;version='[1.2.11,1.2.12)',\
|
||||
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
|
||||
@ -72,6 +52,24 @@ Fragment-Host: org.openhab.binding.feed
|
||||
org.openhab.core.test;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
|
||||
com.google.gson;version='[2.9.1,2.9.2)',\
|
||||
org.objectweb.asm;version='[9.4.0,9.4.1)',\
|
||||
io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
|
||||
com.sun.jna;version='[5.12.1,5.12.2)'
|
||||
com.sun.jna;version='[5.12.1,5.12.2)',\
|
||||
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.apache.felix.scr;version='[2.2.4,2.2.5)',\
|
||||
org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.jaas;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.xml;version='[9.4.50,9.4.51)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
|
||||
org.ops4j.pax.web.pax-web-api;version='[8.0.15,8.0.16)',\
|
||||
org.ops4j.pax.web.pax-web-jetty;version='[8.0.15,8.0.16)',\
|
||||
org.ops4j.pax.web.pax-web-runtime;version='[8.0.15,8.0.16)',\
|
||||
org.ops4j.pax.web.pax-web-spi;version='[8.0.15,8.0.16)',\
|
||||
org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.15,8.0.16)',\
|
||||
org.osgi.service.component;version='[1.5.0,1.5.1)'
|
||||
|
@ -15,7 +15,6 @@ Fragment-Host: org.openhab.binding.hue
|
||||
# done
|
||||
#
|
||||
-runbundles: \
|
||||
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
||||
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
||||
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
||||
org.hamcrest;version='[2.2.0,2.2.1)',\
|
||||
@ -38,23 +37,9 @@ Fragment-Host: org.openhab.binding.hue
|
||||
junit-platform-commons;version='[1.8.1,1.8.2)',\
|
||||
junit-platform-engine;version='[1.8.1,1.8.2)',\
|
||||
junit-platform-launcher;version='[1.8.1,1.8.2)',\
|
||||
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
|
||||
org.osgi.util.function;version='[1.2.0,1.2.1)',\
|
||||
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
|
||||
xstream;version='[1.4.19,1.4.20)',\
|
||||
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
|
||||
org.eclipse.jetty.client;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.websocket.api;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.websocket.client;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.websocket.common;version='[9.4.46,9.4.47)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
|
||||
org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)',\
|
||||
javax.jmdns;version='[3.5.8,3.5.9)',\
|
||||
net.bytebuddy.byte-buddy;version='[1.12.1,1.12.2)',\
|
||||
@ -64,7 +49,6 @@ Fragment-Host: org.openhab.binding.hue
|
||||
ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
|
||||
ch.qos.logback.core;version='[1.2.11,1.2.12)',\
|
||||
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
|
||||
org.openhab.binding.hue;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.binding.hue.tests;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.core;version='[4.0.0,4.0.1)',\
|
||||
@ -78,4 +62,21 @@ Fragment-Host: org.openhab.binding.hue
|
||||
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
|
||||
com.google.gson;version='[2.9.1,2.9.2)',\
|
||||
io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
|
||||
com.sun.jna;version='[5.12.1,5.12.2)'
|
||||
com.sun.jna;version='[5.12.1,5.12.2)',\
|
||||
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.apache.felix.scr;version='[2.2.4,2.2.5)',\
|
||||
org.eclipse.jetty.client;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.websocket.api;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.websocket.client;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.websocket.common;version='[9.4.50,9.4.51)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
|
||||
org.osgi.service.component;version='[1.5.0,1.5.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)'
|
||||
|
@ -14,7 +14,6 @@ Fragment-Host: org.openhab.binding.max
|
||||
# done
|
||||
#
|
||||
-runbundles: \
|
||||
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
||||
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
||||
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
||||
org.hamcrest;version='[2.2.0,2.2.1)',\
|
||||
@ -38,23 +37,12 @@ Fragment-Host: org.openhab.binding.max
|
||||
junit-platform-commons;version='[1.8.1,1.8.2)',\
|
||||
junit-platform-engine;version='[1.8.1,1.8.2)',\
|
||||
junit-platform-launcher;version='[1.8.1,1.8.2)',\
|
||||
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
|
||||
org.osgi.util.function;version='[1.2.0,1.2.1)',\
|
||||
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
|
||||
xstream;version='[1.4.19,1.4.20)',\
|
||||
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
|
||||
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
|
||||
ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
|
||||
ch.qos.logback.core;version='[1.2.11,1.2.12)',\
|
||||
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
|
||||
org.openhab.binding.max;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.binding.max.tests;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.core;version='[4.0.0,4.0.1)',\
|
||||
@ -65,4 +53,17 @@ Fragment-Host: org.openhab.binding.max
|
||||
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
|
||||
com.google.gson;version='[2.9.1,2.9.2)',\
|
||||
io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
|
||||
com.sun.jna;version='[5.12.1,5.12.2)'
|
||||
com.sun.jna;version='[5.12.1,5.12.2)',\
|
||||
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.apache.felix.scr;version='[2.2.4,2.2.5)',\
|
||||
org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
|
||||
org.osgi.service.component;version='[1.5.0,1.5.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)'
|
||||
|
@ -17,14 +17,11 @@ Fragment-Host: org.openhab.binding.mielecloud
|
||||
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
||||
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
||||
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
|
||||
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
||||
com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
|
||||
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
|
||||
org.opentest4j;version='[1.2.0,1.2.1)',\
|
||||
org.hamcrest;version='[2.2.0,2.2.1)',\
|
||||
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
|
||||
org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
|
||||
org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
|
||||
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
|
||||
jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
|
||||
javax.measure.unit-api;version='[2.1.2,2.1.3)',\
|
||||
@ -43,34 +40,12 @@ Fragment-Host: org.openhab.binding.mielecloud
|
||||
net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
|
||||
org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
|
||||
org.objenesis;version='[3.2.0,3.2.1)',\
|
||||
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
|
||||
org.osgi.util.function;version='[1.2.0,1.2.1)',\
|
||||
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
|
||||
xstream;version='[1.4.19,1.4.20)',\
|
||||
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
|
||||
org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
|
||||
org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
|
||||
org.eclipse.jetty.client;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.websocket.api;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.websocket.client;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.websocket.common;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.xml;version='[9.4.46,9.4.47)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
|
||||
org.ops4j.pax.web.pax-web-api;version='[7.3.25,7.3.26)',\
|
||||
org.ops4j.pax.web.pax-web-jetty;version='[7.3.25,7.3.26)',\
|
||||
org.ops4j.pax.web.pax-web-runtime;version='[7.3.25,7.3.26)',\
|
||||
org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)',\
|
||||
ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
|
||||
ch.qos.logback.core;version='[1.2.11,1.2.12)',\
|
||||
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
|
||||
org.openhab.binding.mielecloud;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.binding.mielecloud.tests;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.core;version='[4.0.0,4.0.1)',\
|
||||
@ -82,6 +57,29 @@ Fragment-Host: org.openhab.binding.mielecloud
|
||||
org.openhab.core.test;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
|
||||
com.google.gson;version='[2.9.1,2.9.2)',\
|
||||
org.objectweb.asm;version='[9.4.0,9.4.1)',\
|
||||
io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
|
||||
com.sun.jna;version='[5.12.1,5.12.2)'
|
||||
com.sun.jna;version='[5.12.1,5.12.2)',\
|
||||
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.apache.felix.scr;version='[2.2.4,2.2.5)',\
|
||||
org.eclipse.jetty.client;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.jaas;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.websocket.api;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.websocket.client;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.websocket.common;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.xml;version='[9.4.50,9.4.51)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
|
||||
org.ops4j.pax.web.pax-web-api;version='[8.0.15,8.0.16)',\
|
||||
org.ops4j.pax.web.pax-web-jetty;version='[8.0.15,8.0.16)',\
|
||||
org.ops4j.pax.web.pax-web-runtime;version='[8.0.15,8.0.16)',\
|
||||
org.ops4j.pax.web.pax-web-spi;version='[8.0.15,8.0.16)',\
|
||||
org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.15,8.0.16)',\
|
||||
org.osgi.service.component;version='[1.5.0,1.5.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)'
|
||||
|
@ -17,7 +17,6 @@ Fragment-Host: org.openhab.binding.modbus
|
||||
-runbundles: \
|
||||
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
||||
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
||||
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
||||
nrjavaserial;version='[5.2.1,5.2.2)',\
|
||||
org.hamcrest;version='[2.2.0,2.2.1)',\
|
||||
org.opentest4j;version='[1.2.0,1.2.1)',\
|
||||
@ -45,23 +44,12 @@ Fragment-Host: org.openhab.binding.modbus
|
||||
org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\
|
||||
org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
|
||||
org.objenesis;version='[3.2.0,3.2.1)',\
|
||||
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
|
||||
org.osgi.util.function;version='[1.2.0,1.2.1)',\
|
||||
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
|
||||
xstream;version='[1.4.19,1.4.20)',\
|
||||
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
|
||||
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
|
||||
ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
|
||||
ch.qos.logback.core;version='[1.2.11,1.2.12)',\
|
||||
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
|
||||
org.openhab.binding.modbus;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.binding.modbus.tests;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.core;version='[4.0.0,4.0.1)',\
|
||||
@ -74,4 +62,17 @@ Fragment-Host: org.openhab.binding.modbus
|
||||
org.openhab.core.transform;version='[4.0.0,4.0.1)',\
|
||||
com.google.gson;version='[2.9.1,2.9.2)',\
|
||||
io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
|
||||
com.sun.jna;version='[5.12.1,5.12.2)'
|
||||
com.sun.jna;version='[5.12.1,5.12.2)',\
|
||||
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.apache.felix.scr;version='[2.2.4,2.2.5)',\
|
||||
org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
|
||||
org.osgi.service.component;version='[1.5.0,1.5.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)'
|
||||
|
@ -26,7 +26,6 @@ Import-Package: \
|
||||
# done
|
||||
#
|
||||
-runbundles: \
|
||||
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
||||
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
||||
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
||||
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
|
||||
@ -62,7 +61,6 @@ Import-Package: \
|
||||
net.bytebuddy.byte-buddy;version='[1.12.1,1.12.2)',\
|
||||
net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
|
||||
org.apache.aries.javax.jax.rs-api;version='[1.0.1,1.0.2)',\
|
||||
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
|
||||
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
|
||||
org.jsr-305;version='[3.0.2,3.0.3)',\
|
||||
org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\
|
||||
@ -80,20 +78,9 @@ Import-Package: \
|
||||
com.zaxxer.HikariCP;version='[2.4.7,2.4.8)',\
|
||||
io.dropwizard.metrics.core;version='[3.2.2,3.2.3)',\
|
||||
io.netty.codec-mqtt;version='[4.1.72,4.1.73)',\
|
||||
org.apache.commons.codec;version='[1.10.0,1.10.1)',\
|
||||
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
|
||||
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
|
||||
ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
|
||||
ch.qos.logback.core;version='[1.2.11,1.2.12)',\
|
||||
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
|
||||
org.openhab.binding.mqtt;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.binding.mqtt.generic;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.binding.mqtt.homeassistant;version='[4.0.0,4.0.1)',\
|
||||
@ -109,4 +96,17 @@ Import-Package: \
|
||||
com.google.gson;version='[2.9.1,2.9.2)',\
|
||||
io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
|
||||
com.sun.jna;version='[5.12.1,5.12.2)',\
|
||||
jakarta.ws.rs-api;version='[2.1.6,2.1.7)'
|
||||
org.apache.commons.commons-codec;version='[1.15.0,1.15.1)',\
|
||||
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.apache.felix.scr;version='[2.2.4,2.2.5)',\
|
||||
org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
|
||||
org.osgi.service.component;version='[1.5.0,1.5.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)'
|
||||
|
@ -26,7 +26,6 @@ Import-Package: \
|
||||
# done
|
||||
#
|
||||
-runbundles: \
|
||||
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
||||
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
||||
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
||||
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
|
||||
@ -62,7 +61,6 @@ Import-Package: \
|
||||
net.bytebuddy.byte-buddy;version='[1.12.1,1.12.2)',\
|
||||
net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
|
||||
org.apache.aries.javax.jax.rs-api;version='[1.0.1,1.0.2)',\
|
||||
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
|
||||
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
|
||||
org.jsr-305;version='[3.0.2,3.0.3)',\
|
||||
org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\
|
||||
@ -80,20 +78,9 @@ Import-Package: \
|
||||
com.zaxxer.HikariCP;version='[2.4.7,2.4.8)',\
|
||||
io.dropwizard.metrics.core;version='[3.2.2,3.2.3)',\
|
||||
io.netty.codec-mqtt;version='[4.1.72,4.1.73)',\
|
||||
org.apache.commons.codec;version='[1.10.0,1.10.1)',\
|
||||
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
|
||||
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
|
||||
ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
|
||||
ch.qos.logback.core;version='[1.2.11,1.2.12)',\
|
||||
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
|
||||
org.openhab.binding.mqtt;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.binding.mqtt.generic;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.binding.mqtt.homie;version='[4.0.0,4.0.1)',\
|
||||
@ -109,5 +96,18 @@ Import-Package: \
|
||||
com.google.gson;version='[2.9.1,2.9.2)',\
|
||||
io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
|
||||
com.sun.jna;version='[5.12.1,5.12.2)',\
|
||||
jakarta.ws.rs-api;version='[2.1.6,2.1.7)'
|
||||
org.apache.commons.commons-codec;version='[1.15.0,1.15.1)',\
|
||||
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.apache.felix.scr;version='[2.2.4,2.2.5)',\
|
||||
org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
|
||||
org.osgi.service.component;version='[1.5.0,1.5.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)'
|
||||
|
||||
|
@ -15,7 +15,6 @@ Fragment-Host: org.openhab.binding.nest
|
||||
# done
|
||||
#
|
||||
-runbundles: \
|
||||
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
||||
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
||||
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
||||
org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
|
||||
@ -26,16 +25,11 @@ Fragment-Host: org.openhab.binding.nest
|
||||
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
|
||||
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
|
||||
org.apache.aries.javax.jax.rs-api;version='[1.0.1,1.0.2)',\
|
||||
org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
|
||||
org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
|
||||
jakarta.annotation-api;version='[1.3.5,1.3.6)',\
|
||||
jakarta.xml.soap-api;version='[1.4.2,1.4.3)',\
|
||||
jakarta.xml.ws-api;version='[2.3.3,2.3.4)',\
|
||||
org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\
|
||||
org.apache.aries.spifly.dynamic.bundle;version='[1.3.2,1.3.3)',\
|
||||
org.apache.ws.xmlschema.core;version='[2.2.5,2.2.6)',\
|
||||
org.objectweb.asm.tree.analysis;version='[9.0.0,9.0.1)',\
|
||||
org.objectweb.asm.util;version='[9.0.0,9.0.1)',\
|
||||
stax2-api;version='[4.2.1,4.2.2)',\
|
||||
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
|
||||
jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
|
||||
@ -62,34 +56,13 @@ Fragment-Host: org.openhab.binding.nest
|
||||
org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
|
||||
org.objenesis;version='[3.2.0,3.2.1)',\
|
||||
org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\
|
||||
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
|
||||
org.osgi.util.function;version='[1.2.0,1.2.1)',\
|
||||
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
|
||||
xstream;version='[1.4.19,1.4.20)',\
|
||||
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
|
||||
org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
|
||||
org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
|
||||
org.eclipse.jetty.client;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.websocket.api;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.websocket.client;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.websocket.common;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.xml;version='[9.4.46,9.4.47)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
|
||||
org.ops4j.pax.web.pax-web-api;version='[7.3.25,7.3.26)',\
|
||||
org.ops4j.pax.web.pax-web-jetty;version='[7.3.25,7.3.26)',\
|
||||
org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)',\
|
||||
ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
|
||||
ch.qos.logback.core;version='[1.2.11,1.2.12)',\
|
||||
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
|
||||
org.jsr-305;version='[3.0.2,3.0.3)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
|
||||
org.openhab.binding.nest;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.binding.nest.tests;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.core;version='[4.0.0,4.0.1)',\
|
||||
@ -104,4 +77,33 @@ Fragment-Host: org.openhab.binding.nest
|
||||
org.objectweb.asm;version='[9.4.0,9.4.1)',\
|
||||
io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
|
||||
com.sun.jna;version='[5.12.1,5.12.2)',\
|
||||
com.fasterxml.woodstox.woodstox-core;version='[6.4.0,6.4.1)'
|
||||
com.fasterxml.woodstox.woodstox-core;version='[6.4.0,6.4.1)',\
|
||||
org.apache.aries.spifly.dynamic.bundle;version='[1.3.4,1.3.5)',\
|
||||
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.apache.felix.scr;version='[2.2.4,2.2.5)',\
|
||||
org.eclipse.jetty.client;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.jaas;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.websocket.api;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.websocket.client;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.websocket.common;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.xml;version='[9.4.50,9.4.51)',\
|
||||
org.objectweb.asm.commons;version='[9.2.0,9.2.1)',\
|
||||
org.objectweb.asm.tree;version='[9.2.0,9.2.1)',\
|
||||
org.objectweb.asm.tree.analysis;version='[9.2.0,9.2.1)',\
|
||||
org.objectweb.asm.util;version='[9.2.0,9.2.1)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
|
||||
org.ops4j.pax.web.pax-web-api;version='[8.0.15,8.0.16)',\
|
||||
org.ops4j.pax.web.pax-web-jetty;version='[8.0.15,8.0.16)',\
|
||||
org.ops4j.pax.web.pax-web-runtime;version='[8.0.15,8.0.16)',\
|
||||
org.ops4j.pax.web.pax-web-spi;version='[8.0.15,8.0.16)',\
|
||||
org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.15,8.0.16)',\
|
||||
org.osgi.service.component;version='[1.5.0,1.5.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)'
|
||||
|
@ -14,7 +14,6 @@ Fragment-Host: org.openhab.binding.ntp
|
||||
# done
|
||||
#
|
||||
-runbundles: \
|
||||
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
||||
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
||||
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
||||
org.hamcrest;version='[2.2.0,2.2.1)',\
|
||||
@ -41,23 +40,12 @@ Fragment-Host: org.openhab.binding.ntp
|
||||
net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
|
||||
org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
|
||||
org.objenesis;version='[3.2.0,3.2.1)',\
|
||||
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
|
||||
org.osgi.util.function;version='[1.2.0,1.2.1)',\
|
||||
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
|
||||
xstream;version='[1.4.19,1.4.20)',\
|
||||
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
|
||||
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
|
||||
ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
|
||||
ch.qos.logback.core;version='[1.2.11,1.2.12)',\
|
||||
org.apache.commons.commons-net;version='[3.9.0,3.9.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
|
||||
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
|
||||
org.openhab.binding.ntp;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.binding.ntp.tests;version='[4.0.0,4.0.1)',\
|
||||
@ -69,4 +57,17 @@ Fragment-Host: org.openhab.binding.ntp
|
||||
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
|
||||
com.google.gson;version='[2.9.1,2.9.2)',\
|
||||
io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
|
||||
com.sun.jna;version='[5.12.1,5.12.2)'
|
||||
com.sun.jna;version='[5.12.1,5.12.2)',\
|
||||
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.apache.felix.scr;version='[2.2.4,2.2.5)',\
|
||||
org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
|
||||
org.osgi.service.component;version='[1.5.0,1.5.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)'
|
||||
|
@ -16,7 +16,6 @@ Fragment-Host: org.openhab.binding.systeminfo
|
||||
# done
|
||||
#
|
||||
-runbundles: \
|
||||
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
||||
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
||||
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
||||
org.hamcrest;version='[2.2.0,2.2.1)',\
|
||||
@ -45,24 +44,13 @@ Fragment-Host: org.openhab.binding.systeminfo
|
||||
net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
|
||||
org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
|
||||
org.objenesis;version='[3.2.0,3.2.1)',\
|
||||
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
|
||||
org.osgi.util.function;version='[1.2.0,1.2.1)',\
|
||||
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
|
||||
xstream;version='[1.4.19,1.4.20)',\
|
||||
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
|
||||
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
|
||||
ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
|
||||
ch.qos.logback.core;version='[1.2.11,1.2.12)',\
|
||||
org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\
|
||||
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
|
||||
org.openhab.binding.systeminfo;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.binding.systeminfo.tests;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.core;version='[4.0.0,4.0.1)',\
|
||||
@ -72,4 +60,17 @@ Fragment-Host: org.openhab.binding.systeminfo
|
||||
org.openhab.core.test;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
|
||||
com.google.gson;version='[2.9.1,2.9.2)',\
|
||||
io.methvin.directory-watcher;version='[0.17.1,0.17.2)'
|
||||
io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
|
||||
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.apache.felix.scr;version='[2.2.4,2.2.5)',\
|
||||
org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
|
||||
org.osgi.service.component;version='[1.5.0,1.5.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)'
|
||||
|
@ -17,7 +17,6 @@ Fragment-Host: org.openhab.binding.tradfri
|
||||
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
||||
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.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)',\
|
||||
@ -43,23 +42,12 @@ Fragment-Host: org.openhab.binding.tradfri
|
||||
org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\
|
||||
org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
|
||||
org.objenesis;version='[3.2.0,3.2.1)',\
|
||||
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
|
||||
org.osgi.util.function;version='[1.2.0,1.2.1)',\
|
||||
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
|
||||
xstream;version='[1.4.19,1.4.20)',\
|
||||
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
|
||||
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
|
||||
ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
|
||||
ch.qos.logback.core;version='[1.2.11,1.2.12)',\
|
||||
net.i2p.crypto.eddsa;version='[0.3.0,0.3.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
|
||||
org.eclipse.californium.core;version='[2.7.4,2.7.5)',\
|
||||
org.eclipse.californium.element-connector;version='[2.7.4,2.7.5)',\
|
||||
org.eclipse.californium.scandium;version='[2.7.4,2.7.5)',\
|
||||
@ -76,4 +64,17 @@ Fragment-Host: org.openhab.binding.tradfri
|
||||
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
|
||||
com.google.gson;version='[2.9.1,2.9.2)',\
|
||||
io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
|
||||
com.sun.jna;version='[5.12.1,5.12.2)'
|
||||
com.sun.jna;version='[5.12.1,5.12.2)',\
|
||||
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.apache.felix.scr;version='[2.2.4,2.2.5)',\
|
||||
org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
|
||||
org.osgi.service.component;version='[1.5.0,1.5.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)'
|
||||
|
@ -14,7 +14,6 @@ Fragment-Host: org.openhab.binding.wemo
|
||||
# done
|
||||
#
|
||||
-runbundles: \
|
||||
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
||||
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
||||
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
||||
org.hamcrest;version='[2.2.0,2.2.1)',\
|
||||
@ -23,8 +22,6 @@ Fragment-Host: org.openhab.binding.wemo
|
||||
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
|
||||
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
|
||||
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
|
||||
org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
|
||||
org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
|
||||
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
|
||||
jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
|
||||
javax.measure.unit-api;version='[2.1.2,2.1.3)',\
|
||||
@ -43,31 +40,13 @@ Fragment-Host: org.openhab.binding.wemo
|
||||
net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
|
||||
org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
|
||||
org.objenesis;version='[3.2.0,3.2.1)',\
|
||||
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
|
||||
org.osgi.util.function;version='[1.2.0,1.2.1)',\
|
||||
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
|
||||
xstream;version='[1.4.19,1.4.20)',\
|
||||
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
|
||||
org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
|
||||
org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
|
||||
org.eclipse.jetty.client;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.websocket.api;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.websocket.client;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.websocket.common;version='[9.4.46,9.4.47)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
|
||||
org.ops4j.pax.web.pax-web-api;version='[7.3.25,7.3.26)',\
|
||||
org.jupnp;version='[2.6.1,2.6.2)',\
|
||||
ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
|
||||
ch.qos.logback.core;version='[1.2.11,1.2.12)',\
|
||||
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
|
||||
org.openhab.binding.wemo;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.binding.wemo.tests;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.core;version='[4.0.0,4.0.1)',\
|
||||
@ -80,6 +59,23 @@ Fragment-Host: org.openhab.binding.wemo
|
||||
org.openhab.core.test;version='[4.0.0,4.0.1)',\
|
||||
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
|
||||
com.google.gson;version='[2.9.1,2.9.2)',\
|
||||
org.objectweb.asm;version='[9.4.0,9.4.1)',\
|
||||
io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
|
||||
com.sun.jna;version='[5.12.1,5.12.2)'
|
||||
com.sun.jna;version='[5.12.1,5.12.2)',\
|
||||
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.apache.felix.scr;version='[2.2.4,2.2.5)',\
|
||||
org.eclipse.jetty.client;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.websocket.api;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.websocket.client;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.websocket.common;version='[9.4.50,9.4.51)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
|
||||
org.ops4j.pax.web.pax-web-api;version='[8.0.15,8.0.16)',\
|
||||
org.osgi.service.component;version='[1.5.0,1.5.1)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)'
|
||||
|
@ -16,7 +16,6 @@ Fragment-Host: org.openhab.persistence.mapdb
|
||||
# done
|
||||
#
|
||||
-runbundles: \
|
||||
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
||||
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
||||
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
||||
org.hamcrest;version='[2.2.0,2.2.1)',\
|
||||
@ -39,17 +38,8 @@ Fragment-Host: org.openhab.persistence.mapdb
|
||||
junit-platform-commons;version='[1.8.1,1.8.2)',\
|
||||
junit-platform-engine;version='[1.8.1,1.8.2)',\
|
||||
junit-platform-launcher;version='[1.8.1,1.8.2)',\
|
||||
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
|
||||
org.osgi.util.function;version='[1.2.0,1.2.1)',\
|
||||
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
|
||||
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
|
||||
ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
|
||||
ch.qos.logback.core;version='[1.2.11,1.2.12)',\
|
||||
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
|
||||
@ -62,6 +52,17 @@ Fragment-Host: org.openhab.persistence.mapdb
|
||||
com.google.gson;version='[2.9.1,2.9.2)',\
|
||||
io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
|
||||
com.sun.jna;version='[5.12.1,5.12.2)',\
|
||||
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
|
||||
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
|
||||
xstream;version='[1.4.19,1.4.20)'
|
||||
xstream;version='[1.4.19,1.4.20)',\
|
||||
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.apache.felix.scr;version='[2.2.4,2.2.5)',\
|
||||
org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
|
||||
org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
|
||||
org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
|
||||
org.osgi.service.component;version='[1.5.0,1.5.1)'
|
||||
|
2
pom.xml
2
pom.xml
@ -73,7 +73,7 @@
|
||||
<commons.net.version>3.9.0</commons.net.version>
|
||||
<eea.version>2.2.1</eea.version>
|
||||
<jackson.version>2.14.1</jackson.version>
|
||||
<karaf.version>4.3.7</karaf.version>
|
||||
<karaf.version>4.4.3</karaf.version>
|
||||
<netty.version>4.1.72.Final</netty.version>
|
||||
<okhttp.version>3.14.9</okhttp.version>
|
||||
<sat.version>0.13.0</sat.version>
|
||||
|
Loading…
Reference in New Issue
Block a user