简柏林 / thingskit · Commits

Commit 41527ca059f7d8bbae1e2a5b4b97edcce09246e0

Authored by Igor Kulikov
1 parent 38d7c1e8

Version set to 2.4.2-SNAPSHOT. Restore Black Box Tests.

Inline Side-by-side
Showing 41 changed files with 63 additions and 49 deletions
... ... @@ -9,4 +9,4 @@ language: java
9 9 sudo: required
10 10 services:
11 11 - docker
12   -script: mvn clean verify -Ddockerfile.skip=false
  12 +script: mvn clean verify -Ddockerfile.skip=false -DblackBoxTests.skip=false -DblackBoxTests.skipTailChildContainers=true
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>thingsboard</artifactId>
25 25 </parent>
26 26 <artifactId>application</artifactId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>common</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.common</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>common</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.common</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>common</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.common</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>thingsboard</artifactId>
25 25 </parent>
26 26 <artifactId>common</artifactId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>common</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.common</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard.common</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>transport</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.common.transport</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard.common</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>transport</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.common.transport</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard.common</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>transport</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.common.transport</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>common</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.common</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard.common</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>transport</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.common.transport</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>common</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.common</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>thingsboard</artifactId>
25 25 </parent>
26 26 <artifactId>dao</artifactId>
... ...
... ... @@ -21,7 +21,7 @@
21 21
22 22 <parent>
23 23 <groupId>org.thingsboard</groupId>
24   - <version>2.4.1-SNAPSHOT</version>
  24 + <version>2.4.2-SNAPSHOT</version>
25 25 <artifactId>msa</artifactId>
26 26 </parent>
27 27 <groupId>org.thingsboard.msa</groupId>
... ...
1 1 {
2 2 "name": "thingsboard-js-executor",
3   - "version": "2.4.1",
  3 + "version": "2.4.2",
4 4 "lockfileVersion": 1,
5 5 "requires": true,
6 6 "dependencies": {
... ...
1 1 {
2 2 "name": "thingsboard-js-executor",
3 3 "private": true,
4   - "version": "2.4.1",
  4 + "version": "2.4.2",
5 5 "description": "ThingsBoard JavaScript Executor Microservice",
6 6 "main": "server.js",
7 7 "bin": "server.js",
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>msa</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.msa</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>thingsboard</artifactId>
25 25 </parent>
26 26 <artifactId>msa</artifactId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>msa</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.msa</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>msa</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.msa</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard.msa</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>transport</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.msa.transport</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard.msa</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>transport</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.msa.transport</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard.msa</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>transport</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.msa.transport</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>msa</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.msa</groupId>
... ...
1 1 {
2 2 "name": "thingsboard-web-ui",
3   - "version": "2.4.1",
  3 + "version": "2.4.2",
4 4 "lockfileVersion": 1,
5 5 "requires": true,
6 6 "dependencies": {
... ...
1 1 {
2 2 "name": "thingsboard-web-ui",
3 3 "private": true,
4   - "version": "2.4.1",
  4 + "version": "2.4.2",
5 5 "description": "ThingsBoard Web UI Microservice",
6 6 "main": "server.js",
7 7 "bin": "server.js",
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>msa</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.msa</groupId>
... ...
... ... @@ -19,12 +19,12 @@
19 19 <modelVersion>4.0.0</modelVersion>
20 20 <parent>
21 21 <groupId>org.thingsboard</groupId>
22   - <version>2.4.1-SNAPSHOT</version>
  22 + <version>2.4.2-SNAPSHOT</version>
23 23 <artifactId>thingsboard</artifactId>
24 24 </parent>
25 25 <groupId>org.thingsboard</groupId>
26 26 <artifactId>netty-mqtt</artifactId>
27   - <version>2.4.1-SNAPSHOT</version>
  27 + <version>2.4.2-SNAPSHOT</version>
28 28 <packaging>jar</packaging>
29 29
30 30 <name>Netty MQTT Client</name>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <groupId>org.thingsboard</groupId>
22 22 <artifactId>thingsboard</artifactId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <packaging>pom</packaging>
25 25
26 26 <name>Thingsboard</name>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>thingsboard</artifactId>
25 25 </parent>
26 26 <artifactId>rule-engine</artifactId>
... ...
... ... @@ -22,7 +22,7 @@
22 22 <modelVersion>4.0.0</modelVersion>
23 23 <parent>
24 24 <groupId>org.thingsboard</groupId>
25   - <version>2.4.1-SNAPSHOT</version>
  25 + <version>2.4.2-SNAPSHOT</version>
26 26 <artifactId>rule-engine</artifactId>
27 27 </parent>
28 28 <groupId>org.thingsboard.rule-engine</groupId>
... ...
... ... @@ -22,7 +22,7 @@
22 22 <modelVersion>4.0.0</modelVersion>
23 23 <parent>
24 24 <groupId>org.thingsboard</groupId>
25   - <version>2.4.1-SNAPSHOT</version>
  25 + <version>2.4.2-SNAPSHOT</version>
26 26 <artifactId>rule-engine</artifactId>
27 27 </parent>
28 28 <groupId>org.thingsboard.rule-engine</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>thingsboard</artifactId>
25 25 </parent>
26 26 <artifactId>tools</artifactId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>transport</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.transport</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>transport</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.transport</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>transport</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.transport</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>thingsboard</artifactId>
25 25 </parent>
26 26 <artifactId>transport</artifactId>
... ...
1 1 {
2 2 "name": "thingsboard",
3   - "version": "2.4.1",
  3 + "version": "2.4.2",
4 4 "lockfileVersion": 1,
5 5 "requires": true,
6 6 "dependencies": {
... ... @@ -6096,12 +6096,14 @@
6096 6096 "balanced-match": {
6097 6097 "version": "1.0.0",
6098 6098 "bundled": true,
6099   - "dev": true
  6099 + "dev": true,
  6100 + "optional": true
6100 6101 },
6101 6102 "brace-expansion": {
6102 6103 "version": "1.1.11",
6103 6104 "bundled": true,
6104 6105 "dev": true,
  6106 + "optional": true,
6105 6107 "requires": {
6106 6108 "balanced-match": "^1.0.0",
6107 6109 "concat-map": "0.0.1"
... ... @@ -6116,17 +6118,20 @@
6116 6118 "code-point-at": {
6117 6119 "version": "1.1.0",
6118 6120 "bundled": true,
6119   - "dev": true
  6121 + "dev": true,
  6122 + "optional": true
6120 6123 },
6121 6124 "concat-map": {
6122 6125 "version": "0.0.1",
6123 6126 "bundled": true,
6124   - "dev": true
  6127 + "dev": true,
  6128 + "optional": true
6125 6129 },
6126 6130 "console-control-strings": {
6127 6131 "version": "1.1.0",
6128 6132 "bundled": true,
6129   - "dev": true
  6133 + "dev": true,
  6134 + "optional": true
6130 6135 },
6131 6136 "core-util-is": {
6132 6137 "version": "1.0.2",
... ... @@ -6243,7 +6248,8 @@
6243 6248 "inherits": {
6244 6249 "version": "2.0.3",
6245 6250 "bundled": true,
6246   - "dev": true
  6251 + "dev": true,
  6252 + "optional": true
6247 6253 },
6248 6254 "ini": {
6249 6255 "version": "1.3.5",
... ... @@ -6255,6 +6261,7 @@
6255 6261 "version": "1.0.0",
6256 6262 "bundled": true,
6257 6263 "dev": true,
  6264 + "optional": true,
6258 6265 "requires": {
6259 6266 "number-is-nan": "^1.0.0"
6260 6267 }
... ... @@ -6269,6 +6276,7 @@
6269 6276 "version": "3.0.4",
6270 6277 "bundled": true,
6271 6278 "dev": true,
  6279 + "optional": true,
6272 6280 "requires": {
6273 6281 "brace-expansion": "^1.1.7"
6274 6282 }
... ... @@ -6276,12 +6284,14 @@
6276 6284 "minimist": {
6277 6285 "version": "0.0.8",
6278 6286 "bundled": true,
6279   - "dev": true
  6287 + "dev": true,
  6288 + "optional": true
6280 6289 },
6281 6290 "minipass": {
6282 6291 "version": "2.3.5",
6283 6292 "bundled": true,
6284 6293 "dev": true,
  6294 + "optional": true,
6285 6295 "requires": {
6286 6296 "safe-buffer": "^5.1.2",
6287 6297 "yallist": "^3.0.0"
... ... @@ -6300,6 +6310,7 @@
6300 6310 "version": "0.5.1",
6301 6311 "bundled": true,
6302 6312 "dev": true,
  6313 + "optional": true,
6303 6314 "requires": {
6304 6315 "minimist": "0.0.8"
6305 6316 }
... ... @@ -6380,7 +6391,8 @@
6380 6391 "number-is-nan": {
6381 6392 "version": "1.0.1",
6382 6393 "bundled": true,
6383   - "dev": true
  6394 + "dev": true,
  6395 + "optional": true
6384 6396 },
6385 6397 "object-assign": {
6386 6398 "version": "4.1.1",
... ... @@ -6392,6 +6404,7 @@
6392 6404 "version": "1.4.0",
6393 6405 "bundled": true,
6394 6406 "dev": true,
  6407 + "optional": true,
6395 6408 "requires": {
6396 6409 "wrappy": "1"
6397 6410 }
... ... @@ -6513,6 +6526,7 @@
6513 6526 "version": "1.0.2",
6514 6527 "bundled": true,
6515 6528 "dev": true,
  6529 + "optional": true,
6516 6530 "requires": {
6517 6531 "code-point-at": "^1.0.0",
6518 6532 "is-fullwidth-code-point": "^1.0.0",
... ...
1 1 {
2 2 "name": "thingsboard",
3 3 "private": true,
4   - "version": "2.4.1",
  4 + "version": "2.4.2",
5 5 "description": "ThingsBoard UI",
6 6 "licenses": [
7 7 {
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.4.1-SNAPSHOT</version>
  23 + <version>2.4.2-SNAPSHOT</version>
24 24 <artifactId>thingsboard</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard</groupId>
... ...