Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Merge remote-tracking branch 'origin/zwave'

Rainer Hitze9b6089c8435
diff --cc agent/build.gradle
index 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.ContainerService
index 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.Ve
org.openremote.agent.protocol.velbus.VelbusSerialProtocol
org.openremote.agent.protocol.http.HttpClientProtocol
org.openremote.agent.protocol.udp.UdpClientProtocol
+org.openremote.agent.protocol.websocket.WebsocketClientProtocol
+org.openremote.agent.protocol.artnet.ArtnetClientProtocol
org.openremote.agent.protocol.tcp.TcpClientProtocol
org.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