Andrii Shvaika
|
2a1259570b
|
Temporary version set to 3.5.2-SNAPSHOT to merge
|
2023-05-29 13:43:10 +03:00 |
|
YevhenBondarenko
|
b5bce3e187
|
merge with develop/3.5.1
|
2023-05-19 19:03:11 +02:00 |
|
Andrew Shvayka
|
da9bea1f20
|
Merge pull request #8519 from adovh/replace_ObjectMapper_usages_with_JacksonUtil
[3.5.1]Replace object mapper usages with jackson utils
|
2023-05-19 17:07:16 +03:00 |
|
YevhenBondarenko
|
6fda898851
|
Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.6
|
2023-05-15 12:09:22 +02:00 |
|
Igor Kulikov
|
7058f99068
|
Version set to 3.5.1-SNAPSHOT
|
2023-05-12 15:45:11 +03:00 |
|
AndriiD
|
7187fbb4d3
|
Replace object mapper usages with jackson utils
|
2023-05-10 14:10:58 +03:00 |
|
Andrew Shvayka
|
1a366d476e
|
Revert "[3.5.1]Replace object mapper usages with jackson utils"
|
2023-05-08 14:54:21 +03:00 |
|
AndriiD
|
32e5d8561b
|
Merge remote-tracking branch 'origin/develop/3.5.1' into replace_ObjectMapper_usages_with_JacksonUtil
# Conflicts:
# application/src/main/java/org/thingsboard/server/controller/SystemInfoController.java
# dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java
# rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java
# rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java
# rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java
# rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java
# rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java
# rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java
|
2023-05-04 14:35:41 +03:00 |
|
YevhenBondarenko
|
fbf9773a61
|
optimize imports
|
2023-05-02 10:57:58 +02:00 |
|
AndriiD
|
73833a666b
|
Merge branch 'develop/3.5' into replace_ObjectMapper_usages_with_JacksonUtil
# Conflicts:
# application/src/main/java/org/thingsboard/server/service/action/EntityActionService.java
|
2023-04-28 15:08:44 +03:00 |
|
Andrii Shvaika
|
8e20fd8800
|
Metric wildcards and default attributes
|
2023-04-27 17:08:34 +03:00 |
|
Andrii Shvaika
|
a405999a88
|
Use shared attributes for sparkplug devices
|
2023-04-25 19:03:17 +03:00 |
|
YevhenBondarenko
|
4977108550
|
Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into develop/3.6
|
2023-04-21 19:34:31 +02:00 |
|
Andrii Shvaika
|
a0c370079e
|
Improve the device name
|
2023-04-20 18:00:34 +03:00 |
|
AndriiD
|
2ea6896507
|
Merge remote-tracking branch 'origin/develop/3.5' into replace_ObjectMapper_usages_with_JacksonUtil
# Conflicts:
# application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
# application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
|
2023-04-17 00:22:12 +03:00 |
|
Andrew Shvayka
|
d2fc5c7b77
|
Merge pull request #8358 from thingsboard/feature/x509-device-provisioning
Feature/x509 device provisioning
|
2023-04-14 14:30:24 +03:00 |
|
Andrii Landiak
|
1fc8d7a52b
|
Add validation for X509 trusted chain
|
2023-04-14 13:26:28 +03:00 |
|
AndriiD
|
dd9c055ecf
|
replace_ObjectMapper_usages_with_JacksonUtil
|
2023-04-14 11:58:24 +03:00 |
|
Andrii Shvaika
|
7988a58c37
|
Protection from garbage in redis
|
2023-04-13 17:12:59 +03:00 |
|
Andrii Shvaika
|
4cea4362dc
|
Merge branch 'feature/x509-device-cert-impr' of github.com:AndriiLandiak/thingsboard into feature/x509-device-provisioning
|
2023-04-12 12:47:41 +03:00 |
|
Andrii Landiak
|
df18155c81
|
Refactoring
|
2023-04-07 18:02:25 +03:00 |
|
Andrew Shvayka
|
838c2f5d33
|
Merge pull request #7857 from ShvaykaD/improvements/report-device-activity-on-rpc-processing
Improvements for reporting device activity during RPC processing
|
2023-04-07 15:50:28 +03:00 |
|
Andrii Shvaika
|
166afbd782
|
Merge branch 'develop/3.5' into develop/3.6
|
2023-04-07 15:41:24 +03:00 |
|
Andrew Shvayka
|
14ed9df205
|
Merge pull request #6986 from adovh/feature/work-1385-custom-mqtt-subscribe-topic
[3.5] added ability to create&subscribe custom mqtt attributes topics
|
2023-04-07 13:48:20 +03:00 |
|
Andrii Landiak
|
55adb3d12a
|
Refactor x509: add logic of rotating x509 credentials and creating new device to DeviceProvisionService
|
2023-04-07 13:07:08 +03:00 |
|
dashevchenko
|
b10ed7621d
|
minor refactoring
|
2023-04-06 18:34:08 +03:00 |
|
dashevchenko
|
c4a5569650
|
Added logging for failed mqtt ssl certificates
|
2023-04-06 18:08:06 +03:00 |
|
Andrii Landiak
|
2ac861876e
|
Refactoring: fix conflict, add logs
|
2023-03-29 11:40:41 +03:00 |
|
Andrii Landiak
|
1674223e63
|
Merge branch 'develop/3.5' of github.com:AndriiLandiak/thingsboard into feature/x509-device-cert-impr
|
2023-03-28 12:01:41 +03:00 |
|
deaflynx
|
038a714e87
|
Merge remote-tracking branch 'alandiak/feature/x509-device-cert-impr' into feature/x509-device-cert-impr
|
2023-03-22 12:15:54 +02:00 |
|
Vladyslav_Prykhodko
|
1b2b84e48e
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system
|
2023-03-21 15:32:23 +02:00 |
|
nickAS21
|
d8e97dd74d
|
sparkplug: add getNodeDeviceName()
|
2023-03-20 17:17:51 +02:00 |
|
AndriiD
|
07e834bee0
|
Merge remote-tracking branch 'origin/develop/3.5' into feature/work-1385-custom-mqtt-subscribe-topic
# Conflicts:
# application/pom.xml
# application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java
# application/src/test/java/org/thingsboard/server/transport/mqtt/AbstractMqttIntegrationTest.java
# common/actor/pom.xml
# common/cache/pom.xml
# common/cluster-api/pom.xml
# common/coap-server/pom.xml
# common/dao-api/pom.xml
# common/data/pom.xml
# common/edge-api/pom.xml
# common/message/pom.xml
# common/pom.xml
# common/queue/pom.xml
# common/stats/pom.xml
# common/transport/coap/pom.xml
# common/transport/http/pom.xml
# common/transport/lwm2m/pom.xml
# common/transport/mqtt/pom.xml
# common/transport/pom.xml
# common/transport/snmp/pom.xml
# common/transport/transport-api/pom.xml
# common/util/pom.xml
# common/version-control/pom.xml
# dao/pom.xml
# msa/black-box-tests/pom.xml
# msa/js-executor/pom.xml
# msa/pom.xml
# msa/tb-node/pom.xml
# msa/tb/pom.xml
# msa/transport/coap/pom.xml
# msa/transport/http/pom.xml
# msa/transport/lwm2m/pom.xml
# msa/transport/mqtt/pom.xml
# msa/transport/pom.xml
# msa/transport/snmp/pom.xml
# msa/vc-executor-docker/pom.xml
# msa/vc-executor/pom.xml
# msa/web-ui/pom.xml
# netty-mqtt/pom.xml
# pom.xml
# rest-client/pom.xml
# rule-engine/pom.xml
# rule-engine/rule-engine-api/pom.xml
# rule-engine/rule-engine-components/pom.xml
# tools/pom.xml
# transport/coap/pom.xml
# transport/http/pom.xml
# transport/lwm2m/pom.xml
# transport/mqtt/pom.xml
# transport/pom.xml
# transport/snmp/pom.xml
# ui-ngx/pom.xml
# ui-ngx/src/assets/locale/locale.constant-zh_CN.json
|
2023-03-17 04:38:18 +02:00 |
|
ViacheslavKlimov
|
1e7c1a8a5a
|
Merge branch 'develop/3.5' into feature/notification-system
|
2023-03-16 13:12:35 +02:00 |
|
ViacheslavKlimov
|
4a20adc62e
|
Alarm related notification rules
|
2023-03-16 13:12:04 +02:00 |
|
nickAS21
|
8236e26e5c
|
sparkplug: delete isSparkplug from transport proto
|
2023-03-15 14:53:03 +02:00 |
|
nickAS21
|
2a6000d8ce
|
fix bug close session of device: sessionMetaData.setOverwriteActivityTime(true);
|
2023-03-14 15:13:55 +02:00 |
|
Andrew Shvayka
|
494296996e
|
Merge pull request #8200 from smatvienko-tb/fix/lwm2m-lifecycle-refactor
[3.5] lwm2m lifecycle refactor
|
2023-03-13 15:20:53 +02:00 |
|
Andrii Landiak
|
e665917758
|
Merge branch 'develop/3.5' of github.com:AndriiLandiak/thingsboard into feature/x509-device-cert-impr
|
2023-03-10 15:46:42 +02:00 |
|
YevhenBondarenko
|
265e33241a
|
version set to 3.6.0-SNAPSHOT
|
2023-03-10 14:45:49 +01:00 |
|
Sergey Matvienko
|
7b32286e4c
|
log trace on destroy for DefaultLwM2MOtaUpdateService
|
2023-03-10 12:18:47 +01:00 |
|
Sergey Matvienko
|
817487b74d
|
DefaultLwM2mDownlinkMsgHandler - wrapped any exceptions on handleDownlinkError that may fire and prevent graceful server shutdown
|
2023-03-10 11:52:48 +01:00 |
|
Sergey Matvienko
|
8352be035b
|
LWM2M bean lifecycle dependency fix to avoid executors shutdown before server stop. Dependencies refactored: implementations replaced with interfaces.
|
2023-03-10 11:52:45 +01:00 |
|
Andrew Shvayka
|
e058786956
|
Merge pull request #8174 from zzzeebra/feature/junit5-migration-exceptions
[3.5] junit5 migration - exception annotation refactoring
|
2023-03-10 12:51:03 +02:00 |
|
Andrii Shvaika
|
3477ddac0f
|
Refactoring due to comments
|
2023-03-08 17:39:39 +02:00 |
|
Andrii Shvaika
|
0f5fd481fc
|
Fix server-side RPC requests handling
|
2023-03-08 15:37:30 +02:00 |
|
Oleksandra Matviienko
|
b27c007a5d
|
junit5: JsonConverterTest migrated
|
2023-03-06 11:08:31 +01:00 |
|
Oleksandra Matviienko
|
ea2e87e73e
|
junit5: JsonConverterTest test annotation exceptions refactoring
|
2023-03-06 10:49:57 +01:00 |
|
nickAS21
|
07d9748098
|
sparkplug: validate namespace1
|
2023-03-02 13:27:38 +02:00 |
|
nickAS21
|
0587933d5e
|
sparkplug: validate namespace
|
2023-03-02 13:19:55 +02:00 |
|