From 14e3349ab26d1b3fe71a8c81b24ed6acb2b07cf1 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Sun, 10 Dec 2023 18:14:43 +0000 Subject: [PATCH 01/14] Supress log output on shutdown Signed-off-by: Andrew Fiddian-Green --- .../internal/KarafAddonFinderService.java | 35 +++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafAddonFinderService.java b/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafAddonFinderService.java index 815d6eaed60..44af93c377a 100644 --- a/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafAddonFinderService.java +++ b/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafAddonFinderService.java @@ -17,6 +17,7 @@ import org.openhab.core.config.discovery.addon.AddonFinderService; 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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,31 +34,45 @@ public class KarafAddonFinderService implements AddonFinderService { private final Logger logger = LoggerFactory.getLogger(KarafAddonFinderService.class); private final FeaturesService featuresService; + private boolean deactivated; @Activate public KarafAddonFinderService(final @Reference FeaturesService featuresService) { this.featuresService = featuresService; } + @Deactivate + protected void deactivate() { + deactivated = true; + } + @Override public void install(String id) { - try { - if (!featuresService.isInstalled(featuresService.getFeature(id))) { - featuresService.installFeature(id); + if (!deactivated) { + try { + if (!featuresService.isInstalled(featuresService.getFeature(id))) { + featuresService.installFeature(id); + } + } catch (Exception e) { + if (!deactivated) { + logger.error("Failed to install add-on suggestion finder {}", id, e); + } } - } catch (Exception e) { - logger.error("Failed to install add-on suggestion finder {}", id, e); } } @Override public void uninstall(String id) { - try { - if (featuresService.isInstalled(featuresService.getFeature(id))) { - featuresService.uninstallFeature(id); + if (!deactivated) { + try { + if (featuresService.isInstalled(featuresService.getFeature(id))) { + featuresService.uninstallFeature(id); + } + } catch (Exception e) { + if (!deactivated) { + logger.error("Failed to uninstall add-on suggestion finder {}", id, e); + } } - } catch (Exception e) { - logger.error("Failed to uninstall add-on suggestion finder {}", id, e); } } } From 079094342c60d856c259adfff48add6491f0567e Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Sun, 10 Dec 2023 18:16:09 +0000 Subject: [PATCH 02/14] Revert "Supress log output on shutdown" This reverts commit 14e3349ab26d1b3fe71a8c81b24ed6acb2b07cf1. --- .../internal/KarafAddonFinderService.java | 35 ++++++------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafAddonFinderService.java b/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafAddonFinderService.java index 44af93c377a..815d6eaed60 100644 --- a/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafAddonFinderService.java +++ b/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafAddonFinderService.java @@ -17,7 +17,6 @@ import org.openhab.core.config.discovery.addon.AddonFinderService; 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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,45 +33,31 @@ public class KarafAddonFinderService implements AddonFinderService { private final Logger logger = LoggerFactory.getLogger(KarafAddonFinderService.class); private final FeaturesService featuresService; - private boolean deactivated; @Activate public KarafAddonFinderService(final @Reference FeaturesService featuresService) { this.featuresService = featuresService; } - @Deactivate - protected void deactivate() { - deactivated = true; - } - @Override public void install(String id) { - if (!deactivated) { - try { - if (!featuresService.isInstalled(featuresService.getFeature(id))) { - featuresService.installFeature(id); - } - } catch (Exception e) { - if (!deactivated) { - logger.error("Failed to install add-on suggestion finder {}", id, e); - } + try { + if (!featuresService.isInstalled(featuresService.getFeature(id))) { + featuresService.installFeature(id); } + } catch (Exception e) { + logger.error("Failed to install add-on suggestion finder {}", id, e); } } @Override public void uninstall(String id) { - if (!deactivated) { - try { - if (featuresService.isInstalled(featuresService.getFeature(id))) { - featuresService.uninstallFeature(id); - } - } catch (Exception e) { - if (!deactivated) { - logger.error("Failed to uninstall add-on suggestion finder {}", id, e); - } + try { + if (featuresService.isInstalled(featuresService.getFeature(id))) { + featuresService.uninstallFeature(id); } + } catch (Exception e) { + logger.error("Failed to uninstall add-on suggestion finder {}", id, e); } } } From 4c42fd586e05c8f3d878820bffa13465121ba5e0 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Tue, 19 Dec 2023 12:00:23 +0000 Subject: [PATCH 03/14] Initial contribution Signed-off-by: Andrew Fiddian-Green --- .../.classpath | 29 ++++ .../.project | 23 +++ .../NOTICE | 14 ++ .../pom.xml | 25 ++++ .../internal/WindowsUsbSerialDiscovery.java | 139 ++++++++++++++++++ .../test/WindowsUsbDiscoveryTests.java | 29 ++++ bundles/pom.xml | 1 + .../openhab-core/src/main/feature/feature.xml | 1 + 8 files changed, 261 insertions(+) create mode 100644 bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/.classpath create mode 100644 bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/.project create mode 100644 bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/NOTICE create mode 100644 bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml create mode 100644 bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java create mode 100644 bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/test/java/org/openhab/core/config/discovery/usbserial/windowsregistry/test/WindowsUsbDiscoveryTests.java diff --git a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/.classpath b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/.classpath new file mode 100644 index 00000000000..58cd399d639 --- /dev/null +++ b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/.classpath @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/.project b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/.project new file mode 100644 index 00000000000..ad2f4ec236a --- /dev/null +++ b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/.project @@ -0,0 +1,23 @@ + + + org.openhab.core.config.discovery.usbserial.javaxusb + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/NOTICE b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/NOTICE new file mode 100644 index 00000000000..6c17d0d8a45 --- /dev/null +++ b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/NOTICE @@ -0,0 +1,14 @@ +This content is produced and maintained by the openHAB project. + +* Project home: https://www.openhab.org + +== Declared Project Licenses + +This program and the accompanying materials are made available under the terms +of the Eclipse Public License 2.0 which is available at +https://www.eclipse.org/legal/epl-2.0/. + +== Source Code + +https://github.com/openhab/openhab-core + diff --git a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml new file mode 100644 index 00000000000..bb0cc7cb750 --- /dev/null +++ b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml @@ -0,0 +1,25 @@ + + + + 4.0.0 + + + org.openhab.core.bundles + org.openhab.core.reactor.bundles + 4.1.0-SNAPSHOT + + + org.openhab.core.config.discovery.usbserial.windowsregistry + + openHAB Core :: Bundles :: Configuration USB-Serial Discovery for Windows + + + + org.openhab.core.bundles + org.openhab.core.config.discovery.usbserial + ${project.version} + + + + diff --git a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java new file mode 100644 index 00000000000..15aa36cb12e --- /dev/null +++ b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java @@ -0,0 +1,139 @@ +/** + * Copyright (c) 2010-2023 Contributors to the openHAB project + * + * See the NOTICE file(s) distributed with this work for additional + * information. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0 + * + * SPDX-License-Identifier: EPL-2.0 + */ +package org.openhab.core.config.discovery.usbserial.windowsregistry.internal; + +import java.time.Duration; +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.CopyOnWriteArraySet; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; + +import org.eclipse.jdt.annotation.NonNullByDefault; +import org.eclipse.jdt.annotation.Nullable; +import org.openhab.core.common.ThreadFactoryBuilder; +import org.openhab.core.config.discovery.usbserial.UsbSerialDeviceInformation; +import org.openhab.core.config.discovery.usbserial.UsbSerialDiscovery; +import org.openhab.core.config.discovery.usbserial.UsbSerialDiscoveryListener; +import org.osgi.service.component.annotations.Activate; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Deactivate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * This is a {@link UsbSerialDiscovery} implementation component that scans the system for USB devices by means of the + * {@link org.usb4java} library implementation of the {@link javax.usb} interface. + *

+ * It provides USB coverage on non Linux Operating Systems. Linux is already better covered by the scanners in the + * {@link org.openhab.core.config.discovery.usbserial.linuxsysfs} module. + * + * @author Andrew Fiddian-Green - Initial contribution + */ +@NonNullByDefault +@Component(service = UsbSerialDiscovery.class, name = WindowsUsbSerialDiscovery.SERVICE_NAME) +public class WindowsUsbSerialDiscovery implements UsbSerialDiscovery { + + protected static final String SERVICE_NAME = "usb-serial-discovery-windows"; + + private final Logger logger = LoggerFactory.getLogger(WindowsUsbSerialDiscovery.class); + private final Set discoveryListeners = new CopyOnWriteArraySet<>(); + private final Duration scanInterval = Duration.ofSeconds(15); + private final ScheduledExecutorService scheduler; + + private Set lastScanResult = new HashSet<>(); + private @Nullable ScheduledFuture scanTask; + + @Activate + public WindowsUsbSerialDiscovery() { + scheduler = Executors.newSingleThreadScheduledExecutor( + ThreadFactoryBuilder.create().withName(SERVICE_NAME).withDaemonThreads(true).build()); + } + + private void announceAddedDevice(UsbSerialDeviceInformation deviceInfo) { + for (UsbSerialDiscoveryListener listener : discoveryListeners) { + listener.usbSerialDeviceDiscovered(deviceInfo); + } + } + + private void announceRemovedDevice(UsbSerialDeviceInformation deviceInfo) { + for (UsbSerialDiscoveryListener listener : discoveryListeners) { + listener.usbSerialDeviceRemoved(deviceInfo); + } + } + + @Deactivate + public void deactivate() { + stopBackgroundScanning(); + lastScanResult.clear(); + } + + @Override + public synchronized void doSingleScan() { + Set scanResult = scanAllUsbDevicesInformation(); + Set added = setDifference(scanResult, lastScanResult); + Set removed = setDifference(lastScanResult, scanResult); + Set unchanged = setDifference(scanResult, added); + + lastScanResult = scanResult; + + removed.stream().forEach(this::announceRemovedDevice); + added.stream().forEach(this::announceAddedDevice); + unchanged.stream().forEach(this::announceAddedDevice); + } + + private Set setDifference(Set set1, Set set2) { + Set result = new HashSet<>(set1); + result.removeAll(set2); + return result; + } + + @Override + public void registerDiscoveryListener(UsbSerialDiscoveryListener listener) { + discoveryListeners.add(listener); + for (UsbSerialDeviceInformation deviceInfo : lastScanResult) { + listener.usbSerialDeviceDiscovered(deviceInfo); + } + } + + @Override + public void unregisterDiscoveryListener(UsbSerialDiscoveryListener listener) { + discoveryListeners.remove(listener); + } + + /** + * Traverse the USB tree and return a set of USB device information. + * + * @return a set of USB device information. + */ + private Set scanAllUsbDevicesInformation() { + return Set.of(); + } + + @Override + public synchronized void startBackgroundScanning() { + scanTask = scheduler.scheduleWithFixedDelay(() -> doSingleScan(), 0, scanInterval.toSeconds(), + TimeUnit.SECONDS); + } + + @Override + public synchronized void stopBackgroundScanning() { + ScheduledFuture scanTask = this.scanTask; + if (scanTask != null) { + scanTask.cancel(false); + } + this.scanTask = null; + } +} diff --git a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/test/java/org/openhab/core/config/discovery/usbserial/windowsregistry/test/WindowsUsbDiscoveryTests.java b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/test/java/org/openhab/core/config/discovery/usbserial/windowsregistry/test/WindowsUsbDiscoveryTests.java new file mode 100644 index 00000000000..f05d4fadb05 --- /dev/null +++ b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/test/java/org/openhab/core/config/discovery/usbserial/windowsregistry/test/WindowsUsbDiscoveryTests.java @@ -0,0 +1,29 @@ +/** + * Copyright (c) 2010-2023 Contributors to the openHAB project + * + * See the NOTICE file(s) distributed with this work for additional + * information. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0 + * + * SPDX-License-Identifier: EPL-2.0 + */ +package org.openhab.core.config.discovery.usbserial.windowsregistry.test; + +import org.eclipse.jdt.annotation.NonNullByDefault; +import org.junit.jupiter.api.Test; + +/** + * JUnit tests for .. + * + * @author Andrew Fiddian-Green - Initial contribution + */ +@NonNullByDefault +class WindowsUsbDiscoveryTests { + + @Test + void testWhatever() { + } +} diff --git a/bundles/pom.xml b/bundles/pom.xml index 58e8b73239e..d94097428d2 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -37,6 +37,7 @@ org.openhab.core.config.discovery.usbserial org.openhab.core.config.discovery.usbserial.linuxsysfs org.openhab.core.config.discovery.usbserial.ser2net + org.openhab.core.config.discovery.usbserial.windowsregistry org.openhab.core.config.discovery.upnp org.openhab.core.config.dispatch org.openhab.core.config.serial diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml index 44e3eb37a79..5a63d3bee11 100644 --- a/features/karaf/openhab-core/src/main/feature/feature.xml +++ b/features/karaf/openhab-core/src/main/feature/feature.xml @@ -514,6 +514,7 @@ mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial/${project.version} mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/${project.version} mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.ser2net/${project.version} + mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/${project.version} mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial/${project.version} mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial.rxtx/${project.version} mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/${project.version} From 1507c952445ce485de3d258f6e52973d0c915b02 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Tue, 19 Dec 2023 16:20:47 +0000 Subject: [PATCH 04/14] Add functional registry code Signed-off-by: Andrew Fiddian-Green --- .../pom.xml | 5 + .../internal/WindowsUsbSerialDiscovery.java | 110 ++++++++++++++++-- .../test/WindowsUsbDiscoveryTests.java | 6 +- 3 files changed, 111 insertions(+), 10 deletions(-) diff --git a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml index bb0cc7cb750..834a44ae00a 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml +++ b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml @@ -20,6 +20,11 @@ org.openhab.core.config.discovery.usbserial ${project.version} + + net.java.dev.jna + jna-platform + 5.14.0 + diff --git a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java index 15aa36cb12e..4730d4a464c 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java +++ b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java @@ -12,9 +12,13 @@ */ package org.openhab.core.config.discovery.usbserial.windowsregistry.internal; +import static com.sun.jna.platform.win32.WinReg.HKEY_LOCAL_MACHINE; + import java.time.Duration; import java.util.HashSet; +import java.util.Map.Entry; import java.util.Set; +import java.util.TreeMap; import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -33,12 +37,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.sun.jna.Platform; +import com.sun.jna.platform.win32.Advapi32Util; + /** - * This is a {@link UsbSerialDiscovery} implementation component that scans the system for USB devices by means of the - * {@link org.usb4java} library implementation of the {@link javax.usb} interface. - *

- * It provides USB coverage on non Linux Operating Systems. Linux is already better covered by the scanners in the - * {@link org.openhab.core.config.discovery.usbserial.linuxsysfs} module. + * This is a {@link UsbSerialDiscovery} implementation component for Windows. + * It parses the Windows registry for USB device entries. * * @author Andrew Fiddian-Green - Initial contribution */ @@ -48,6 +52,17 @@ public class WindowsUsbSerialDiscovery implements UsbSerialDiscovery { protected static final String SERVICE_NAME = "usb-serial-discovery-windows"; + // registry accessor strings + private static final String USB_REGISTRY_ROOT = "SYSTEM\\CurrentControlSet\\Enum\\USB"; + private static final String BACKSLASH = "\\"; + private static final String PREFIX_PID = "PID_"; + private static final String PREFIX_VID = "VID_"; + private static final String PREFIX_HEX = "0x"; + private static final String SPLIT_IDS = "&"; + private static final String SPLIT_VALUES = ";"; + private static final String KEY_MANUFACTURER = "Mfg"; + private static final String KEY_PRODUCT = "DeviceDesc"; + private final Logger logger = LoggerFactory.getLogger(WindowsUsbSerialDiscovery.class); private final Set discoveryListeners = new CopyOnWriteArraySet<>(); private final Duration scanInterval = Duration.ofSeconds(15); @@ -114,12 +129,91 @@ public void unregisterDiscoveryListener(UsbSerialDiscoveryListener listener) { } /** - * Traverse the USB tree and return a set of USB device information. + * Traverse the USB tree in Windows registry and return a set of USB device information. * * @return a set of USB device information. */ - private Set scanAllUsbDevicesInformation() { - return Set.of(); + public Set scanAllUsbDevicesInformation() { + if (!Platform.isWindows()) { + return Set.of(); + } + + Set result = new HashSet<>(); + String[] usbKeys = Advapi32Util.registryGetKeys(HKEY_LOCAL_MACHINE, USB_REGISTRY_ROOT); + + for (String usbKey : usbKeys) { + logger.trace("{}", usbKey); + + if (!usbKey.startsWith(PREFIX_VID)) { + continue; + } + + String[] ids = usbKey.split(SPLIT_IDS); + if (ids.length < 2) { + continue; + } + + if (!ids[1].startsWith(PREFIX_PID)) { + continue; + } + + int vendorId; + int productId; + try { + vendorId = Integer.decode(PREFIX_HEX + ids[0].substring(4)); + productId = Integer.decode(PREFIX_HEX + ids[1].substring(4)); + } catch (NumberFormatException e) { + continue; + } + + String usbPath = USB_REGISTRY_ROOT + BACKSLASH + usbKey; + String[] usbSubKeys = Advapi32Util.registryGetKeys(HKEY_LOCAL_MACHINE, usbPath); + + for (String usbSubKey : usbSubKeys) { + logger.trace(" {}", usbSubKey); + + String usbSubPath = usbPath + BACKSLASH + usbSubKey; + TreeMap values = Advapi32Util.registryGetValues(HKEY_LOCAL_MACHINE, usbSubPath); + + if (logger.isTraceEnabled()) { + for (Entry value : values.entrySet()) { + logger.trace(" {}={}", value.getKey(), value.getValue()); + } + } + + String manufacturer; + Object manufacturerObject = values.get(KEY_MANUFACTURER); + if (manufacturerObject instanceof String manufacturerString) { + String[] manufacturerData = manufacturerString.split(SPLIT_VALUES); + if (manufacturerData.length < 2) { + continue; + } + manufacturer = manufacturerData[1]; + } else { + continue; + } + + String product; + Object productObject = values.get(KEY_PRODUCT); + if (productObject instanceof String productString) { + String[] productData = productString.split(SPLIT_VALUES); + if (productData.length < 2) { + continue; + } + product = productData[1]; + } else { + continue; + } + + UsbSerialDeviceInformation usbSerialDeviceInformation = new UsbSerialDeviceInformation(vendorId, + productId, null, manufacturer, product, 0, null, ""); + + logger.debug("Add {}", usbSerialDeviceInformation); + result.add(usbSerialDeviceInformation); + break; + } + } + return result; } @Override diff --git a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/test/java/org/openhab/core/config/discovery/usbserial/windowsregistry/test/WindowsUsbDiscoveryTests.java b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/test/java/org/openhab/core/config/discovery/usbserial/windowsregistry/test/WindowsUsbDiscoveryTests.java index f05d4fadb05..0cbc9809921 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/test/java/org/openhab/core/config/discovery/usbserial/windowsregistry/test/WindowsUsbDiscoveryTests.java +++ b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/test/java/org/openhab/core/config/discovery/usbserial/windowsregistry/test/WindowsUsbDiscoveryTests.java @@ -14,9 +14,10 @@ import org.eclipse.jdt.annotation.NonNullByDefault; import org.junit.jupiter.api.Test; +import org.openhab.core.config.discovery.usbserial.windowsregistry.internal.WindowsUsbSerialDiscovery; /** - * JUnit tests for .. + * JUnit tests for {@link WindowsUsbSerialDiscovery} * * @author Andrew Fiddian-Green - Initial contribution */ @@ -24,6 +25,7 @@ class WindowsUsbDiscoveryTests { @Test - void testWhatever() { + void testDiscovery() { + // TODO write tests } } From 65bc30deb1c3b834bec0f6e631a32b4650ac363c Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Tue, 19 Dec 2023 16:52:55 +0000 Subject: [PATCH 05/14] Adjust JNA version Signed-off-by: Andrew Fiddian-Green --- .../pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml index 834a44ae00a..f3b5fa57fef 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml +++ b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml @@ -23,7 +23,7 @@ net.java.dev.jna jna-platform - 5.14.0 + 5.13.0 From 56e1b6ebce97eff371e7900485ae7476875fbc9a Mon Sep 17 00:00:00 2001 From: Holger Friedrich Date: Fri, 22 Dec 2023 23:14:28 +0100 Subject: [PATCH 06/14] Apply spotless after release, resolve bundles (#3953) Signed-off-by: Holger Friedrich --- bom/compile-model/pom.xml | 4 +- bom/compile/pom.xml | 4 +- bom/openhab-core-index/pom.xml | 4 +- bom/openhab-core/pom.xml | 4 +- bom/pom.xml | 4 +- bom/runtime-index/pom.xml | 4 +- bom/runtime/pom.xml | 4 +- bom/test-index/pom.xml | 4 +- bom/test/pom.xml | 4 +- .../org.openhab.core.addon.eclipse/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- bundles/org.openhab.core.addon/pom.xml | 4 +- bundles/org.openhab.core.audio/pom.xml | 4 +- bundles/org.openhab.core.auth.jaas/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../org.openhab.core.automation.rest/pom.xml | 4 +- bundles/org.openhab.core.automation/pom.xml | 4 +- bundles/org.openhab.core.config.core/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../org.openhab.core.config.discovery/pom.xml | 4 +- .../org.openhab.core.config.dispatch/pom.xml | 4 +- .../org.openhab.core.config.serial/pom.xml | 4 +- bundles/org.openhab.core.ephemeris/pom.xml | 4 +- bundles/org.openhab.core.id/pom.xml | 4 +- bundles/org.openhab.core.io.bin2json/pom.xml | 4 +- .../pom.xml | 4 +- .../org.openhab.core.io.console.karaf/pom.xml | 4 +- .../pom.xml | 4 +- bundles/org.openhab.core.io.console/pom.xml | 4 +- bundles/org.openhab.core.io.http.auth/pom.xml | 4 +- bundles/org.openhab.core.io.http/pom.xml | 4 +- .../pom.xml | 7 ++- bundles/org.openhab.core.io.monitor/pom.xml | 4 +- bundles/org.openhab.core.io.net/pom.xml | 4 +- .../org.openhab.core.io.rest.audio/pom.xml | 4 +- bundles/org.openhab.core.io.rest.auth/pom.xml | 4 +- bundles/org.openhab.core.io.rest.core/pom.xml | 4 +- bundles/org.openhab.core.io.rest.log/pom.xml | 4 +- bundles/org.openhab.core.io.rest.mdns/pom.xml | 4 +- .../org.openhab.core.io.rest.sitemap/pom.xml | 4 +- bundles/org.openhab.core.io.rest.sse/pom.xml | 4 +- .../org.openhab.core.io.rest.swagger/pom.xml | 4 +- .../pom.xml | 4 +- bundles/org.openhab.core.io.rest.ui/pom.xml | 4 +- .../org.openhab.core.io.rest.voice/pom.xml | 4 +- bundles/org.openhab.core.io.rest/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- bundles/org.openhab.core.io.websocket/pom.xml | 4 +- bundles/org.openhab.core.karaf/pom.xml | 4 +- bundles/org.openhab.core.model.core/pom.xml | 4 +- .../org.openhab.core.model.item.ide/pom.xml | 4 +- .../pom.xml | 4 +- bundles/org.openhab.core.model.item/pom.xml | 4 +- .../org.openhab.core.model.lazygen/pom.xml | 4 +- bundles/org.openhab.core.model.lsp/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../org.openhab.core.model.rule.ide/pom.xml | 4 +- .../pom.xml | 4 +- bundles/org.openhab.core.model.rule/pom.xml | 4 +- .../org.openhab.core.model.script.ide/pom.xml | 4 +- .../pom.xml | 4 +- bundles/org.openhab.core.model.script/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../org.openhab.core.model.sitemap/pom.xml | 4 +- .../org.openhab.core.model.thing.ide/pom.xml | 4 +- .../pom.xml | 4 +- bundles/org.openhab.core.model.thing/pom.xml | 4 +- bundles/org.openhab.core.model.yaml/pom.xml | 4 +- bundles/org.openhab.core.persistence/pom.xml | 4 +- bundles/org.openhab.core.semantics/pom.xml | 4 +- bundles/org.openhab.core.storage.json/pom.xml | 4 +- bundles/org.openhab.core.test.magic/pom.xml | 4 +- bundles/org.openhab.core.test/pom.xml | 4 +- bundles/org.openhab.core.thing/pom.xml | 4 +- bundles/org.openhab.core.transform/pom.xml | 4 +- bundles/org.openhab.core.ui.icon/pom.xml | 4 +- bundles/org.openhab.core.ui/pom.xml | 4 +- bundles/org.openhab.core.voice/pom.xml | 4 +- bundles/org.openhab.core/pom.xml | 4 +- bundles/pom.xml | 4 +- features/karaf/openhab-core/pom.xml | 4 +- features/karaf/openhab-tp/pom.xml | 4 +- features/karaf/pom.xml | 4 +- features/pom.xml | 4 +- .../org.openhab.core.addon.tests/itest.bndrun | 12 ++-- itests/org.openhab.core.addon.tests/pom.xml | 4 +- .../itest.bndrun | 15 ++--- .../pom.xml | 4 +- .../itest.bndrun | 21 +++---- .../pom.xml | 4 +- .../itest.bndrun | 21 +++---- .../pom.xml | 4 +- .../itest.bndrun | 23 ++++---- .../pom.xml | 4 +- .../itest.bndrun | 21 +++---- .../pom.xml | 4 +- .../itest.bndrun | 21 +++---- .../org.openhab.core.automation.tests/pom.xml | 4 +- .../itest.bndrun | 11 ++-- .../pom.xml | 4 +- .../itest.bndrun | 23 ++++---- .../pom.xml | 4 +- .../itest.bndrun | 19 +++--- .../pom.xml | 4 +- .../itest.bndrun | 23 ++++---- .../pom.xml | 4 +- .../itest.bndrun | 21 +++---- .../pom.xml | 4 +- .../itest.bndrun | 11 ++-- .../pom.xml | 4 +- .../itest.bndrun | 13 ++-- .../org.openhab.core.ephemeris.tests/pom.xml | 4 +- .../itest.bndrun | 11 ++-- itests/org.openhab.core.io.net.tests/pom.xml | 4 +- .../itest.bndrun | 28 ++++----- .../pom.xml | 4 +- .../itest.bndrun | 55 ++++++++--------- .../org.openhab.core.model.item.tests/pom.xml | 4 +- .../itest.bndrun | 51 ++++++++-------- .../org.openhab.core.model.rule.tests/pom.xml | 4 +- .../itest.bndrun | 50 ++++++++-------- .../pom.xml | 4 +- .../itest.bndrun | 59 ++++++++++--------- .../pom.xml | 4 +- .../pom.xml | 4 +- .../itest.bndrun | 19 +++--- .../pom.xml | 4 +- itests/org.openhab.core.tests/itest.bndrun | 9 +-- itests/org.openhab.core.tests/pom.xml | 4 +- .../org.openhab.core.thing.tests/itest.bndrun | 16 ++--- itests/org.openhab.core.thing.tests/pom.xml | 4 +- .../org.openhab.core.voice.tests/itest.bndrun | 20 +++---- itests/org.openhab.core.voice.tests/pom.xml | 4 +- itests/pom.xml | 4 +- pom.xml | 4 +- tools/archetype/binding/pom.xml | 4 +- tools/archetype/pom.xml | 4 +- tools/i18n-plugin/pom.xml | 4 +- tools/pom.xml | 4 +- tools/upgradetool/pom.xml | 4 +- 163 files changed, 714 insertions(+), 418 deletions(-) diff --git a/bom/compile-model/pom.xml b/bom/compile-model/pom.xml index ea9cdd4f476..278ac411205 100644 --- a/bom/compile-model/pom.xml +++ b/bom/compile-model/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml index 2357e99d818..d37fb91fb0e 100644 --- a/bom/compile/pom.xml +++ b/bom/compile/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bom/openhab-core-index/pom.xml b/bom/openhab-core-index/pom.xml index 5afe6e9327b..95effdb3115 100644 --- a/bom/openhab-core-index/pom.xml +++ b/bom/openhab-core-index/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bom/openhab-core/pom.xml b/bom/openhab-core/pom.xml index c0fff09e87e..5cf3eefdb23 100644 --- a/bom/openhab-core/pom.xml +++ b/bom/openhab-core/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bom/pom.xml b/bom/pom.xml index 96e9cfb2271..c8c08e84cf1 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bom/runtime-index/pom.xml b/bom/runtime-index/pom.xml index adbbb4bb05f..b2d08cf386c 100644 --- a/bom/runtime-index/pom.xml +++ b/bom/runtime-index/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index 77d2fca9ee2..9a0a2868408 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bom/test-index/pom.xml b/bom/test-index/pom.xml index 3eb79b8f0b0..fe176069958 100644 --- a/bom/test-index/pom.xml +++ b/bom/test-index/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bom/test/pom.xml b/bom/test/pom.xml index 0a77f0157da..3ef0f307b8f 100644 --- a/bom/test/pom.xml +++ b/bom/test/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.addon.eclipse/pom.xml b/bundles/org.openhab.core.addon.eclipse/pom.xml index 5a1a18b7bf4..1b519d2e27a 100644 --- a/bundles/org.openhab.core.addon.eclipse/pom.xml +++ b/bundles/org.openhab.core.addon.eclipse/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.addon.marketplace.karaf/pom.xml b/bundles/org.openhab.core.addon.marketplace.karaf/pom.xml index 55c9335c7a3..ee04295b653 100644 --- a/bundles/org.openhab.core.addon.marketplace.karaf/pom.xml +++ b/bundles/org.openhab.core.addon.marketplace.karaf/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.addon.marketplace/pom.xml b/bundles/org.openhab.core.addon.marketplace/pom.xml index 059bf03a02f..317d25824c2 100644 --- a/bundles/org.openhab.core.addon.marketplace/pom.xml +++ b/bundles/org.openhab.core.addon.marketplace/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.addon/pom.xml b/bundles/org.openhab.core.addon/pom.xml index cd6f34fea90..24d774631cc 100644 --- a/bundles/org.openhab.core.addon/pom.xml +++ b/bundles/org.openhab.core.addon/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.audio/pom.xml b/bundles/org.openhab.core.audio/pom.xml index c65fbbdc092..2603aa967e1 100644 --- a/bundles/org.openhab.core.audio/pom.xml +++ b/bundles/org.openhab.core.audio/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.auth.jaas/pom.xml b/bundles/org.openhab.core.auth.jaas/pom.xml index 0d92ea29ab5..78a75892340 100644 --- a/bundles/org.openhab.core.auth.jaas/pom.xml +++ b/bundles/org.openhab.core.auth.jaas/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.auth.oauth2client/pom.xml b/bundles/org.openhab.core.auth.oauth2client/pom.xml index a085fb077ad..0eb0a93e4ef 100644 --- a/bundles/org.openhab.core.auth.oauth2client/pom.xml +++ b/bundles/org.openhab.core.auth.oauth2client/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.automation.module.media/pom.xml b/bundles/org.openhab.core.automation.module.media/pom.xml index 53fcf48d6ef..4bbad43616f 100644 --- a/bundles/org.openhab.core.automation.module.media/pom.xml +++ b/bundles/org.openhab.core.automation.module.media/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.automation.module.script.rulesupport/pom.xml b/bundles/org.openhab.core.automation.module.script.rulesupport/pom.xml index b46b44cf3ec..241ad616912 100644 --- a/bundles/org.openhab.core.automation.module.script.rulesupport/pom.xml +++ b/bundles/org.openhab.core.automation.module.script.rulesupport/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.automation.module.script/pom.xml b/bundles/org.openhab.core.automation.module.script/pom.xml index 958e49fb368..011647661b2 100644 --- a/bundles/org.openhab.core.automation.module.script/pom.xml +++ b/bundles/org.openhab.core.automation.module.script/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.automation.rest/pom.xml b/bundles/org.openhab.core.automation.rest/pom.xml index 953aef5c7c0..f74d4ec9a3a 100644 --- a/bundles/org.openhab.core.automation.rest/pom.xml +++ b/bundles/org.openhab.core.automation.rest/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.automation/pom.xml b/bundles/org.openhab.core.automation/pom.xml index ea4bbd90c91..18c4bcd6242 100644 --- a/bundles/org.openhab.core.automation/pom.xml +++ b/bundles/org.openhab.core.automation/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.config.core/pom.xml b/bundles/org.openhab.core.config.core/pom.xml index d13ad10670f..8221b4b6b68 100644 --- a/bundles/org.openhab.core.config.core/pom.xml +++ b/bundles/org.openhab.core.config.core/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.config.discovery.addon.ip/pom.xml b/bundles/org.openhab.core.config.discovery.addon.ip/pom.xml index 071419854a9..0c825cd2374 100644 --- a/bundles/org.openhab.core.config.discovery.addon.ip/pom.xml +++ b/bundles/org.openhab.core.config.discovery.addon.ip/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.config.discovery.addon.mdns/pom.xml b/bundles/org.openhab.core.config.discovery.addon.mdns/pom.xml index 1a63d3a8440..ab46d535b77 100644 --- a/bundles/org.openhab.core.config.discovery.addon.mdns/pom.xml +++ b/bundles/org.openhab.core.config.discovery.addon.mdns/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.config.discovery.addon.process/pom.xml b/bundles/org.openhab.core.config.discovery.addon.process/pom.xml index 51078aa5bff..f26a5100232 100644 --- a/bundles/org.openhab.core.config.discovery.addon.process/pom.xml +++ b/bundles/org.openhab.core.config.discovery.addon.process/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.config.discovery.addon.upnp/pom.xml b/bundles/org.openhab.core.config.discovery.addon.upnp/pom.xml index 7b461b8146c..cffbd119de2 100644 --- a/bundles/org.openhab.core.config.discovery.addon.upnp/pom.xml +++ b/bundles/org.openhab.core.config.discovery.addon.upnp/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.config.discovery.addon/pom.xml b/bundles/org.openhab.core.config.discovery.addon/pom.xml index 61cc63e4a04..2d1c396ad5c 100644 --- a/bundles/org.openhab.core.config.discovery.addon/pom.xml +++ b/bundles/org.openhab.core.config.discovery.addon/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.config.discovery.mdns/pom.xml b/bundles/org.openhab.core.config.discovery.mdns/pom.xml index 446acaa2a60..f0ef9975b58 100644 --- a/bundles/org.openhab.core.config.discovery.mdns/pom.xml +++ b/bundles/org.openhab.core.config.discovery.mdns/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.config.discovery.upnp/pom.xml b/bundles/org.openhab.core.config.discovery.upnp/pom.xml index 9fb27e38f4f..f8a71aad2bb 100644 --- a/bundles/org.openhab.core.config.discovery.upnp/pom.xml +++ b/bundles/org.openhab.core.config.discovery.upnp/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/pom.xml b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/pom.xml index da574896bc3..b94212ddd9d 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/pom.xml +++ b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.config.discovery.usbserial.ser2net/pom.xml b/bundles/org.openhab.core.config.discovery.usbserial.ser2net/pom.xml index ef2f388b3eb..0d7b22e038a 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.ser2net/pom.xml +++ b/bundles/org.openhab.core.config.discovery.usbserial.ser2net/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.config.discovery.usbserial/pom.xml b/bundles/org.openhab.core.config.discovery.usbserial/pom.xml index 3b90152d168..44a0f843484 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial/pom.xml +++ b/bundles/org.openhab.core.config.discovery.usbserial/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.config.discovery/pom.xml b/bundles/org.openhab.core.config.discovery/pom.xml index 7f29dafcb9b..17dd511021f 100644 --- a/bundles/org.openhab.core.config.discovery/pom.xml +++ b/bundles/org.openhab.core.config.discovery/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.config.dispatch/pom.xml b/bundles/org.openhab.core.config.dispatch/pom.xml index ff80f39d4fb..fe0a6858260 100644 --- a/bundles/org.openhab.core.config.dispatch/pom.xml +++ b/bundles/org.openhab.core.config.dispatch/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.config.serial/pom.xml b/bundles/org.openhab.core.config.serial/pom.xml index 2394de45fad..e800f84315c 100644 --- a/bundles/org.openhab.core.config.serial/pom.xml +++ b/bundles/org.openhab.core.config.serial/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.ephemeris/pom.xml b/bundles/org.openhab.core.ephemeris/pom.xml index 05f85eb7282..73c992077e8 100644 --- a/bundles/org.openhab.core.ephemeris/pom.xml +++ b/bundles/org.openhab.core.ephemeris/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.id/pom.xml b/bundles/org.openhab.core.id/pom.xml index c97fef0a65c..71ed95058d5 100644 --- a/bundles/org.openhab.core.id/pom.xml +++ b/bundles/org.openhab.core.id/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.bin2json/pom.xml b/bundles/org.openhab.core.io.bin2json/pom.xml index b00801d432d..e9aa5bed2af 100644 --- a/bundles/org.openhab.core.io.bin2json/pom.xml +++ b/bundles/org.openhab.core.io.bin2json/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.console.eclipse/pom.xml b/bundles/org.openhab.core.io.console.eclipse/pom.xml index 2d1106c2be1..b20abd2d1f3 100644 --- a/bundles/org.openhab.core.io.console.eclipse/pom.xml +++ b/bundles/org.openhab.core.io.console.eclipse/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.console.karaf/pom.xml b/bundles/org.openhab.core.io.console.karaf/pom.xml index d170a34ca56..7815528ad6f 100644 --- a/bundles/org.openhab.core.io.console.karaf/pom.xml +++ b/bundles/org.openhab.core.io.console.karaf/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.console.rfc147/pom.xml b/bundles/org.openhab.core.io.console.rfc147/pom.xml index 3914f98bb9d..40a82490646 100644 --- a/bundles/org.openhab.core.io.console.rfc147/pom.xml +++ b/bundles/org.openhab.core.io.console.rfc147/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.console/pom.xml b/bundles/org.openhab.core.io.console/pom.xml index 05f24d4002f..7c28170adec 100644 --- a/bundles/org.openhab.core.io.console/pom.xml +++ b/bundles/org.openhab.core.io.console/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.http.auth/pom.xml b/bundles/org.openhab.core.io.http.auth/pom.xml index c6e0378be7b..70a3681c645 100644 --- a/bundles/org.openhab.core.io.http.auth/pom.xml +++ b/bundles/org.openhab.core.io.http.auth/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.http/pom.xml b/bundles/org.openhab.core.io.http/pom.xml index 953069e2361..8c81c5de554 100644 --- a/bundles/org.openhab.core.io.http/pom.xml +++ b/bundles/org.openhab.core.io.http/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.jetty.certificate/pom.xml b/bundles/org.openhab.core.io.jetty.certificate/pom.xml index 6d43ddd9539..33cf7fd5993 100644 --- a/bundles/org.openhab.core.io.jetty.certificate/pom.xml +++ b/bundles/org.openhab.core.io.jetty.certificate/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 @@ -49,7 +51,8 @@ true - + . diff --git a/bundles/org.openhab.core.io.monitor/pom.xml b/bundles/org.openhab.core.io.monitor/pom.xml index ea907a25c7f..7ec8868abd3 100644 --- a/bundles/org.openhab.core.io.monitor/pom.xml +++ b/bundles/org.openhab.core.io.monitor/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.net/pom.xml b/bundles/org.openhab.core.io.net/pom.xml index b0715816e50..f17dea444a4 100644 --- a/bundles/org.openhab.core.io.net/pom.xml +++ b/bundles/org.openhab.core.io.net/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.rest.audio/pom.xml b/bundles/org.openhab.core.io.rest.audio/pom.xml index 7dd5b45e2a7..09c65bf887e 100644 --- a/bundles/org.openhab.core.io.rest.audio/pom.xml +++ b/bundles/org.openhab.core.io.rest.audio/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.rest.auth/pom.xml b/bundles/org.openhab.core.io.rest.auth/pom.xml index 6781884dec9..06f7db1c750 100644 --- a/bundles/org.openhab.core.io.rest.auth/pom.xml +++ b/bundles/org.openhab.core.io.rest.auth/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.rest.core/pom.xml b/bundles/org.openhab.core.io.rest.core/pom.xml index 45fec2cec1d..9fe8a20c134 100644 --- a/bundles/org.openhab.core.io.rest.core/pom.xml +++ b/bundles/org.openhab.core.io.rest.core/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.rest.log/pom.xml b/bundles/org.openhab.core.io.rest.log/pom.xml index ac76d4bcb92..1c5183a9ee4 100644 --- a/bundles/org.openhab.core.io.rest.log/pom.xml +++ b/bundles/org.openhab.core.io.rest.log/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.rest.mdns/pom.xml b/bundles/org.openhab.core.io.rest.mdns/pom.xml index 6b6ea3d504c..6f26eab71cf 100644 --- a/bundles/org.openhab.core.io.rest.mdns/pom.xml +++ b/bundles/org.openhab.core.io.rest.mdns/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.rest.sitemap/pom.xml b/bundles/org.openhab.core.io.rest.sitemap/pom.xml index b220ca6ddf0..70cfd881a58 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/pom.xml +++ b/bundles/org.openhab.core.io.rest.sitemap/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.rest.sse/pom.xml b/bundles/org.openhab.core.io.rest.sse/pom.xml index 487d978f659..224868206bd 100644 --- a/bundles/org.openhab.core.io.rest.sse/pom.xml +++ b/bundles/org.openhab.core.io.rest.sse/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.rest.swagger/pom.xml b/bundles/org.openhab.core.io.rest.swagger/pom.xml index 52059e3ebcd..7f44036b2f0 100644 --- a/bundles/org.openhab.core.io.rest.swagger/pom.xml +++ b/bundles/org.openhab.core.io.rest.swagger/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.rest.transform/pom.xml b/bundles/org.openhab.core.io.rest.transform/pom.xml index 487a6523e68..0870c63eec1 100644 --- a/bundles/org.openhab.core.io.rest.transform/pom.xml +++ b/bundles/org.openhab.core.io.rest.transform/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.rest.ui/pom.xml b/bundles/org.openhab.core.io.rest.ui/pom.xml index 0236b53a615..b34615686d1 100644 --- a/bundles/org.openhab.core.io.rest.ui/pom.xml +++ b/bundles/org.openhab.core.io.rest.ui/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.rest.voice/pom.xml b/bundles/org.openhab.core.io.rest.voice/pom.xml index 60b1a4fffe6..136af284263 100644 --- a/bundles/org.openhab.core.io.rest.voice/pom.xml +++ b/bundles/org.openhab.core.io.rest.voice/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.rest/pom.xml b/bundles/org.openhab.core.io.rest/pom.xml index 795ec7f5646..76c16538863 100644 --- a/bundles/org.openhab.core.io.rest/pom.xml +++ b/bundles/org.openhab.core.io.rest/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.transport.mdns/pom.xml b/bundles/org.openhab.core.io.transport.mdns/pom.xml index 71a86c85207..72ab9304639 100644 --- a/bundles/org.openhab.core.io.transport.mdns/pom.xml +++ b/bundles/org.openhab.core.io.transport.mdns/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.transport.modbus/pom.xml b/bundles/org.openhab.core.io.transport.modbus/pom.xml index d40f9cffb77..e67bddb2424 100644 --- a/bundles/org.openhab.core.io.transport.modbus/pom.xml +++ b/bundles/org.openhab.core.io.transport.modbus/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.transport.mqtt/pom.xml b/bundles/org.openhab.core.io.transport.mqtt/pom.xml index 254a136ae12..854dfd57c53 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/pom.xml +++ b/bundles/org.openhab.core.io.transport.mqtt/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.transport.serial.javacomm/pom.xml b/bundles/org.openhab.core.io.transport.serial.javacomm/pom.xml index d61305d171d..979611b33fc 100644 --- a/bundles/org.openhab.core.io.transport.serial.javacomm/pom.xml +++ b/bundles/org.openhab.core.io.transport.serial.javacomm/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/pom.xml b/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/pom.xml index d5e6263a8d0..7317a44788c 100644 --- a/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/pom.xml +++ b/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx/pom.xml b/bundles/org.openhab.core.io.transport.serial.rxtx/pom.xml index b12417b2003..e505f69fdef 100644 --- a/bundles/org.openhab.core.io.transport.serial.rxtx/pom.xml +++ b/bundles/org.openhab.core.io.transport.serial.rxtx/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.transport.serial/pom.xml b/bundles/org.openhab.core.io.transport.serial/pom.xml index d6129f3c5ed..dc6933efa7f 100644 --- a/bundles/org.openhab.core.io.transport.serial/pom.xml +++ b/bundles/org.openhab.core.io.transport.serial/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.transport.upnp/pom.xml b/bundles/org.openhab.core.io.transport.upnp/pom.xml index 37aefdedaa1..cc348f7c062 100644 --- a/bundles/org.openhab.core.io.transport.upnp/pom.xml +++ b/bundles/org.openhab.core.io.transport.upnp/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.io.websocket/pom.xml b/bundles/org.openhab.core.io.websocket/pom.xml index 027b9cd046c..1dcd49b79aa 100644 --- a/bundles/org.openhab.core.io.websocket/pom.xml +++ b/bundles/org.openhab.core.io.websocket/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.karaf/pom.xml b/bundles/org.openhab.core.karaf/pom.xml index a0115ed4474..0873cdf66ca 100644 --- a/bundles/org.openhab.core.karaf/pom.xml +++ b/bundles/org.openhab.core.karaf/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.core/pom.xml b/bundles/org.openhab.core.model.core/pom.xml index b0325b599ae..ce91eb736a5 100644 --- a/bundles/org.openhab.core.model.core/pom.xml +++ b/bundles/org.openhab.core.model.core/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.item.ide/pom.xml b/bundles/org.openhab.core.model.item.ide/pom.xml index b888bf7bd8f..b81113435d6 100644 --- a/bundles/org.openhab.core.model.item.ide/pom.xml +++ b/bundles/org.openhab.core.model.item.ide/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.item.runtime/pom.xml b/bundles/org.openhab.core.model.item.runtime/pom.xml index 034df24bfbb..f82f934f82b 100644 --- a/bundles/org.openhab.core.model.item.runtime/pom.xml +++ b/bundles/org.openhab.core.model.item.runtime/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.item/pom.xml b/bundles/org.openhab.core.model.item/pom.xml index 2b7c8e537a6..59379ead2b0 100644 --- a/bundles/org.openhab.core.model.item/pom.xml +++ b/bundles/org.openhab.core.model.item/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.lazygen/pom.xml b/bundles/org.openhab.core.model.lazygen/pom.xml index 78077837944..d6880a8fca5 100644 --- a/bundles/org.openhab.core.model.lazygen/pom.xml +++ b/bundles/org.openhab.core.model.lazygen/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.lsp/pom.xml b/bundles/org.openhab.core.model.lsp/pom.xml index b4a94b5ea12..494d16fe2f3 100644 --- a/bundles/org.openhab.core.model.lsp/pom.xml +++ b/bundles/org.openhab.core.model.lsp/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.persistence.ide/pom.xml b/bundles/org.openhab.core.model.persistence.ide/pom.xml index 70f70c28e4a..6f09055154e 100644 --- a/bundles/org.openhab.core.model.persistence.ide/pom.xml +++ b/bundles/org.openhab.core.model.persistence.ide/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.persistence.runtime/pom.xml b/bundles/org.openhab.core.model.persistence.runtime/pom.xml index 60bc052261c..185bd0df985 100644 --- a/bundles/org.openhab.core.model.persistence.runtime/pom.xml +++ b/bundles/org.openhab.core.model.persistence.runtime/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.persistence/pom.xml b/bundles/org.openhab.core.model.persistence/pom.xml index d648f05eb82..20ed6956f4a 100644 --- a/bundles/org.openhab.core.model.persistence/pom.xml +++ b/bundles/org.openhab.core.model.persistence/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.rule.ide/pom.xml b/bundles/org.openhab.core.model.rule.ide/pom.xml index 74ac3b4d958..c4bc893e5dd 100644 --- a/bundles/org.openhab.core.model.rule.ide/pom.xml +++ b/bundles/org.openhab.core.model.rule.ide/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.rule.runtime/pom.xml b/bundles/org.openhab.core.model.rule.runtime/pom.xml index d01efccb2b1..ec5fb5bec79 100644 --- a/bundles/org.openhab.core.model.rule.runtime/pom.xml +++ b/bundles/org.openhab.core.model.rule.runtime/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.rule/pom.xml b/bundles/org.openhab.core.model.rule/pom.xml index 2b8efa812b9..4beb1f8d27b 100644 --- a/bundles/org.openhab.core.model.rule/pom.xml +++ b/bundles/org.openhab.core.model.rule/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.script.ide/pom.xml b/bundles/org.openhab.core.model.script.ide/pom.xml index 40f28780448..e16edbdfd90 100644 --- a/bundles/org.openhab.core.model.script.ide/pom.xml +++ b/bundles/org.openhab.core.model.script.ide/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.script.runtime/pom.xml b/bundles/org.openhab.core.model.script.runtime/pom.xml index 11f2c863c6a..76a0ca195ef 100644 --- a/bundles/org.openhab.core.model.script.runtime/pom.xml +++ b/bundles/org.openhab.core.model.script.runtime/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.script/pom.xml b/bundles/org.openhab.core.model.script/pom.xml index cb08d42f257..92736aaa273 100644 --- a/bundles/org.openhab.core.model.script/pom.xml +++ b/bundles/org.openhab.core.model.script/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.sitemap.ide/pom.xml b/bundles/org.openhab.core.model.sitemap.ide/pom.xml index b39b00f2029..2de27b1e232 100644 --- a/bundles/org.openhab.core.model.sitemap.ide/pom.xml +++ b/bundles/org.openhab.core.model.sitemap.ide/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.sitemap.runtime/pom.xml b/bundles/org.openhab.core.model.sitemap.runtime/pom.xml index 6429f72935d..d7aa132ba3d 100644 --- a/bundles/org.openhab.core.model.sitemap.runtime/pom.xml +++ b/bundles/org.openhab.core.model.sitemap.runtime/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.sitemap/pom.xml b/bundles/org.openhab.core.model.sitemap/pom.xml index 582776cbd48..4e76aa43fd3 100644 --- a/bundles/org.openhab.core.model.sitemap/pom.xml +++ b/bundles/org.openhab.core.model.sitemap/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.thing.ide/pom.xml b/bundles/org.openhab.core.model.thing.ide/pom.xml index 0dc7b14bcad..eec22690e33 100644 --- a/bundles/org.openhab.core.model.thing.ide/pom.xml +++ b/bundles/org.openhab.core.model.thing.ide/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.thing.runtime/pom.xml b/bundles/org.openhab.core.model.thing.runtime/pom.xml index 48098891d3e..d002421a761 100644 --- a/bundles/org.openhab.core.model.thing.runtime/pom.xml +++ b/bundles/org.openhab.core.model.thing.runtime/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.thing/pom.xml b/bundles/org.openhab.core.model.thing/pom.xml index c6005e703d6..bd63f8b49d9 100644 --- a/bundles/org.openhab.core.model.thing/pom.xml +++ b/bundles/org.openhab.core.model.thing/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.model.yaml/pom.xml b/bundles/org.openhab.core.model.yaml/pom.xml index e97653e3c51..d9ee59f9cf3 100644 --- a/bundles/org.openhab.core.model.yaml/pom.xml +++ b/bundles/org.openhab.core.model.yaml/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.persistence/pom.xml b/bundles/org.openhab.core.persistence/pom.xml index d7d59a7f4ba..8f57dd5569b 100644 --- a/bundles/org.openhab.core.persistence/pom.xml +++ b/bundles/org.openhab.core.persistence/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.semantics/pom.xml b/bundles/org.openhab.core.semantics/pom.xml index 0f4af25542d..30f409f0257 100644 --- a/bundles/org.openhab.core.semantics/pom.xml +++ b/bundles/org.openhab.core.semantics/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.storage.json/pom.xml b/bundles/org.openhab.core.storage.json/pom.xml index 16d9addd3b8..e2db408df66 100644 --- a/bundles/org.openhab.core.storage.json/pom.xml +++ b/bundles/org.openhab.core.storage.json/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.test.magic/pom.xml b/bundles/org.openhab.core.test.magic/pom.xml index fccb5185b39..d5cc915de27 100644 --- a/bundles/org.openhab.core.test.magic/pom.xml +++ b/bundles/org.openhab.core.test.magic/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.test/pom.xml b/bundles/org.openhab.core.test/pom.xml index 5385e96b670..bd23910a93e 100644 --- a/bundles/org.openhab.core.test/pom.xml +++ b/bundles/org.openhab.core.test/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.thing/pom.xml b/bundles/org.openhab.core.thing/pom.xml index 4f304d3756e..12cf68adbed 100644 --- a/bundles/org.openhab.core.thing/pom.xml +++ b/bundles/org.openhab.core.thing/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.transform/pom.xml b/bundles/org.openhab.core.transform/pom.xml index 52d1c03d1e5..d48685af628 100644 --- a/bundles/org.openhab.core.transform/pom.xml +++ b/bundles/org.openhab.core.transform/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.ui.icon/pom.xml b/bundles/org.openhab.core.ui.icon/pom.xml index 7331845be54..56191058617 100644 --- a/bundles/org.openhab.core.ui.icon/pom.xml +++ b/bundles/org.openhab.core.ui.icon/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.ui/pom.xml b/bundles/org.openhab.core.ui/pom.xml index 96f08194a7e..a560ae2fa1a 100644 --- a/bundles/org.openhab.core.ui/pom.xml +++ b/bundles/org.openhab.core.ui/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core.voice/pom.xml b/bundles/org.openhab.core.voice/pom.xml index 66a5cc60ebf..90ecbe717bc 100644 --- a/bundles/org.openhab.core.voice/pom.xml +++ b/bundles/org.openhab.core.voice/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/org.openhab.core/pom.xml b/bundles/org.openhab.core/pom.xml index c855799fe67..3a639353d31 100644 --- a/bundles/org.openhab.core/pom.xml +++ b/bundles/org.openhab.core/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/bundles/pom.xml b/bundles/pom.xml index d94097428d2..c571bd0462b 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/features/karaf/openhab-core/pom.xml b/features/karaf/openhab-core/pom.xml index c57a300e8fd..08f92918f2f 100644 --- a/features/karaf/openhab-core/pom.xml +++ b/features/karaf/openhab-core/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/features/karaf/openhab-tp/pom.xml b/features/karaf/openhab-tp/pom.xml index e25fb066a0e..90d6024b999 100644 --- a/features/karaf/openhab-tp/pom.xml +++ b/features/karaf/openhab-tp/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/features/karaf/pom.xml b/features/karaf/pom.xml index f1b1feefc0e..e377d444960 100644 --- a/features/karaf/pom.xml +++ b/features/karaf/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/features/pom.xml b/features/pom.xml index e860aeb07b3..e27d533c988 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.addon.tests/itest.bndrun b/itests/org.openhab.core.addon.tests/itest.bndrun index 1e41c51a55a..af41e76de0c 100644 --- a/itests/org.openhab.core.addon.tests/itest.bndrun +++ b/itests/org.openhab.core.addon.tests/itest.bndrun @@ -27,11 +27,6 @@ Fragment-Host: org.openhab.core.addon org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.addon;version='[4.1.0,4.1.1)',\ - org.openhab.core.addon.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -67,4 +62,9 @@ Fragment-Host: org.openhab.core.addon junit-platform-launcher;version='[1.10.0,1.10.1)',\ 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)' + ch.qos.logback.core;version='[1.3.14,1.3.15)',\ + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.addon;version='[4.2.0,4.2.1)',\ + org.openhab.core.addon.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)' diff --git a/itests/org.openhab.core.addon.tests/pom.xml b/itests/org.openhab.core.addon.tests/pom.xml index afa9bc7ecc0..c5ab5f4bbc0 100644 --- a/itests/org.openhab.core.addon.tests/pom.xml +++ b/itests/org.openhab.core.addon.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun index e4036359e56..970e9765a70 100644 --- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun +++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun @@ -26,12 +26,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.auth.oauth2client;version='[4.1.0,4.1.1)',\ - org.openhab.core.auth.oauth2client.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.net;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -75,4 +69,11 @@ Fragment-Host: org.openhab.core.auth.oauth2client junit-platform-launcher;version='[1.10.0,1.10.1)',\ 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)' + ch.qos.logback.core;version='[1.3.14,1.3.15)',\ + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.auth.oauth2client;version='[4.2.0,4.2.1)',\ + org.openhab.core.auth.oauth2client.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.console;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.net;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.core.auth.oauth2client.tests/pom.xml b/itests/org.openhab.core.auth.oauth2client.tests/pom.xml index 52ad3543fb9..08e9c4d1b18 100644 --- a/itests/org.openhab.core.auth.oauth2client.tests/pom.xml +++ b/itests/org.openhab.core.auth.oauth2client.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index 69618d5781e..e3f168f5e96 100644 --- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun @@ -29,15 +29,6 @@ Fragment-Host: org.openhab.core.automation net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation.integration.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.ephemeris;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ - org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -73,4 +64,14 @@ Fragment-Host: org.openhab.core.automation junit-platform-launcher;version='[1.10.0,1.10.1)',\ 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)' + ch.qos.logback.core;version='[1.3.14,1.3.15)',\ + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation.integration.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.ephemeris;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.console;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.openhab.core.thing;version='[4.2.0,4.2.1)',\ + org.openhab.core.transform;version='[4.2.0,4.2.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.core.automation.integration.tests/pom.xml b/itests/org.openhab.core.automation.integration.tests/pom.xml index 522e5590c09..8077e9f0bd7 100644 --- a/itests/org.openhab.core.automation.integration.tests/pom.xml +++ b/itests/org.openhab.core.automation.integration.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun index 51f8e6be6c2..045360349f7 100644 --- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun @@ -29,15 +29,6 @@ Fragment-Host: org.openhab.core.automation net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation.module.core.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.ephemeris;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ - org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -73,4 +64,14 @@ Fragment-Host: org.openhab.core.automation junit-platform-launcher;version='[1.10.0,1.10.1)',\ 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)' + ch.qos.logback.core;version='[1.3.14,1.3.15)',\ + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation.module.core.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.ephemeris;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.console;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.openhab.core.thing;version='[4.2.0,4.2.1)',\ + org.openhab.core.transform;version='[4.2.0,4.2.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.core.automation.module.core.tests/pom.xml b/itests/org.openhab.core.automation.module.core.tests/pom.xml index 9584236425a..25f068ee828 100644 --- a/itests/org.openhab.core.automation.module.core.tests/pom.xml +++ b/itests/org.openhab.core.automation.module.core.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun index 2c58e2c1240..5955ec1d5ee 100644 --- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun @@ -25,16 +25,6 @@ Fragment-Host: org.openhab.core.automation.module.script org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation.module.script;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation.module.script.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.ephemeris;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ - org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -70,4 +60,15 @@ Fragment-Host: org.openhab.core.automation.module.script junit-platform-launcher;version='[1.10.0,1.10.1)',\ 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)' + ch.qos.logback.core;version='[1.3.14,1.3.15)',\ + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation.module.script;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation.module.script.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.ephemeris;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.console;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.openhab.core.thing;version='[4.2.0,4.2.1)',\ + org.openhab.core.transform;version='[4.2.0,4.2.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.core.automation.module.script.tests/pom.xml b/itests/org.openhab.core.automation.module.script.tests/pom.xml index 5398018d48d..eba3c183fae 100644 --- a/itests/org.openhab.core.automation.module.script.tests/pom.xml +++ b/itests/org.openhab.core.automation.module.script.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun index 06f8ad4e6db..799c71d5197 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun @@ -29,15 +29,6 @@ Fragment-Host: org.openhab.core.automation net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation.module.timer.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.ephemeris;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ - org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -73,4 +64,14 @@ Fragment-Host: org.openhab.core.automation junit-platform-launcher;version='[1.10.0,1.10.1)',\ 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)' + ch.qos.logback.core;version='[1.3.14,1.3.15)',\ + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation.module.timer.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.ephemeris;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.console;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.openhab.core.thing;version='[4.2.0,4.2.1)',\ + org.openhab.core.transform;version='[4.2.0,4.2.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.core.automation.module.timer.tests/pom.xml b/itests/org.openhab.core.automation.module.timer.tests/pom.xml index 7a9f6e206e0..391f1d29685 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/pom.xml +++ b/itests/org.openhab.core.automation.module.timer.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index b8fa560ca96..6ee8b994b0a 100644 --- a/itests/org.openhab.core.automation.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.tests/itest.bndrun @@ -29,15 +29,6 @@ Fragment-Host: org.openhab.core.automation net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.ephemeris;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ - org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -73,4 +64,14 @@ Fragment-Host: org.openhab.core.automation junit-platform-launcher;version='[1.10.0,1.10.1)',\ 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)' + ch.qos.logback.core;version='[1.3.14,1.3.15)',\ + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.ephemeris;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.console;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.openhab.core.thing;version='[4.2.0,4.2.1)',\ + org.openhab.core.transform;version='[4.2.0,4.2.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.core.automation.tests/pom.xml b/itests/org.openhab.core.automation.tests/pom.xml index fdcddaa4175..3f5ad64f1d7 100644 --- a/itests/org.openhab.core.automation.tests/pom.xml +++ b/itests/org.openhab.core.automation.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun index 16bffe409cf..2f66479f9f0 100644 --- a/itests/org.openhab.core.config.core.tests/itest.bndrun +++ b/itests/org.openhab.core.config.core.tests/itest.bndrun @@ -29,10 +29,6 @@ Fragment-Host: org.openhab.core.config.core org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.core.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -68,4 +64,9 @@ Fragment-Host: org.openhab.core.config.core junit-platform-launcher;version='[1.10.0,1.10.1)',\ 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)' + ch.qos.logback.core;version='[1.3.14,1.3.15)',\ + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.core.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.core.config.core.tests/pom.xml b/itests/org.openhab.core.config.core.tests/pom.xml index 760d51a9ebc..9273e39a853 100644 --- a/itests/org.openhab.core.config.core.tests/pom.xml +++ b/itests/org.openhab.core.config.core.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun index f98b55739d8..83beeeb3200 100644 --- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun @@ -28,16 +28,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.discovery;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.discovery.mdns;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.discovery.mdns.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.transport.mdns;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ - org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -73,4 +63,15 @@ Fragment-Host: org.openhab.core.config.discovery.mdns junit-platform-launcher;version='[1.10.0,1.10.1)',\ 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)' + ch.qos.logback.core;version='[1.3.14,1.3.15)',\ + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.discovery;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.discovery.mdns;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.discovery.mdns.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.console;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.transport.mdns;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.openhab.core.thing;version='[4.2.0,4.2.1)',\ + org.openhab.core.transform;version='[4.2.0,4.2.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.core.config.discovery.mdns.tests/pom.xml b/itests/org.openhab.core.config.discovery.mdns.tests/pom.xml index ff409c96f0d..a7df92c62a9 100644 --- a/itests/org.openhab.core.config.discovery.mdns.tests/pom.xml +++ b/itests/org.openhab.core.config.discovery.mdns.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun index 15200a8b09e..330650031fc 100644 --- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun @@ -29,14 +29,6 @@ Fragment-Host: org.openhab.core.config.discovery org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.discovery;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.discovery.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ - org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -72,4 +64,13 @@ Fragment-Host: org.openhab.core.config.discovery junit-platform-launcher;version='[1.10.0,1.10.1)',\ 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)' + ch.qos.logback.core;version='[1.3.14,1.3.15)',\ + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.discovery;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.discovery.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.console;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.openhab.core.thing;version='[4.2.0,4.2.1)',\ + org.openhab.core.transform;version='[4.2.0,4.2.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.core.config.discovery.tests/pom.xml b/itests/org.openhab.core.config.discovery.tests/pom.xml index 66ab8ea2704..72e759c00cd 100644 --- a/itests/org.openhab.core.config.discovery.tests/pom.xml +++ b/itests/org.openhab.core.config.discovery.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 org.openhab.core.itests diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun index 7bed49a9059..80181d1db78 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun @@ -28,16 +28,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.discovery;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.discovery.usbserial;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.discovery.usbserial.linuxsysfs;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.discovery.usbserial.linuxsysfs.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ - org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -73,4 +63,15 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs junit-platform-launcher;version='[1.10.0,1.10.1)',\ 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)' + ch.qos.logback.core;version='[1.3.14,1.3.15)',\ + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.discovery;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.discovery.usbserial;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.discovery.usbserial.linuxsysfs;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.discovery.usbserial.linuxsysfs.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.console;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.openhab.core.thing;version='[4.2.0,4.2.1)',\ + org.openhab.core.transform;version='[4.2.0,4.2.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/pom.xml b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/pom.xml index 1bf1bd4c16a..505d30cc64e 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/pom.xml +++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 org.openhab.core.itests diff --git a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun index 5d22509da7c..e0d2c1147b3 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun @@ -37,15 +37,6 @@ Provide-Capability: \ net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.discovery;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.discovery.usbserial;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.discovery.usbserial.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ - org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -81,4 +72,14 @@ Provide-Capability: \ junit-platform-launcher;version='[1.10.0,1.10.1)',\ 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)' + ch.qos.logback.core;version='[1.3.14,1.3.15)',\ + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.discovery;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.discovery.usbserial;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.discovery.usbserial.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.console;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.openhab.core.thing;version='[4.2.0,4.2.1)',\ + org.openhab.core.transform;version='[4.2.0,4.2.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.core.config.discovery.usbserial.tests/pom.xml b/itests/org.openhab.core.config.discovery.usbserial.tests/pom.xml index 44702cdbfca..702fc1ef13c 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.tests/pom.xml +++ b/itests/org.openhab.core.config.discovery.usbserial.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun index c67ad56fd64..0b312cd9f19 100644 --- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun +++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun @@ -22,10 +22,6 @@ Fragment-Host: org.openhab.core.config.dispatch 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.osgi.service.component;version='[1.5.0,1.5.1)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.dispatch;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.dispatch.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -61,4 +57,9 @@ Fragment-Host: org.openhab.core.config.dispatch junit-platform-launcher;version='[1.10.0,1.10.1)',\ 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)' + ch.qos.logback.core;version='[1.3.14,1.3.15)',\ + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.dispatch;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.dispatch.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.core.config.dispatch.tests/pom.xml b/itests/org.openhab.core.config.dispatch.tests/pom.xml index a667016f739..06f49674cf3 100644 --- a/itests/org.openhab.core.config.dispatch.tests/pom.xml +++ b/itests/org.openhab.core.config.dispatch.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index e66b4b6c93b..7a3261b1e83 100644 --- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun +++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun @@ -30,11 +30,6 @@ feature.openhab-config: \ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.ephemeris;version='[4.1.0,4.1.1)',\ - org.openhab.core.ephemeris.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -70,4 +65,10 @@ feature.openhab-config: \ junit-platform-launcher;version='[1.10.0,1.10.1)',\ 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)' + ch.qos.logback.core;version='[1.3.14,1.3.15)',\ + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.ephemeris;version='[4.2.0,4.2.1)',\ + org.openhab.core.ephemeris.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.core.ephemeris.tests/pom.xml b/itests/org.openhab.core.ephemeris.tests/pom.xml index af4bf476f89..bc77893b150 100644 --- a/itests/org.openhab.core.ephemeris.tests/pom.xml +++ b/itests/org.openhab.core.ephemeris.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.io.net.tests/itest.bndrun b/itests/org.openhab.core.io.net.tests/itest.bndrun index df745cb9453..d32e8313eaf 100644 --- a/itests/org.openhab.core.io.net.tests/itest.bndrun +++ b/itests/org.openhab.core.io.net.tests/itest.bndrun @@ -28,10 +28,6 @@ Fragment-Host: org.openhab.core.io.net org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.net;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.net.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -73,4 +69,9 @@ Fragment-Host: org.openhab.core.io.net junit-platform-launcher;version='[1.10.0,1.10.1)',\ 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)' + ch.qos.logback.core;version='[1.3.14,1.3.15)',\ + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.net;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.net.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.core.io.net.tests/pom.xml b/itests/org.openhab.core.io.net.tests/pom.xml index 144a83a240d..e017742db2f 100644 --- a/itests/org.openhab.core.io.net.tests/pom.xml +++ b/itests/org.openhab.core.io.net.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun index eba7cb8ffda..da658b029f3 100644 --- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun +++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun @@ -41,19 +41,6 @@ Fragment-Host: org.openhab.core.io.rest.core org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.addon;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.discovery;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.rest;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.rest.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.rest.core.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.persistence;version='[4.1.0,4.1.1)',\ - org.openhab.core.semantics;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ - org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -105,4 +92,17 @@ Fragment-Host: org.openhab.core.io.rest.core 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)',\ - org.openhab.core.config.discovery.addon;version='[4.1.0,4.1.1)' + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.addon;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.discovery;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.discovery.addon;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.console;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.rest;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.rest.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.rest.core.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.persistence;version='[4.2.0,4.2.1)',\ + org.openhab.core.semantics;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.openhab.core.thing;version='[4.2.0,4.2.1)',\ + org.openhab.core.transform;version='[4.2.0,4.2.1)' diff --git a/itests/org.openhab.core.io.rest.core.tests/pom.xml b/itests/org.openhab.core.io.rest.core.tests/pom.xml index 5a6576053e6..2236c7c970c 100644 --- a/itests/org.openhab.core.io.rest.core.tests/pom.xml +++ b/itests/org.openhab.core.io.rest.core.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index ea1f0ccd33f..9486738e7ed 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -31,37 +31,11 @@ Fragment-Host: org.openhab.core.model.item org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.audio;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation.module.script;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation.module.script.rulesupport;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.ephemeris;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.net;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.item;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.item.runtime;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.item.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.persistence;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.rule;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.script;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.script.runtime;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.sitemap;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.persistence;version='[4.1.0,4.1.1)',\ - org.openhab.core.semantics;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ - org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)',\ - org.openhab.core.voice;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ @@ -119,4 +93,31 @@ Fragment-Host: org.openhab.core.model.item junit-platform-launcher;version='[1.10.0,1.10.1)',\ 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)' + ch.qos.logback.core;version='[1.3.14,1.3.15)',\ + org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.audio;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation.module.script;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation.module.script.rulesupport;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.ephemeris;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.console;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.net;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.item;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.item.runtime;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.item.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.persistence;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.rule;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.rule.runtime;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.script;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.script.runtime;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.sitemap;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.thing;version='[4.2.0,4.2.1)',\ + org.openhab.core.persistence;version='[4.2.0,4.2.1)',\ + org.openhab.core.semantics;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.openhab.core.thing;version='[4.2.0,4.2.1)',\ + org.openhab.core.transform;version='[4.2.0,4.2.1)',\ + org.openhab.core.voice;version='[4.2.0,4.2.1)' diff --git a/itests/org.openhab.core.model.item.tests/pom.xml b/itests/org.openhab.core.model.item.tests/pom.xml index 5c0d4aa991e..6f6c00906ff 100644 --- a/itests/org.openhab.core.model.item.tests/pom.xml +++ b/itests/org.openhab.core.model.item.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index 7525453ac1b..d8796e2b211 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -36,31 +36,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.audio;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation.module.script;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation.module.script.rulesupport;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.ephemeris;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.net;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.item;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.persistence;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.rule;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.rule.runtime;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.rule.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.script;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.script.runtime;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.sitemap;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.persistence;version='[4.1.0,4.1.1)',\ - org.openhab.core.semantics;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ - org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)',\ - org.openhab.core.voice;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -124,4 +99,28 @@ Fragment-Host: org.openhab.core.model.rule.runtime 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)',\ - org.openhab.core.model.item.runtime;version='[4.1.0,4.1.1)' + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.audio;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation.module.script;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation.module.script.rulesupport;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.ephemeris;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.console;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.net;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.item;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.persistence;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.rule;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.rule.runtime;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.rule.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.script;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.script.runtime;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.sitemap;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.thing;version='[4.2.0,4.2.1)',\ + org.openhab.core.persistence;version='[4.2.0,4.2.1)',\ + org.openhab.core.semantics;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.openhab.core.thing;version='[4.2.0,4.2.1)',\ + org.openhab.core.transform;version='[4.2.0,4.2.1)',\ + org.openhab.core.voice;version='[4.2.0,4.2.1)' diff --git a/itests/org.openhab.core.model.rule.tests/pom.xml b/itests/org.openhab.core.model.rule.tests/pom.xml index 3a44e9a076c..810d030a613 100644 --- a/itests/org.openhab.core.model.rule.tests/pom.xml +++ b/itests/org.openhab.core.model.rule.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun index 58c6c312d30..7361d7de3d2 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -40,30 +40,6 @@ Fragment-Host: org.openhab.core.model.script org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.audio;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation.module.script;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation.module.script.rulesupport;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.ephemeris;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.net;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.item;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.persistence;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.rule;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.script;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.script.runtime;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.script.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.sitemap;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.persistence;version='[4.1.0,4.1.1)',\ - org.openhab.core.semantics;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ - org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)',\ - org.openhab.core.voice;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -127,4 +103,28 @@ Fragment-Host: org.openhab.core.model.script 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)',\ - org.openhab.core.model.item.runtime;version='[4.1.0,4.1.1)' + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.audio;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation.module.script;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation.module.script.rulesupport;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.ephemeris;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.console;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.net;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.item;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.persistence;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.rule;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.rule.runtime;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.script;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.script.runtime;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.script.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.sitemap;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.thing;version='[4.2.0,4.2.1)',\ + org.openhab.core.persistence;version='[4.2.0,4.2.1)',\ + org.openhab.core.semantics;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.openhab.core.thing;version='[4.2.0,4.2.1)',\ + org.openhab.core.transform;version='[4.2.0,4.2.1)',\ + org.openhab.core.voice;version='[4.2.0,4.2.1)' diff --git a/itests/org.openhab.core.model.script.tests/pom.xml b/itests/org.openhab.core.model.script.tests/pom.xml index a1d93b25e81..e2da5604641 100644 --- a/itests/org.openhab.core.model.script.tests/pom.xml +++ b/itests/org.openhab.core.model.script.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index b8522f8a53a..3cdeeb8d722 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -37,39 +37,11 @@ Fragment-Host: org.openhab.core.model.thing org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.audio;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation.module.script;version='[4.1.0,4.1.1)',\ - org.openhab.core.automation.module.script.rulesupport;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.ephemeris;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.net;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.item;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.item.runtime;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.persistence;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.rule;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.script;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.script.runtime;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.sitemap;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.thing.runtime;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.thing.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.model.thing.testsupport;version='[4.1.0,4.1.1)',\ - org.openhab.core.persistence;version='[4.1.0,4.1.1)',\ - org.openhab.core.semantics;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ - org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)',\ - org.openhab.core.voice;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ @@ -128,4 +100,33 @@ Fragment-Host: org.openhab.core.model.thing junit-platform-launcher;version='[1.10.0,1.10.1)',\ 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)' + ch.qos.logback.core;version='[1.3.14,1.3.15)',\ + org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.audio;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation.module.script;version='[4.2.0,4.2.1)',\ + org.openhab.core.automation.module.script.rulesupport;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.ephemeris;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.console;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.net;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.item;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.item.runtime;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.persistence;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.rule;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.rule.runtime;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.script;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.script.runtime;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.sitemap;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.thing;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.thing.runtime;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.thing.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.model.thing.testsupport;version='[4.2.0,4.2.1)',\ + org.openhab.core.persistence;version='[4.2.0,4.2.1)',\ + org.openhab.core.semantics;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.openhab.core.thing;version='[4.2.0,4.2.1)',\ + org.openhab.core.transform;version='[4.2.0,4.2.1)',\ + org.openhab.core.voice;version='[4.2.0,4.2.1)' diff --git a/itests/org.openhab.core.model.thing.tests/pom.xml b/itests/org.openhab.core.model.thing.tests/pom.xml index d57e81a3902..589f1a1097f 100644 --- a/itests/org.openhab.core.model.thing.tests/pom.xml +++ b/itests/org.openhab.core.model.thing.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.model.thing.testsupport/pom.xml b/itests/org.openhab.core.model.thing.testsupport/pom.xml index bc62f03911a..465eada34bb 100644 --- a/itests/org.openhab.core.model.thing.testsupport/pom.xml +++ b/itests/org.openhab.core.model.thing.testsupport/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun index 6647d7916a4..81bad6bd6d7 100644 --- a/itests/org.openhab.core.storage.json.tests/itest.bndrun +++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun @@ -23,14 +23,6 @@ Fragment-Host: org.openhab.core.storage.json org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ - org.openhab.core.storage.json;version='[4.1.0,4.1.1)',\ - org.openhab.core.storage.json.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ - org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -66,4 +58,13 @@ Fragment-Host: org.openhab.core.storage.json junit-platform-launcher;version='[1.10.0,1.10.1)',\ 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)' + ch.qos.logback.core;version='[1.3.14,1.3.15)',\ + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.console;version='[4.2.0,4.2.1)',\ + org.openhab.core.storage.json;version='[4.2.0,4.2.1)',\ + org.openhab.core.storage.json.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.openhab.core.thing;version='[4.2.0,4.2.1)',\ + org.openhab.core.transform;version='[4.2.0,4.2.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.core.storage.json.tests/pom.xml b/itests/org.openhab.core.storage.json.tests/pom.xml index 644df8546d1..ee508923556 100644 --- a/itests/org.openhab.core.storage.json.tests/pom.xml +++ b/itests/org.openhab.core.storage.json.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun index c6d70da9e10..82ffb66759d 100644 --- a/itests/org.openhab.core.tests/itest.bndrun +++ b/itests/org.openhab.core.tests/itest.bndrun @@ -27,9 +27,6 @@ Fragment-Host: org.openhab.core org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ - org.openhab.core.tests;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -65,4 +62,8 @@ Fragment-Host: org.openhab.core junit-platform-launcher;version='[1.10.0,1.10.1)',\ 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)' + ch.qos.logback.core;version='[1.3.14,1.3.15)',\ + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.openhab.core.tests;version='[4.2.0,4.2.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.core.tests/pom.xml b/itests/org.openhab.core.tests/pom.xml index 9739ba81aeb..59161267e64 100644 --- a/itests/org.openhab.core.tests/pom.xml +++ b/itests/org.openhab.core.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun index 2f4c3d7cce8..55b410880f6 100644 --- a/itests/org.openhab.core.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.tests/itest.bndrun @@ -32,13 +32,6 @@ Fragment-Host: org.openhab.core.thing org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ - org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.thing.tests;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -74,4 +67,11 @@ Fragment-Host: org.openhab.core.thing junit-platform-launcher;version='[1.10.0,1.10.1)',\ 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)' + ch.qos.logback.core;version='[1.3.14,1.3.15)',\ + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.console;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.openhab.core.thing;version='[4.2.0,4.2.1)',\ + org.openhab.core.thing.tests;version='[4.2.0,4.2.1)',\ + org.openhab.core.transform;version='[4.2.0,4.2.1)' diff --git a/itests/org.openhab.core.thing.tests/pom.xml b/itests/org.openhab.core.thing.tests/pom.xml index 804c2436a55..52162f6cc8d 100644 --- a/itests/org.openhab.core.thing.tests/pom.xml +++ b/itests/org.openhab.core.thing.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun index e36bce739be..9a7db26d72b 100644 --- a/itests/org.openhab.core.voice.tests/itest.bndrun +++ b/itests/org.openhab.core.voice.tests/itest.bndrun @@ -27,15 +27,6 @@ Fragment-Host: org.openhab.core.voice org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - org.openhab.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.audio;version='[4.1.0,4.1.1)',\ - org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ - org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ - org.openhab.core.test;version='[4.1.0,4.1.1)',\ - org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)',\ - org.openhab.core.voice;version='[4.1.0,4.1.1)',\ - org.openhab.core.voice.tests;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -79,4 +70,13 @@ Fragment-Host: org.openhab.core.voice junit-platform-launcher;version='[1.10.0,1.10.1)',\ 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)' + ch.qos.logback.core;version='[1.3.14,1.3.15)',\ + org.openhab.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.audio;version='[4.2.0,4.2.1)',\ + org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ + org.openhab.core.io.console;version='[4.2.0,4.2.1)',\ + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + org.openhab.core.thing;version='[4.2.0,4.2.1)',\ + org.openhab.core.transform;version='[4.2.0,4.2.1)',\ + org.openhab.core.voice;version='[4.2.0,4.2.1)',\ + org.openhab.core.voice.tests;version='[4.2.0,4.2.1)' diff --git a/itests/org.openhab.core.voice.tests/pom.xml b/itests/org.openhab.core.voice.tests/pom.xml index c1c4532a7ef..afce3173580 100644 --- a/itests/org.openhab.core.voice.tests/pom.xml +++ b/itests/org.openhab.core.voice.tests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/itests/pom.xml b/itests/pom.xml index b82bff2ae3a..604b32a3e65 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/pom.xml b/pom.xml index b0066b3e10b..0e0e5da2d5e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/tools/archetype/binding/pom.xml b/tools/archetype/binding/pom.xml index 73f46134d15..4028adb4ead 100644 --- a/tools/archetype/binding/pom.xml +++ b/tools/archetype/binding/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/tools/archetype/pom.xml b/tools/archetype/pom.xml index d84c2edbdba..0beef5a6fe3 100644 --- a/tools/archetype/pom.xml +++ b/tools/archetype/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/tools/i18n-plugin/pom.xml b/tools/i18n-plugin/pom.xml index b65d9eac20e..d981e572c4a 100644 --- a/tools/i18n-plugin/pom.xml +++ b/tools/i18n-plugin/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/tools/pom.xml b/tools/pom.xml index 880483753ec..be5458b57a4 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 diff --git a/tools/upgradetool/pom.xml b/tools/upgradetool/pom.xml index 76d8fdbe8c3..1e500243def 100644 --- a/tools/upgradetool/pom.xml +++ b/tools/upgradetool/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 From 642e4a1f79b28d15188853af2fbad7e0123c644e Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Fri, 22 Dec 2023 22:53:24 +0000 Subject: [PATCH 07/14] Update version Signed-off-by: Andrew Fiddian-Green --- .../pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml index f3b5fa57fef..59a092e7d41 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml +++ b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml @@ -7,7 +7,7 @@ org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.config.discovery.usbserial.windowsregistry From 3be41afcfcc82968470240677da2f318c178e5e5 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Sun, 24 Dec 2023 15:47:01 +0000 Subject: [PATCH 08/14] Add serial port and interface information Signed-off-by: Andrew Fiddian-Green --- .../internal/WindowsUsbSerialDiscovery.java | 57 +++++++++++++------ 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java index 4730d4a464c..9f552cfbdf0 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java +++ b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java @@ -62,6 +62,8 @@ public class WindowsUsbSerialDiscovery implements UsbSerialDiscovery { private static final String SPLIT_VALUES = ";"; private static final String KEY_MANUFACTURER = "Mfg"; private static final String KEY_PRODUCT = "DeviceDesc"; + private static final String KEY_DEVICE_PARAMETERS = "Device Parameters"; + private static final String KEY_SERIAL_PORT = "PortName"; private final Logger logger = LoggerFactory.getLogger(WindowsUsbSerialDiscovery.class); private final Set discoveryListeners = new CopyOnWriteArraySet<>(); @@ -139,16 +141,18 @@ public Set scanAllUsbDevicesInformation() { } Set result = new HashSet<>(); - String[] usbKeys = Advapi32Util.registryGetKeys(HKEY_LOCAL_MACHINE, USB_REGISTRY_ROOT); + String[] deviceKeys = Advapi32Util.registryGetKeys(HKEY_LOCAL_MACHINE, USB_REGISTRY_ROOT); - for (String usbKey : usbKeys) { - logger.trace("{}", usbKey); + String serialNumber = null; // this parameter is not available on Windows - if (!usbKey.startsWith(PREFIX_VID)) { + for (String deviceKey : deviceKeys) { + logger.trace("{}", deviceKey); + + if (!deviceKey.startsWith(PREFIX_VID)) { continue; } - String[] ids = usbKey.split(SPLIT_IDS); + String[] ids = deviceKey.split(SPLIT_IDS); if (ids.length < 2) { continue; } @@ -166,14 +170,15 @@ public Set scanAllUsbDevicesInformation() { continue; } - String usbPath = USB_REGISTRY_ROOT + BACKSLASH + usbKey; - String[] usbSubKeys = Advapi32Util.registryGetKeys(HKEY_LOCAL_MACHINE, usbPath); + String devicePath = USB_REGISTRY_ROOT + BACKSLASH + deviceKey; + String[] interfaceNames = Advapi32Util.registryGetKeys(HKEY_LOCAL_MACHINE, devicePath); - for (String usbSubKey : usbSubKeys) { - logger.trace(" {}", usbSubKey); + int interfaceId = 0; + for (String interfaceName : interfaceNames) { + logger.trace(" interfaceId:{}, interfaceName:{}", interfaceId, interfaceName); - String usbSubPath = usbPath + BACKSLASH + usbSubKey; - TreeMap values = Advapi32Util.registryGetValues(HKEY_LOCAL_MACHINE, usbSubPath); + String interfacePath = devicePath + BACKSLASH + interfaceName; + TreeMap values = Advapi32Util.registryGetValues(HKEY_LOCAL_MACHINE, interfacePath); if (logger.isTraceEnabled()) { for (Entry value : values.entrySet()) { @@ -182,8 +187,8 @@ public Set scanAllUsbDevicesInformation() { } String manufacturer; - Object manufacturerObject = values.get(KEY_MANUFACTURER); - if (manufacturerObject instanceof String manufacturerString) { + Object manufacturerValue = values.get(KEY_MANUFACTURER); + if (manufacturerValue instanceof String manufacturerString) { String[] manufacturerData = manufacturerString.split(SPLIT_VALUES); if (manufacturerData.length < 2) { continue; @@ -194,8 +199,8 @@ public Set scanAllUsbDevicesInformation() { } String product; - Object productObject = values.get(KEY_PRODUCT); - if (productObject instanceof String productString) { + Object productValue = values.get(KEY_PRODUCT); + if (productValue instanceof String productString) { String[] productData = productString.split(SPLIT_VALUES); if (productData.length < 2) { continue; @@ -205,12 +210,30 @@ public Set scanAllUsbDevicesInformation() { continue; } + String serialPort = ""; + String[] interfaceSubKeys = Advapi32Util.registryGetKeys(HKEY_LOCAL_MACHINE, interfacePath); + + for (String interfaceSubKey : interfaceSubKeys) { + if (!KEY_DEVICE_PARAMETERS.equals(interfaceSubKey)) { + continue; + } + String deviceParametersPath = interfacePath + BACKSLASH + interfaceSubKey; + TreeMap deviceParameterValues = Advapi32Util.registryGetValues(HKEY_LOCAL_MACHINE, + deviceParametersPath); + Object serialPortValue = deviceParameterValues.get(KEY_SERIAL_PORT); + if (serialPortValue instanceof String serialPortString) { + serialPort = serialPortString; + } + break; + } + UsbSerialDeviceInformation usbSerialDeviceInformation = new UsbSerialDeviceInformation(vendorId, - productId, null, manufacturer, product, 0, null, ""); + productId, serialNumber, manufacturer, product, interfaceId, interfaceName, serialPort); logger.debug("Add {}", usbSerialDeviceInformation); result.add(usbSerialDeviceInformation); - break; + + interfaceId++; } } return result; From 68d2bc5728b2bea2a4763f6c7fd2286537666f7b Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Mon, 25 Dec 2023 09:41:57 +0000 Subject: [PATCH 09/14] Support serial number Signed-off-by: Andrew Fiddian-Green --- .../windowsregistry/internal/WindowsUsbSerialDiscovery.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java index 9f552cfbdf0..17279e34c5b 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java +++ b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java @@ -143,8 +143,6 @@ public Set scanAllUsbDevicesInformation() { Set result = new HashSet<>(); String[] deviceKeys = Advapi32Util.registryGetKeys(HKEY_LOCAL_MACHINE, USB_REGISTRY_ROOT); - String serialNumber = null; // this parameter is not available on Windows - for (String deviceKey : deviceKeys) { logger.trace("{}", deviceKey); @@ -170,6 +168,8 @@ public Set scanAllUsbDevicesInformation() { continue; } + String serialNumber = ids.length > 2 ? ids[2] : null; + String devicePath = USB_REGISTRY_ROOT + BACKSLASH + deviceKey; String[] interfaceNames = Advapi32Util.registryGetKeys(HKEY_LOCAL_MACHINE, devicePath); From 7c63d445409a10cc6f2d462f5ac4850a5bbf56fd Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Wed, 27 Dec 2023 17:28:56 +0000 Subject: [PATCH 10/14] Don't scheule scans on non Windows OS Signed-off-by: Andrew Fiddian-Green --- .../internal/WindowsUsbSerialDiscovery.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java index 17279e34c5b..e664838ab52 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java +++ b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java @@ -241,8 +241,13 @@ public Set scanAllUsbDevicesInformation() { @Override public synchronized void startBackgroundScanning() { - scanTask = scheduler.scheduleWithFixedDelay(() -> doSingleScan(), 0, scanInterval.toSeconds(), - TimeUnit.SECONDS); + if (Platform.isWindows()) { + ScheduledFuture scanTask = this.scanTask; + if (scanTask == null || scanTask.isDone()) { + this.scanTask = scheduler.scheduleWithFixedDelay(() -> doSingleScan(), 0, scanInterval.toSeconds(), + TimeUnit.SECONDS); + } + } } @Override From 585605d1b7702bd144b217d18d4fce08438bb0b7 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Sun, 31 Dec 2023 15:09:15 +0000 Subject: [PATCH 11/14] Adopt reviewer suggestions Signed-off-by: Andrew Fiddian-Green --- .../internal/WindowsUsbSerialDiscovery.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java index e664838ab52..51d9a745f35 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java +++ b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java @@ -106,9 +106,9 @@ public synchronized void doSingleScan() { lastScanResult = scanResult; - removed.stream().forEach(this::announceRemovedDevice); - added.stream().forEach(this::announceAddedDevice); - unchanged.stream().forEach(this::announceAddedDevice); + removed.forEach(this::announceRemovedDevice); + added.forEach(this::announceAddedDevice); + unchanged.forEach(this::announceAddedDevice); } private Set setDifference(Set set1, Set set2) { @@ -244,7 +244,7 @@ public synchronized void startBackgroundScanning() { if (Platform.isWindows()) { ScheduledFuture scanTask = this.scanTask; if (scanTask == null || scanTask.isDone()) { - this.scanTask = scheduler.scheduleWithFixedDelay(() -> doSingleScan(), 0, scanInterval.toSeconds(), + this.scanTask = scheduler.scheduleWithFixedDelay(this::doSingleScan, 0, scanInterval.toSeconds(), TimeUnit.SECONDS); } } From aebf7b23417eff07e810121a9399f1e892b81c04 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Sun, 7 Jan 2024 11:46:47 +0000 Subject: [PATCH 12/14] Adopt reviewe suggestions Signed-off-by: Andrew Fiddian-Green --- .../internal/Ser2NetUsbSerialDiscovery.java | 6 ++-- .../test/WindowsUsbDiscoveryTests.java | 31 ------------------- 2 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/test/java/org/openhab/core/config/discovery/usbserial/windowsregistry/test/WindowsUsbDiscoveryTests.java diff --git a/bundles/org.openhab.core.config.discovery.usbserial.ser2net/src/main/java/org/openhab/core/config/discovery/usbserial/ser2net/internal/Ser2NetUsbSerialDiscovery.java b/bundles/org.openhab.core.config.discovery.usbserial.ser2net/src/main/java/org/openhab/core/config/discovery/usbserial/ser2net/internal/Ser2NetUsbSerialDiscovery.java index c7a17b0d2b6..0bb1a8b5ea5 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.ser2net/src/main/java/org/openhab/core/config/discovery/usbserial/ser2net/internal/Ser2NetUsbSerialDiscovery.java +++ b/bundles/org.openhab.core.config.discovery.usbserial.ser2net/src/main/java/org/openhab/core/config/discovery/usbserial/ser2net/internal/Ser2NetUsbSerialDiscovery.java @@ -125,9 +125,9 @@ public synchronized void doSingleScan() { lastScanResult = scanResult; - removed.stream().forEach(this::announceRemovedDevice); - added.stream().forEach(this::announceAddedDevice); - unchanged.stream().forEach(this::announceAddedDevice); + removed.forEach(this::announceRemovedDevice); + added.forEach(this::announceAddedDevice); + unchanged.forEach(this::announceAddedDevice); logger.debug("Completed ser2net USB-Serial mDNS single discovery scan"); } diff --git a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/test/java/org/openhab/core/config/discovery/usbserial/windowsregistry/test/WindowsUsbDiscoveryTests.java b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/test/java/org/openhab/core/config/discovery/usbserial/windowsregistry/test/WindowsUsbDiscoveryTests.java deleted file mode 100644 index 0cbc9809921..00000000000 --- a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/test/java/org/openhab/core/config/discovery/usbserial/windowsregistry/test/WindowsUsbDiscoveryTests.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Copyright (c) 2010-2023 Contributors to the openHAB project - * - * See the NOTICE file(s) distributed with this work for additional - * information. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0 - * - * SPDX-License-Identifier: EPL-2.0 - */ -package org.openhab.core.config.discovery.usbserial.windowsregistry.test; - -import org.eclipse.jdt.annotation.NonNullByDefault; -import org.junit.jupiter.api.Test; -import org.openhab.core.config.discovery.usbserial.windowsregistry.internal.WindowsUsbSerialDiscovery; - -/** - * JUnit tests for {@link WindowsUsbSerialDiscovery} - * - * @author Andrew Fiddian-Green - Initial contribution - */ -@NonNullByDefault -class WindowsUsbDiscoveryTests { - - @Test - void testDiscovery() { - // TODO write tests - } -} From 737334ccb21cd1e04a4a63ef74333924d40b880e Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Sun, 7 Jan 2024 11:50:25 +0000 Subject: [PATCH 13/14] Fix copyright date Signed-off-by: Andrew Fiddian-Green --- .../usbserial/ser2net/internal/Ser2NetUsbSerialDiscovery.java | 2 +- .../ser2net/internal/Ser2NetUsbSerialDiscoveryTest.java | 2 +- .../windowsregistry/internal/WindowsUsbSerialDiscovery.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bundles/org.openhab.core.config.discovery.usbserial.ser2net/src/main/java/org/openhab/core/config/discovery/usbserial/ser2net/internal/Ser2NetUsbSerialDiscovery.java b/bundles/org.openhab.core.config.discovery.usbserial.ser2net/src/main/java/org/openhab/core/config/discovery/usbserial/ser2net/internal/Ser2NetUsbSerialDiscovery.java index 0bb1a8b5ea5..5feded89d07 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.ser2net/src/main/java/org/openhab/core/config/discovery/usbserial/ser2net/internal/Ser2NetUsbSerialDiscovery.java +++ b/bundles/org.openhab.core.config.discovery.usbserial.ser2net/src/main/java/org/openhab/core/config/discovery/usbserial/ser2net/internal/Ser2NetUsbSerialDiscovery.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2010-2023 Contributors to the openHAB project + * Copyright (c) 2010-2024 Contributors to the openHAB project * * See the NOTICE file(s) distributed with this work for additional * information. diff --git a/bundles/org.openhab.core.config.discovery.usbserial.ser2net/src/test/java/org/openhab/core/config/discovery/usbserial/ser2net/internal/Ser2NetUsbSerialDiscoveryTest.java b/bundles/org.openhab.core.config.discovery.usbserial.ser2net/src/test/java/org/openhab/core/config/discovery/usbserial/ser2net/internal/Ser2NetUsbSerialDiscoveryTest.java index 48dae85d310..193abce3c63 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.ser2net/src/test/java/org/openhab/core/config/discovery/usbserial/ser2net/internal/Ser2NetUsbSerialDiscoveryTest.java +++ b/bundles/org.openhab.core.config.discovery.usbserial.ser2net/src/test/java/org/openhab/core/config/discovery/usbserial/ser2net/internal/Ser2NetUsbSerialDiscoveryTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2010-2023 Contributors to the openHAB project + * Copyright (c) 2010-2024 Contributors to the openHAB project * * See the NOTICE file(s) distributed with this work for additional * information. diff --git a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java index 51d9a745f35..5c19cd089cc 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java +++ b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/src/main/java/org/openhab/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2010-2023 Contributors to the openHAB project + * Copyright (c) 2010-2024 Contributors to the openHAB project * * See the NOTICE file(s) distributed with this work for additional * information. From 8f66c978824b6e2c9894b309a23a300941f12883 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Thu, 11 Jan 2024 13:34:23 +0000 Subject: [PATCH 14/14] Install bundles depending on OS (Linux resp. Windows) Signed-off-by: Andrew Fiddian-Green --- .../openhab-core/src/main/feature/feature.xml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml index f981c9c6b07..94d766da68a 100644 --- a/features/karaf/openhab-core/src/main/feature/feature.xml +++ b/features/karaf/openhab-core/src/main/feature/feature.xml @@ -519,9 +519,19 @@ mvn:org.openhab.core.bundles/org.openhab.core.config.serial/${project.version} mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial/${project.version} - mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/${project.version} + + + req:osgi.native;filter:="(osgi.native.osname=Linux)" + mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/${project.version} + + mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.ser2net/${project.version} - mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/${project.version} + + + req:osgi.native;filter:="(osgi.native.osname=Windows*)" + mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/${project.version} + + mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial/${project.version} mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial.rxtx/${project.version} mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/${project.version}