diff --git a/application/pom.xml b/application/pom.xml
index 992267e5f1..299a1c1e26 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 0.0.1-SNAPSHOT
+ 1.0.0
thingsboard
org.thingsboard
diff --git a/common/data/pom.xml b/common/data/pom.xml
index 08de1a46f8..af1da85273 100644
--- a/common/data/pom.xml
+++ b/common/data/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 0.0.1-SNAPSHOT
+ 1.0.0
common
org.thingsboard.common
diff --git a/common/message/pom.xml b/common/message/pom.xml
index 5d433d1667..5bc54b0a03 100644
--- a/common/message/pom.xml
+++ b/common/message/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 0.0.1-SNAPSHOT
+ 1.0.0
common
org.thingsboard.common
diff --git a/common/pom.xml b/common/pom.xml
index 7a21a46e28..bdbe1a8b9f 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 0.0.1-SNAPSHOT
+ 1.0.0
thingsboard
org.thingsboard
diff --git a/common/transport/pom.xml b/common/transport/pom.xml
index 198d1e7ef5..b02cc07778 100644
--- a/common/transport/pom.xml
+++ b/common/transport/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 0.0.1-SNAPSHOT
+ 1.0.0
common
org.thingsboard.common
diff --git a/dao/pom.xml b/dao/pom.xml
index 2a2aa83783..9ae2cae0f2 100644
--- a/dao/pom.xml
+++ b/dao/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 0.0.1-SNAPSHOT
+ 1.0.0
thingsboard
org.thingsboard
diff --git a/dao/src/main/resources/demo-data.cql b/dao/src/main/resources/demo-data.cql
index 5ce642f596..84a1dffce7 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',
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index fd1c0a1991..b15b7fa590 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-db-schema/Dockerfile b/docker/thingsboard-db-schema/Dockerfile
index 12e7dc74ef..569698058f 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
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 0000000000..76d87430ff
--- /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/build_and_deploy.sh b/docker/thingsboard/build_and_deploy.sh
index 937ac4bc1f..acbb4202d7 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 62079731ad..c41e53eb08 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/extensions-api/pom.xml b/extensions-api/pom.xml
index c8b9ede80b..ed4dd2dd89 100644
--- a/extensions-api/pom.xml
+++ b/extensions-api/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 0.0.1-SNAPSHOT
+ 1.0.0
thingsboard
org.thingsboard
diff --git a/extensions-core/pom.xml b/extensions-core/pom.xml
index 61b2833391..d8581e6c7d 100644
--- a/extensions-core/pom.xml
+++ b/extensions-core/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 0.0.1-SNAPSHOT
+ 1.0.0
thingsboard
org.thingsboard
diff --git a/extensions/extension-kafka/pom.xml b/extensions/extension-kafka/pom.xml
index 27132c2bd4..6070d0be15 100644
--- a/extensions/extension-kafka/pom.xml
+++ b/extensions/extension-kafka/pom.xml
@@ -22,7 +22,7 @@
4.0.0
org.thingsboard
- 0.0.1-SNAPSHOT
+ 1.0.0
extensions
org.thingsboard.extensions
diff --git a/extensions/extension-rabbitmq/pom.xml b/extensions/extension-rabbitmq/pom.xml
index 4f8ea38c8d..c764f6045b 100644
--- a/extensions/extension-rabbitmq/pom.xml
+++ b/extensions/extension-rabbitmq/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 0.0.1-SNAPSHOT
+ 1.0.0
extensions
org.thingsboard.extensions
diff --git a/extensions/extension-rest-api-call/pom.xml b/extensions/extension-rest-api-call/pom.xml
index 0214197e5c..59428e2d72 100644
--- a/extensions/extension-rest-api-call/pom.xml
+++ b/extensions/extension-rest-api-call/pom.xml
@@ -22,7 +22,7 @@
4.0.0
org.thingsboard
- 0.0.1-SNAPSHOT
+ 1.0.0
extensions
org.thingsboard.extensions
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 1fcc5d973e..e825d1b1de 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 0.0.1-SNAPSHOT
+ 1.0.0
thingsboard
org.thingsboard
diff --git a/pom.xml b/pom.xml
index c34a454f0c..59bc9e2730 100755
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
thingsboard
- 0.0.1-SNAPSHOT
+ 1.0.0
pom
Thingsboard
diff --git a/tools/pom.xml b/tools/pom.xml
index 0eb68df8da..4134fc5dbf 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 0.0.1-SNAPSHOT
+ 1.0.0
thingsboard
org.thingsboard
diff --git a/transport/coap/pom.xml b/transport/coap/pom.xml
index 6634165a17..6221596dd6 100644
--- a/transport/coap/pom.xml
+++ b/transport/coap/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 0.0.1-SNAPSHOT
+ 1.0.0
transport
org.thingsboard.transport
diff --git a/transport/http/pom.xml b/transport/http/pom.xml
index a13d26f36e..4a5fc788d7 100644
--- a/transport/http/pom.xml
+++ b/transport/http/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 0.0.1-SNAPSHOT
+ 1.0.0
transport
org.thingsboard.transport
diff --git a/transport/mqtt/pom.xml b/transport/mqtt/pom.xml
index 3941544700..9d332bead2 100644
--- a/transport/mqtt/pom.xml
+++ b/transport/mqtt/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 0.0.1-SNAPSHOT
+ 1.0.0
transport
org.thingsboard.transport
diff --git a/transport/pom.xml b/transport/pom.xml
index 328ab6dbb3..a03dd83afb 100644
--- a/transport/pom.xml
+++ b/transport/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 0.0.1-SNAPSHOT
+ 1.0.0
thingsboard
org.thingsboard
diff --git a/ui/package.json b/ui/package.json
index d982261b18..d8978a713e 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": [
{
diff --git a/ui/pom.xml b/ui/pom.xml
index e7911ff903..bc68c720d3 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 0.0.1-SNAPSHOT
+ 1.0.0
thingsboard
org.thingsboard