Merge branch 'master' into fixes/devices/copy-code-btn
This commit is contained in:
commit
bb56a833ff
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>thingsboard</artifactId>
|
<artifactId>thingsboard</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>application</artifactId>
|
<artifactId>application</artifactId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>common</artifactId>
|
<artifactId>common</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
|
|||||||
2
common/cache/pom.xml
vendored
2
common/cache/pom.xml
vendored
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>common</artifactId>
|
<artifactId>common</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>common</artifactId>
|
<artifactId>common</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>common</artifactId>
|
<artifactId>common</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>common</artifactId>
|
<artifactId>common</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>common</artifactId>
|
<artifactId>common</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>common</artifactId>
|
<artifactId>common</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>common</artifactId>
|
<artifactId>common</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>thingsboard</artifactId>
|
<artifactId>thingsboard</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>common</artifactId>
|
<artifactId>common</artifactId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>common</artifactId>
|
<artifactId>common</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>common</artifactId>
|
<artifactId>common</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>common</artifactId>
|
<artifactId>common</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>script</artifactId>
|
<artifactId>script</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common.script</groupId>
|
<groupId>org.thingsboard.common.script</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>script</artifactId>
|
<artifactId>script</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common.script</groupId>
|
<groupId>org.thingsboard.common.script</groupId>
|
||||||
|
|||||||
@ -177,8 +177,9 @@ class TbDateTest {
|
|||||||
* For Java 17:
|
* For Java 17:
|
||||||
* `{ "AM", "PM" }`
|
* `{ "AM", "PM" }`
|
||||||
*/
|
*/
|
||||||
s = "09:15:30 nachm., So. 10/09/2022";
|
String s_ver = Runtime.version().feature() == 11 ? "09:15:30 nachm., So. 10/09/2022" :
|
||||||
d = new TbDate(s, pattern, "de","Europe/Berlin");
|
"09:15:30 PM, So. 10/09/2022";
|
||||||
|
d = new TbDate(s_ver, pattern, "de","Europe/Berlin");
|
||||||
Assert.assertEquals("2022-10-09T19:15:30Z", d.toISOString());
|
Assert.assertEquals("2022-10-09T19:15:30Z", d.toISOString());
|
||||||
|
|
||||||
s = "02:15:30 пп, середа, 4 жовтня 2023 р.";
|
s = "02:15:30 пп, середа, 4 жовтня 2023 р.";
|
||||||
@ -295,7 +296,9 @@ class TbDateTest {
|
|||||||
Assert.assertEquals("9/5/23, 9:04:05 PM", d.toLocaleString("en-US", "America/New_York"));
|
Assert.assertEquals("9/5/23, 9:04:05 PM", d.toLocaleString("en-US", "America/New_York"));
|
||||||
Assert.assertEquals("23. 9. 5. 오후 9:04:05", d.toLocaleString("ko-KR", "America/New_York"));
|
Assert.assertEquals("23. 9. 5. 오후 9:04:05", d.toLocaleString("ko-KR", "America/New_York"));
|
||||||
Assert.assertEquals("06.09.23, 04:04:05", d.toLocaleString( "uk-UA", "Europe/Kiev"));
|
Assert.assertEquals("06.09.23, 04:04:05", d.toLocaleString( "uk-UA", "Europe/Kiev"));
|
||||||
Assert.assertEquals("5\u200F/9\u200F/2023 9:04:05 م", d.toLocaleString( "ar-EG", "America/New_York"));
|
String expected_ver = Runtime.version().feature() == 11 ? "5\u200F/9\u200F/2023 9:04:05 م" :
|
||||||
|
"5\u200F/9\u200F/2023, 9:04:05 م";
|
||||||
|
Assert.assertEquals(expected_ver, d.toLocaleString( "ar-EG", "America/New_York"));
|
||||||
|
|
||||||
Assert.assertEquals("Tuesday, September 5, 2023 at 9:04:05 PM Eastern Daylight Time", d.toLocaleString("en-US", JacksonUtil.newObjectNode()
|
Assert.assertEquals("Tuesday, September 5, 2023 at 9:04:05 PM Eastern Daylight Time", d.toLocaleString("en-US", JacksonUtil.newObjectNode()
|
||||||
.put("timeZone", "America/New_York")
|
.put("timeZone", "America/New_York")
|
||||||
@ -312,7 +315,10 @@ class TbDateTest {
|
|||||||
.put("dateStyle", "full")
|
.put("dateStyle", "full")
|
||||||
.put("timeStyle", "full")
|
.put("timeStyle", "full")
|
||||||
.toString()));
|
.toString()));
|
||||||
Assert.assertEquals("الثلاثاء، 5 سبتمبر 2023 9:04:05 م التوقيت الصيفي الشرقي لأمريكا الشمالية", d.toLocaleString("ar-EG", JacksonUtil.newObjectNode()
|
|
||||||
|
expected_ver = Runtime.version().feature() == 11 ? "الثلاثاء، 5 سبتمبر 2023 9:04:05 م التوقيت الصيفي الشرقي لأمريكا الشمالية" :
|
||||||
|
"الثلاثاء، 5 سبتمبر 2023 في 9:04:05 م التوقيت الصيفي الشرقي لأمريكا الشمالية";
|
||||||
|
Assert.assertEquals(expected_ver, d.toLocaleString("ar-EG", JacksonUtil.newObjectNode()
|
||||||
.put("timeZone", "America/New_York")
|
.put("timeZone", "America/New_York")
|
||||||
.put("dateStyle", "full")
|
.put("dateStyle", "full")
|
||||||
.put("timeStyle", "full")
|
.put("timeStyle", "full")
|
||||||
@ -381,8 +387,9 @@ class TbDateTest {
|
|||||||
|
|
||||||
// With pattern + locale - ok
|
// With pattern + locale - ok
|
||||||
String pattern = "hh:mm:ss a, EEE M/d/uuuu";
|
String pattern = "hh:mm:ss a, EEE M/d/uuuu";
|
||||||
stringDateRFC_1123 = "09:15:30 nachm., So. 10/09/2022";
|
String stringDate_ver_RFC_1123 = Runtime.version().feature() == 11 ? "09:15:30 nachm., So. 10/09/2022" :
|
||||||
d = new TbDate(stringDateRFC_1123 , pattern, "de");
|
"09:15:30 PM, So. 10/09/2022";
|
||||||
|
d = new TbDate(stringDate_ver_RFC_1123 , pattern, "de");
|
||||||
Assert.assertEquals("2022-10-09 21:15:30", d.toLocaleString());
|
Assert.assertEquals("2022-10-09 21:15:30", d.toLocaleString());
|
||||||
|
|
||||||
// failed TZ
|
// failed TZ
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>common</artifactId>
|
<artifactId>common</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>transport</artifactId>
|
<artifactId>transport</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common.transport</groupId>
|
<groupId>org.thingsboard.common.transport</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>transport</artifactId>
|
<artifactId>transport</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common.transport</groupId>
|
<groupId>org.thingsboard.common.transport</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>transport</artifactId>
|
<artifactId>transport</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common.transport</groupId>
|
<groupId>org.thingsboard.common.transport</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>transport</artifactId>
|
<artifactId>transport</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common.transport</groupId>
|
<groupId>org.thingsboard.common.transport</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>common</artifactId>
|
<artifactId>common</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>transport</artifactId>
|
<artifactId>transport</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>transport</artifactId>
|
<artifactId>transport</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common.transport</groupId>
|
<groupId>org.thingsboard.common.transport</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>common</artifactId>
|
<artifactId>common</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>common</artifactId>
|
<artifactId>common</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>thingsboard</artifactId>
|
<artifactId>thingsboard</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>dao</artifactId>
|
<artifactId>dao</artifactId>
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>thingsboard</artifactId>
|
<artifactId>thingsboard</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>msa</artifactId>
|
<artifactId>msa</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.msa</groupId>
|
<groupId>org.thingsboard.msa</groupId>
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "thingsboard-js-executor",
|
"name": "thingsboard-js-executor",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "3.6.2",
|
"version": "3.6.3",
|
||||||
"description": "ThingsBoard JavaScript Executor Microservice",
|
"description": "ThingsBoard JavaScript Executor Microservice",
|
||||||
"main": "server.ts",
|
"main": "server.ts",
|
||||||
"bin": "server.js",
|
"bin": "server.js",
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>msa</artifactId>
|
<artifactId>msa</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.msa</groupId>
|
<groupId>org.thingsboard.msa</groupId>
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>msa</artifactId>
|
<artifactId>msa</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>thingsboard</artifactId>
|
<artifactId>thingsboard</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>msa</artifactId>
|
<artifactId>msa</artifactId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>msa</artifactId>
|
<artifactId>msa</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.msa</groupId>
|
<groupId>org.thingsboard.msa</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>msa</artifactId>
|
<artifactId>msa</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.msa</groupId>
|
<groupId>org.thingsboard.msa</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard.msa</groupId>
|
<groupId>org.thingsboard.msa</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>transport</artifactId>
|
<artifactId>transport</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.msa.transport</groupId>
|
<groupId>org.thingsboard.msa.transport</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard.msa</groupId>
|
<groupId>org.thingsboard.msa</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>transport</artifactId>
|
<artifactId>transport</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.msa.transport</groupId>
|
<groupId>org.thingsboard.msa.transport</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard.msa</groupId>
|
<groupId>org.thingsboard.msa</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>transport</artifactId>
|
<artifactId>transport</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.msa.transport</groupId>
|
<groupId>org.thingsboard.msa.transport</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard.msa</groupId>
|
<groupId>org.thingsboard.msa</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>transport</artifactId>
|
<artifactId>transport</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.msa.transport</groupId>
|
<groupId>org.thingsboard.msa.transport</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>msa</artifactId>
|
<artifactId>msa</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.msa</groupId>
|
<groupId>org.thingsboard.msa</groupId>
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard.msa</groupId>
|
<groupId>org.thingsboard.msa</groupId>
|
||||||
<artifactId>transport</artifactId>
|
<artifactId>transport</artifactId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>org.thingsboard.msa.transport</groupId>
|
<groupId>org.thingsboard.msa.transport</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>msa</artifactId>
|
<artifactId>msa</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.msa</groupId>
|
<groupId>org.thingsboard.msa</groupId>
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>msa</artifactId>
|
<artifactId>msa</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.msa</groupId>
|
<groupId>org.thingsboard.msa</groupId>
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "thingsboard-web-ui",
|
"name": "thingsboard-web-ui",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "3.6.2",
|
"version": "3.6.3",
|
||||||
"description": "ThingsBoard Web UI Microservice",
|
"description": "ThingsBoard Web UI Microservice",
|
||||||
"main": "server.ts",
|
"main": "server.ts",
|
||||||
"bin": "server.js",
|
"bin": "server.js",
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>msa</artifactId>
|
<artifactId>msa</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.msa</groupId>
|
<groupId>org.thingsboard.msa</groupId>
|
||||||
|
|||||||
@ -19,11 +19,11 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>thingsboard</artifactId>
|
<artifactId>thingsboard</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>netty-mqtt</artifactId>
|
<artifactId>netty-mqtt</artifactId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>Netty MQTT Client</name>
|
<name>Netty MQTT Client</name>
|
||||||
|
|||||||
2
pom.xml
2
pom.xml
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<artifactId>thingsboard</artifactId>
|
<artifactId>thingsboard</artifactId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<name>Thingsboard</name>
|
<name>Thingsboard</name>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>thingsboard</artifactId>
|
<artifactId>thingsboard</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>rest-client</artifactId>
|
<artifactId>rest-client</artifactId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>thingsboard</artifactId>
|
<artifactId>thingsboard</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>rule-engine</artifactId>
|
<artifactId>rule-engine</artifactId>
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>rule-engine</artifactId>
|
<artifactId>rule-engine</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.rule-engine</groupId>
|
<groupId>org.thingsboard.rule-engine</groupId>
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>rule-engine</artifactId>
|
<artifactId>rule-engine</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.rule-engine</groupId>
|
<groupId>org.thingsboard.rule-engine</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>thingsboard</artifactId>
|
<artifactId>thingsboard</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>tools</artifactId>
|
<artifactId>tools</artifactId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>transport</artifactId>
|
<artifactId>transport</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.transport</groupId>
|
<groupId>org.thingsboard.transport</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>transport</artifactId>
|
<artifactId>transport</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.transport</groupId>
|
<groupId>org.thingsboard.transport</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>transport</artifactId>
|
<artifactId>transport</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.transport</groupId>
|
<groupId>org.thingsboard.transport</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>transport</artifactId>
|
<artifactId>transport</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard.transport</groupId>
|
<groupId>org.thingsboard.transport</groupId>
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>thingsboard</artifactId>
|
<artifactId>thingsboard</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>transport</artifactId>
|
<artifactId>transport</artifactId>
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>transport</artifactId>
|
<artifactId>transport</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "thingsboard",
|
"name": "thingsboard",
|
||||||
"version": "3.6.2",
|
"version": "3.6.3",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"ng": "ng",
|
"ng": "ng",
|
||||||
"start": "node --max_old_space_size=8048 ./node_modules/@angular/cli/bin/ng serve --configuration development --host 0.0.0.0 --open",
|
"start": "node --max_old_space_size=8048 ./node_modules/@angular/cli/bin/ng serve --configuration development --host 0.0.0.0 --open",
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.6.2-SNAPSHOT</version>
|
<version>3.6.3-SNAPSHOT</version>
|
||||||
<artifactId>thingsboard</artifactId>
|
<artifactId>thingsboard</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user