d146fd9538
Merge branch 'master' into fix/rest-api-node/url-encoding
7 months ago
3c99243748
Merge pull request #15173 from dashevchenko/ymlDescriptionImprovements
Extended env variable descriptions
7 months ago
042937738b
Merge branch 'master' into fix/rest-api-node/url-encoding
# Conflicts:
# rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java
7 months ago
a77567c852
Merge pull request #15225 from thingsboard/master-rc-merge
Merge rc into master
7 months ago
0f4cf61186
Merge remote-tracking branch 'origin/rc' into master-rc-merge
# Conflicts:
# application/src/main/data/upgrade/basic/schema_update.sql
# common/data/src/main/java/org/thingsboard/server/common/data/Customer.java
# common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java
# common/data/src/main/java/org/thingsboard/server/common/data/Tenant.java
7 months ago
913e3676de
Merge remote-tracking branch 'origin/lts-4.3' into rc
7 months ago
f42be47267
Merge remote-tracking branch 'origin/lts-4.2' into lts-4.3
7 months ago
96effd3229
Merge pull request #15218 from smatvienko-tb/fix/lwm2m-rpc-read-collected-value-flaky-test
Fix flaky RpcLwm2mIntegrationReadCollectedValueTest.testReadSingleResource_sendFromClient_CollectedValue
7 months ago
e0c22e55ae
Merge pull request #15216 from smatvienko-tb/fix/lwm2m-fw-update-flaky-test
Fix flaky Ota5LwM2MIntegrationTest.testFirmwareUpdateByObject5_Ok
7 months ago
b8b6d6d59c
Merge pull request #15222 from smatvienko-tb/fix/maven-jar-plugin-version-mismatch
Fix maven-jar-plugin version mismatch across modules
7 months ago
80a55e1dff
Merge pull request #15112 from smatvienko-tb/feature/mqtts-metrics
MQTTS metrics and client address logging on exceptionCaught
7 months ago
c5c732f30f
Address review: align interface param names with implementation
Rename `openConnections`/`connectionsCounter` to `statsName`/`number`
to match DefaultTransportService and avoid misleading future readers.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
7 months ago
61fbfc1858
typo fix
7 months ago
b0efe276eb
Refactor dao and netty-mqtt to inherit maven-jar-plugin version from pluginManagement
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
7 months ago
9a3edc958e
env description improvements
7 months ago
6b81c81526
env description improvements
7 months ago
9208861529
Bump maven-jar-plugin from 3.4.0 to 3.5.0
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
7 months ago
04ccf48419
Fix maven-jar-plugin version mismatch across modules
Root pluginManagement and netty-mqtt hardcoded version 3.1.1 while
the jar-plugin.version property (used by dao and others) was set to
3.4.0, causing build failures due to incompatible commons-io dependency.
Replace both hardcoded 3.1.1 occurrences with ${jar-plugin.version}
so all modules consistently use the version defined in one place.
Fixes #15037
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
7 months ago
153336e7ed
Fix .gitignore to ignore .claude symlink
7 months ago
32d3fdeae8
Merge pull request #15211 from dskarzh/feat/cf-additional-info
feat: add additionalInfo field to CalculatedField
7 months ago
864d737c7b
Merge pull request #15204 from vvlladd28/bug/notification/web/xss
Fixed XSS vulnerability in notification center
7 months ago
4e676d741f
Merge pull request #15203 from vvlladd28/bug/sys-admin/hidden-show-on-widget
Hidden "Show on widgets" button on sysadmin level
7 months ago
6d8628c7ff
Merge pull request #15200 from smatvienko-tb/fix/audit-log-controller-test-flaky-async
Fix flaky AuditLogControllerTest: wrap async audit log assertions with Awaitility
7 months ago
3adfd9bd5a
Fix flaky testReadSingleResource_sendFromClient_CollectedValue: reset static timestamps before each run
Static fields RESOURCE_ID_3303_12_5700_TS_0/TS_1 in Lwm2mTestHelper are never
reset between test runs. On CI retries the await() at the start of the test
passes immediately (both timestamps are still > 0 from the previous run), so
the telemetry query uses stale timestamps and the second await() times out.
Fix: add @Before that resets both timestamps to 0 before each test method,
which was already correctly implied by the unused @Before import.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
7 months ago
ee01932846
Merge pull request #15217 from thingsboard/master-rc-merge
Merge rc into master
7 months ago
7f5bbed61f
Merge remote-tracking branch 'origin/rc' into master-rc-merge
# Conflicts:
# common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/NotificationRuleRecipientsConfig.java
# common/edge-api/src/main/proto/edge.proto
7 months ago
f9953345ba
fix: license headers
7 months ago
77e0211abe
Merge remote-tracking branch 'origin/lts-4.3' into rc
7 months ago
f4fff9579c
Merge remote-tracking branch 'origin/lts-4.2' into lts-4.3
# Conflicts:
# application/src/main/resources/thingsboard.yml
# dao/src/test/java/org/thingsboard/server/dao/service/OtaPackageServiceTest.java
7 months ago
055c498ca3
Merge pull request #14781 from dashevchenko/noWebSocketOnTsDeletion
Added WS update on telemetry deletion
7 months ago
debe877dbf
Merge pull request #14762 from AndriiLandiak/clean-up-job-improvements
Fixed notification requests and RPC cleanup timeout on large datasets
7 months ago
cf795139bb
Fix flaky testFirmwareUpdateByObject5_Ok: isolate LeshanClient.stop() exception
Leshan's NotificationDataStore.toKey() can throw NPE when the server reference
is null during CoAP observe-relation cleanup on client shutdown (race condition).
This NPE was caught by the outer try-catch in startUpdating(), which prevented
leshanClient.start() from being called, leaving the simulated device stuck in
UPDATING state and causing the awaitility timeout in the OTA integration test.
Fix: wrap leshanClient.stop(false) in its own try-catch so that a Leshan
internal exception during stop does not abort the subsequent client restart.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
7 months ago
2d8508e3c3
Merge pull request #14775 from AndriiLandiak/ota-data-clean-up
Added OTA package data cleanup
7 months ago
1dbf348805
Add V_4_3_1_1 to EdgeVersion enum in edge.proto
7 months ago
6ce51c6277
Merge remote-tracking branch 'origin/lts-4.2' into lts-4.3
7 months ago
6c193acf5a
Merge pull request #15170 from AndriiLandiak/ws-api-keys
WebSocket API key authentication
7 months ago
5d6869b3b4
Add V_4_2_2_1 to EdgeVersion enum in edge.proto
7 months ago
e2e6f44d6b
Fix stale test after notification request cleanup refactoring
7 months ago
4b034d3067
Remove WebSocket API key header authentication, keep only authCmd
7 months ago
2ab1faadce
Merge remote-tracking branch 'origin/ws-api-keys' into ws-api-keys
7 months ago
e706b2e82f
Use consistent Authorization header format for WebSocket API key authentication
7 months ago
84f961bc91
Merge pull request #15160 from dashevchenko/cassandraRateLimitError
Sending WS error when the telemetry queries exceed response size limit
7 months ago
c4d38208ff
Merge pull request #15167 from volodymyr-babak/edge-api-key
API key edge sync support
7 months ago
d864e3216f
Merge branch 'master' into ws-api-keys
7 months ago
1d9661124c
feat: add additionalInfo field to CalculatedField
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
7 months ago
25a8dbff35
Merge pull request #15199 from smatvienko-tb/fix/entity-view-controller-test-mqtt-port
Fix EntityViewControllerTest MQTT port collision with other test contexts
7 months ago
cf91a496d2
Merge pull request #15197 from smatvienko-tb/fix/notification-edge-test-recipients-config
Fix NotificationRuleRecipientsConfig serialization with Jackson 2.18.x
7 months ago
f701507738
Merge pull request #15201 from smatvienko-tb/fix/flaky-timeseries-entity-service-tests
Fix flaky tests: await async save futures before assertions
7 months ago
1c4487b677
Merge pull request #15205 from smatvienko-tb/fix/edge-grpc-combined-pem-ssl
Support combined PEM cert+key for Edge gRPC SSL
7 months ago
8e32d5913c
Merge pull request #15209 from thingsboard/master-rc-merge
Merge rc into master
7 months ago
Viacheslav Klimov
Dmytro Skarzhynets
Sergey Matvienko
dashevchenko
Andrii Landiak