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
Merge remote-tracking branch 'origin/zwave'
Rainer Hitze9b6089c8435
diff --cc agent/build.gradleindex fb25789f2,5c8d76dd3..e1bc01c1d--- a/agent/build.gradle+++ b/agent/build.gradle@@@ -28,11 -28,8 +28,12 @@@ dependencies}compile "net.sf.saxon:Saxon-HE:$saxonHEVersion"++ //IKEA Tradfri agent dependencies+ compile "org.eclipse.californium:californium-core:$californiumCoreVersion"+ compile "org.eclipse.californium:scandium:$californiumScandiumVersion"-++ compile "org.openremote:or-zwave:3.4-SNAPSHOT"}jar {diff --cc agent/src/main/resources/META-INF/services/org.openremote.container.ContainerServiceindex 9cefcb7cd,61811e6bb..4790d8407--- a/agent/src/main/resources/META-INF/services/org.openremote.container.ContainerService+++ b/agent/src/main/resources/META-INF/services/org.openremote.container.ContainerService@@@ -6,9 -6,7 +6,10 @@@ org.openremote.agent.protocol.velbus.Veorg.openremote.agent.protocol.velbus.VelbusSerialProtocolorg.openremote.agent.protocol.http.HttpClientProtocolorg.openremote.agent.protocol.udp.UdpClientProtocol+org.openremote.agent.protocol.websocket.WebsocketClientProtocol+org.openremote.agent.protocol.artnet.ArtnetClientProtocolorg.openremote.agent.protocol.tcp.TcpClientProtocolorg.openremote.agent.protocol.serial.SerialClientProtocol-org.openremote.agent.protocol.websocket.WebsocketClientProtocol+org.openremote.agent.protocol.event.ClientEventProtocol- org.openremote.agent.protocol.tradfri.TradfriProtocol++org.openremote.agent.protocol.tradfri.TradfriProtocol+ org.openremote.agent.protocol.zwave.ZWProtocol