thingsboard-aplcache
Changes
application/pom.xml 2(+1 -1)
common/data/pom.xml 2(+1 -1)
common/message/pom.xml 2(+1 -1)
common/pom.xml 2(+1 -1)
common/transport/pom.xml 2(+1 -1)
dao/pom.xml 2(+1 -1)
dao/src/main/resources/demo-data.cql 14(+0 -14)
docker/docker-compose.yml 8(+2 -6)
extensions/extension-kafka/pom.xml 2(+1 -1)
extensions/pom.xml 2(+1 -1)
extensions-api/pom.xml 2(+1 -1)
extensions-core/pom.xml 2(+1 -1)
pom.xml 2(+1 -1)
tools/pom.xml 2(+1 -1)
transport/coap/pom.xml 2(+1 -1)
transport/http/pom.xml 2(+1 -1)
transport/mqtt/pom.xml 2(+1 -1)
transport/pom.xml 2(+1 -1)
ui/package.json 2(+1 -1)
ui/pom.xml 2(+1 -1)
Details
application/pom.xml 2(+1 -1)
diff --git a/application/pom.xml b/application/pom.xml
index 992267e..299a1c1 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<artifactId>thingsboard</artifactId>
</parent>
<groupId>org.thingsboard</groupId>
common/data/pom.xml 2(+1 -1)
diff --git a/common/data/pom.xml b/common/data/pom.xml
index 08de1a4..af1da85 100644
--- a/common/data/pom.xml
+++ b/common/data/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<artifactId>common</artifactId>
</parent>
<groupId>org.thingsboard.common</groupId>
common/message/pom.xml 2(+1 -1)
diff --git a/common/message/pom.xml b/common/message/pom.xml
index 5d433d1..5bc54b0 100644
--- a/common/message/pom.xml
+++ b/common/message/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<artifactId>common</artifactId>
</parent>
<groupId>org.thingsboard.common</groupId>
common/pom.xml 2(+1 -1)
diff --git a/common/pom.xml b/common/pom.xml
index 7a21a46..bdbe1a8 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<artifactId>thingsboard</artifactId>
</parent>
<groupId>org.thingsboard</groupId>
common/transport/pom.xml 2(+1 -1)
diff --git a/common/transport/pom.xml b/common/transport/pom.xml
index 198d1e7..b02cc07 100644
--- a/common/transport/pom.xml
+++ b/common/transport/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<artifactId>common</artifactId>
</parent>
<groupId>org.thingsboard.common</groupId>
dao/pom.xml 2(+1 -1)
diff --git a/dao/pom.xml b/dao/pom.xml
index 2a2aa83..9ae2cae 100644
--- a/dao/pom.xml
+++ b/dao/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<artifactId>thingsboard</artifactId>
</parent>
<groupId>org.thingsboard</groupId>
dao/src/main/resources/demo-data.cql 14(+0 -14)
diff --git a/dao/src/main/resources/demo-data.cql b/dao/src/main/resources/demo-data.cql
index 5ce642f..84a1dff 100644
--- a/dao/src/main/resources/demo-data.cql
+++ b/dao/src/main/resources/demo-data.cql
@@ -413,20 +413,6 @@ INSERT INTO thingsboard.rule ( id, tenant_id, name, plugin_token, state, search_
VALUES (
minTimeuuid ( '2016-11-01 01:02:11+0000' ),
minTimeuuid ( '2016-11-01 01:02:01+0000' ),
- 'Demo Time RPC Rule',
- 'time',
- 'ACTIVE',
- 'demo time rpc rule',
- 0,
- '[{"configuration":{"messageTypes":["RPC_REQUEST"]},"name":"RPC Request Filter","clazz":"org.thingsboard.server.extensions.core.filter.MsgTypeFilter"},{"configuration":{"methodNames":[{"name":"getTime"}]},"name":"getTime method filter","clazz":"org.thingsboard.server.extensions.core.filter.MethodNameFilter"}]',
- null,
- '{"configuration":{},"clazz":"org.thingsboard.server.extensions.core.action.rpc.RpcPluginAction","name":"getTimeAction"}'
-);
-
-INSERT INTO thingsboard.rule ( id, tenant_id, name, plugin_token, state, search_text, weight, filters, processor, action)
-VALUES (
- minTimeuuid ( '2016-11-01 01:02:12+0000' ),
- minTimeuuid ( '2016-11-01 01:02:01+0000' ),
'Demo Messaging RPC Rule',
'messaging',
'ACTIVE',
docker/docker-compose.yml 8(+2 -6)
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index fd1c0a1..b15b7fa 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -18,7 +18,7 @@ version: '2'
services:
thingsboard:
- image: "thingsboard/application:0.1"
+ image: "thingsboard/application:1.0"
ports:
- "8080:8080"
- "1883:1883"
@@ -31,15 +31,11 @@ services:
- thingsboard.env
entrypoint: ./run_thingsboard.sh
thingsboard-db-schema:
- build: thingsboard-db-schema
+ image: "thingsboard/thingsboard-db-schema:1.0"
links:
- cassandra:db
env_file:
- thingsboard-db-schema.env
- volumes:
- - "../dao/src/main/resources/schema.cql:/root/schema.cql"
- - "../dao/src/main/resources/demo-data.cql:/root/demo-data.cql"
- - "../dao/src/main/resources/system-data.cql:/root/system-data.cql"
entrypoint: ./install_schema.sh
cassandra:
image: "cassandra:3.9"
diff --git a/docker/thingsboard/build_and_deploy.sh b/docker/thingsboard/build_and_deploy.sh
index 937ac4b..acbb420 100755
--- a/docker/thingsboard/build_and_deploy.sh
+++ b/docker/thingsboard/build_and_deploy.sh
@@ -18,8 +18,8 @@
cp ../../application/target/thingsboard.deb thingsboard.deb
-docker build -t thingsboard/application:0.1 .
+docker build -t thingsboard/application:1.0 .
docker login
-docker push thingsboard/application:0.1
\ No newline at end of file
+docker push thingsboard/application:1.0
\ No newline at end of file
diff --git a/docker/thingsboard/run_thingsboard.sh b/docker/thingsboard/run_thingsboard.sh
index 6207973..c41e53e 100755
--- a/docker/thingsboard/run_thingsboard.sh
+++ b/docker/thingsboard/run_thingsboard.sh
@@ -40,5 +40,5 @@ echo "Starting 'Thingsboard' service..."
service thingsboard start
# Wait until log file is created
-sleep 3
+sleep 10
tail -f /var/log/thingsboard/thingsboard.log
diff --git a/docker/thingsboard-db-schema/build_and_deploy.sh b/docker/thingsboard-db-schema/build_and_deploy.sh
new file mode 100755
index 0000000..76d8743
--- /dev/null
+++ b/docker/thingsboard-db-schema/build_and_deploy.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+#
+# Copyright © 2016 The Thingsboard Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+cp ../../dao/src/main/resources/schema.cql schema.cql
+cp ../../dao/src/main/resources/demo-data.cql demo-data.cql
+cp ../../dao/src/main/resources/system-data.cql system-data.cql
+
+docker build -t thingsboard/thingsboard-db-schema:1.0 .
+
+docker login
+
+docker push thingsboard/thingsboard-db-schema:1.0
\ No newline at end of file
diff --git a/docker/thingsboard-db-schema/Dockerfile b/docker/thingsboard-db-schema/Dockerfile
index 12e7dc7..5696980 100644
--- a/docker/thingsboard-db-schema/Dockerfile
+++ b/docker/thingsboard-db-schema/Dockerfile
@@ -23,4 +23,8 @@ RUN apt-get update \
RUN chmod +x /root/install_schema.sh
+ADD schema.cql /root/schema.cql
+ADD demo-data.cql /root/demo-data.cql
+ADD system-data.cql /root/system-data.cql
+
WORKDIR /root
extensions/extension-kafka/pom.xml 2(+1 -1)
diff --git a/extensions/extension-kafka/pom.xml b/extensions/extension-kafka/pom.xml
index 27132c2..6070d0b 100644
--- a/extensions/extension-kafka/pom.xml
+++ b/extensions/extension-kafka/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<artifactId>extensions</artifactId>
</parent>
<groupId>org.thingsboard.extensions</groupId>
diff --git a/extensions/extension-rabbitmq/pom.xml b/extensions/extension-rabbitmq/pom.xml
index 4f8ea38..c764f60 100644
--- a/extensions/extension-rabbitmq/pom.xml
+++ b/extensions/extension-rabbitmq/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<artifactId>extensions</artifactId>
</parent>
<groupId>org.thingsboard.extensions</groupId>
diff --git a/extensions/extension-rest-api-call/pom.xml b/extensions/extension-rest-api-call/pom.xml
index 0214197..59428e2 100644
--- a/extensions/extension-rest-api-call/pom.xml
+++ b/extensions/extension-rest-api-call/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<artifactId>extensions</artifactId>
</parent>
<groupId>org.thingsboard.extensions</groupId>
extensions/pom.xml 2(+1 -1)
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 1fcc5d9..e825d1b 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<artifactId>thingsboard</artifactId>
</parent>
<groupId>org.thingsboard</groupId>
extensions-api/pom.xml 2(+1 -1)
diff --git a/extensions-api/pom.xml b/extensions-api/pom.xml
index c8b9ede..ed4dd2d 100644
--- a/extensions-api/pom.xml
+++ b/extensions-api/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<artifactId>thingsboard</artifactId>
</parent>
<groupId>org.thingsboard</groupId>
extensions-core/pom.xml 2(+1 -1)
diff --git a/extensions-core/pom.xml b/extensions-core/pom.xml
index 61b2833..d8581e6 100644
--- a/extensions-core/pom.xml
+++ b/extensions-core/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<artifactId>thingsboard</artifactId>
</parent>
<groupId>org.thingsboard</groupId>
pom.xml 2(+1 -1)
diff --git a/pom.xml b/pom.xml
index c34a454..59bc9e2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.thingsboard</groupId>
<artifactId>thingsboard</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<packaging>pom</packaging>
<name>Thingsboard</name>
tools/pom.xml 2(+1 -1)
diff --git a/tools/pom.xml b/tools/pom.xml
index 0eb68df..4134fc5 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<artifactId>thingsboard</artifactId>
</parent>
<groupId>org.thingsboard</groupId>
transport/coap/pom.xml 2(+1 -1)
diff --git a/transport/coap/pom.xml b/transport/coap/pom.xml
index 6634165..6221596 100644
--- a/transport/coap/pom.xml
+++ b/transport/coap/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<artifactId>transport</artifactId>
</parent>
<groupId>org.thingsboard.transport</groupId>
transport/http/pom.xml 2(+1 -1)
diff --git a/transport/http/pom.xml b/transport/http/pom.xml
index a13d26f..4a5fc78 100644
--- a/transport/http/pom.xml
+++ b/transport/http/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<artifactId>transport</artifactId>
</parent>
<groupId>org.thingsboard.transport</groupId>
transport/mqtt/pom.xml 2(+1 -1)
diff --git a/transport/mqtt/pom.xml b/transport/mqtt/pom.xml
index 3941544..9d332be 100644
--- a/transport/mqtt/pom.xml
+++ b/transport/mqtt/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<artifactId>transport</artifactId>
</parent>
<groupId>org.thingsboard.transport</groupId>
transport/pom.xml 2(+1 -1)
diff --git a/transport/pom.xml b/transport/pom.xml
index 328ab6d..a03dd83 100644
--- a/transport/pom.xml
+++ b/transport/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<artifactId>thingsboard</artifactId>
</parent>
<groupId>org.thingsboard</groupId>
ui/package.json 2(+1 -1)
diff --git a/ui/package.json b/ui/package.json
index d982261..d8978a7 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,7 +1,7 @@
{
"name": "thingsboard",
"private": true,
- "version": "0.0.1",
+ "version": "1.0.0",
"description": "Thingsboard UI",
"licenses": [
{
ui/pom.xml 2(+1 -1)
diff --git a/ui/pom.xml b/ui/pom.xml
index e7911ff..bc68c72 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<artifactId>thingsboard</artifactId>
</parent>
<groupId>org.thingsboard</groupId>