100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Z-Wave bug fix and Bluetooth dependency fix (#1267)
rainerhitzb63af3e58f4d
diff --git a/agent/build.gradle b/agent/build.gradleindex 3e0a2c78a..cd7fa9265 100644--- a/agent/build.gradle+++ b/agent/build.gradle@@ -36,6 +36,8 @@ dependencies {implementation "dev.failsafe:failsafe:$failsafeVersion"implementation "org.eclipse.angus:angus-mail:$jakartaMailVersion"++ implementation "org.jdom:jdom2:$jdomVersion"}jar {diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/SequenceNumberPersistencyManager.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/SequenceNumberPersistencyManager.javaindex 71c9c9b49..aa0283a99 100644--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/SequenceNumberPersistencyManager.java+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/SequenceNumberPersistencyManager.java@@ -19,12 +19,12 @@*/package org.openremote.agent.protocol.bluetooth.mesh;-import org.jdom.Document;-import org.jdom.Element;-import org.jdom.JDOMException;-import org.jdom.input.SAXBuilder;-import org.jdom.output.Format;-import org.jdom.output.XMLOutputter;+import org.jdom2.Document;+import org.jdom2.Element;+import org.jdom2.JDOMException;+import org.jdom2.input.SAXBuilder;+import org.jdom2.output.Format;+import org.jdom2.output.XMLOutputter;import org.openremote.agent.protocol.bluetooth.mesh.utils.MeshParserUtils;import org.openremote.model.syslog.SyslogCategory;diff --git a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveProtocol.javaindex c52e3afbb..d0688eeb6 100644--- a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveProtocol.java+++ b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveProtocol.java@@ -75,7 +75,12 @@ public class ZWaveProtocol extends AbstractProtocol<ZWaveAgent, ZWaveAgentLink>@Overrideprotected synchronized void doStart(Container container) throws Exception {- String serialPort = agent.getSerialPort().orElseThrow(() -> new IllegalStateException("Invalid serial port property"));+ String serialPort = agent.getSerialPort().orElse(null);+ if (serialPort == null) {+ LOG.info("No serial port provided for protocol: " + this);+ setConnectionStatus(ConnectionStatus.ERROR);+ return;+ }network = new ZWaveNetwork(serialPort, executorService);network.addConnectionStatusConsumer(this::setConnectionStatus);network.connect();diff --git a/gradle.properties b/gradle.propertiesindex c88282312..83efbe55b 100644--- a/gradle.properties+++ b/gradle.properties@@ -44,7 +44,7 @@ jaywayJsonPathVersion = 2.7.0typescriptGeneratorVersion = 3.2.1263californiumCoreVersion = 2.1.0californiumScandiumVersion = 3.5.0-zwaveVersion = 3.4.0-SNAPSHOT+zwaveVersion = 3.4.0reflectionsVersion=0.9.12swaggerVersion=2.2.8jsonSchemaVersion=4.18.0@@ -60,3 +60,4 @@ jbossLoggingManagerVersion=2.1.19.FinalgreenmailVersion=2.0.0prometheusVersion=0.16.0micrometerVersion=1.11.0+jdomVersion = 2.0.6