80be89ae4a
Merge branch 'lts-4.3' into lts-4.4
2 weeks ago
14cb7495fb
Merge remote-tracking branch 'upstream/lts-4.2' into lts-4.3
# Conflicts:
# ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-actions.service.ts
# ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-add-item-dialog.component.ts
2 weeks ago
b31845e4be
Merge pull request #16028 from pinkevmladchy/iot-hub-built-in-items
Open built-in IoT Hub items locally instead of installing duplicates
2 weeks ago
ce70d31eb3
Merge branch 'lts-4.3' into lts-4.4
3 weeks ago
1c35c03a52
Merge pull request #16012 from irynamatveieva/fix/openapi-discriminator-mapping
Add OpenAPI discriminator mapping to polymorphic LwM2M and job types
3 weeks ago
4d6600834c
Add OpenAPI discriminator mapping to polymorphic LwM2M and job types
3 weeks ago
187060e55c
Merge branch 'lts-4.3' into lts-4.4
3 weeks ago
51324cba9d
Merge remote-tracking branch 'origin/lts-4.2' into lts-4.3
3 weeks ago
9fb569d966
Merge pull request #16006 from irynamatveieva/fix/telemetry-observe-strategy-enum-schema
Fix TelemetryObserveStrategy enum values in OpenAPI spec
3 weeks ago
ee541307d2
Merge branch 'lts-4.3' into lts-4.4
# Conflicts:
# application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
# application/src/main/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGrpcSession.java
4 weeks ago
8c8e178831
Merge remote-tracking branch 'origin/lts-4.2' into lts-4.3
4 weeks ago
2cf0235f1d
Merge pull request #15989 from thingsboard/fix_bug_sparkplug_cancel_session_after_node_connect_m2
Fix bug sparkplug cancel session after node connect m2
4 weeks ago
6d81f29cf7
Merge pull request #15987 from thingsboard/fix_bug_sparkplug_cancel_session_after_node_connect
fix(sparkplug): close session after node connection
4 weeks ago
e2617bcd8e
Fix TelemetryObserveStrategy enum values in OpenAPI spec
4 weeks ago
155700a753
Merge pull request #16004 from MazurenkoNick/fix/edge-event-consumer-thread-leak-lts-4.2
Unblock and interrupt edge event consumer on session destroy
4 weeks ago
6de4b30e5f
Unblock and interrupt edge event consumer on session destroy
4 weeks ago
2c96ebb18d
Merge branch 'fix_bug_sparkplug_cancel_session_after_node_connect' into fix_bug_sparkplug_cancel_session_after_node_connect_m2
# Conflicts:
# common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
1 month ago
2aded56324
sparkplug: fix_bug close session after connect nodde - 2
1 month ago
7d3959036b
sparkplug^ fix_bug close session after connect nodde
1 month ago
b94811000c
Merge pull request #15923 from rusikv/fix/dashboard-widgets-refresh-after-apply
Fix dashboard widgets not refreshing actions after config apply
1 month ago
3b8d1d405b
Merge pull request #15925 from thingsboard/feature/cross-family-lts-migration
Support cross-family LTS upgrades (4.3.x to 4.4) via a family-agnostic migration selector
1 month ago
ebd9d0e003
Merge remote-tracking branch 'origin/master' into feature/cross-family-lts-migration
2 months ago
d4329f3b7c
Merge pull request #15929 from thingsboard/rc
Merge rc into master
2 months ago
5ad19f01be
Merge branch 'lts-4.3' into lts-4.4
2 months ago
08ab1abdec
Merge remote-tracking branch 'origin/lts-4.2' into lts-4.3
2 months ago
be70822bc6
Merge pull request #15926 from thingsboard/refactor/lts-version-is-in-range
Move LTS version range check into LtsVersion
2 months ago
883124dbe6
Merge branch 'refactor/lts-version-is-in-range' into feature/cross-family-lts-migration
# Conflicts:
# application/src/main/java/org/thingsboard/server/service/install/lts/LtsMigrationService.java
2 months ago
1b9b30e49c
Move LTS version range check into LtsVersion
2 months ago
8ec2a949e6
Move LTS version range check into LtsVersion
2 months ago
dd0037f847
Support cross-family LTS upgrades via a family-agnostic migration selector
Loosen LtsMigrationService.select() to pick every bean in the (from, to]
range regardless of family, so a 4.3.x -> 4.4 offline upgrade runs the real
in-range 4.3.1.x beans plus a new 4.4.0.0 baseline bean, each exactly once.
This replaces the ad-hoc explicit V4_3_1_3Migration.apply() call in
DefaultDataUpdateService and moves the 4.4 baseline flat DDL out of
basic/schema_update.sql into V4_4_0_0Migration / lts/4.4.0.0/schema_update.sql.
2 months ago
c2a0f8b5d9
UI: Fix dashboard widgets not refreshing actions after config apply
Restore object-identity tracking (track widget) for the dashboard widget
grid loop. The Angular 20 migration commit ff0e33c07
2 months ago
1fed324009
Merge pull request #15922 from thingsboard/rc
Merge rc into master
2 months ago
389e0ee259
Merge branch 'lts-4.3' into lts-4.4
2 months ago
c603ac80d9
Merge pull request #15904 from thingsboard/rc
rc to lts-4.3
2 months ago
9a4f1c50b5
Merge pull request #15902 from thingsboard/master-rc-merge
Merge rc into master
2 months ago
5a2deb0e67
Merge remote-tracking branch 'origin/rc' into bump/master
# Conflicts:
# application/pom.xml
# 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/discovery-api/pom.xml
# common/edge-api/pom.xml
# common/edge-api/src/main/proto/edge.proto
# common/edqs/pom.xml
# common/message/pom.xml
# common/pom.xml
# common/proto/pom.xml
# common/queue/pom.xml
# common/script/pom.xml
# common/script/remote-js-client/pom.xml
# common/script/script-api/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
# edqs/pom.xml
# monitoring/pom.xml
# msa/black-box-tests/pom.xml
# msa/edqs/pom.xml
# msa/js-executor/package.json
# msa/js-executor/pom.xml
# msa/monitoring/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/package.json
# 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/package.json
# ui-ngx/pom.xml
2 months ago
82b3e015f2
Merge remote-tracking branch 'origin/lts-4.3' into bump/rc
2 months ago
560bad30c3
Version set to 4.3.1.4-SNAPSHOT
2 months ago
e2969dd381
Version set to 4.2.2.4-SNAPSHOT
2 months ago
58e0b43e3a
Merge pull request #15901 from thingsboard/master-rc-merge
Merge rc into master
2 months ago
09f8848376
Merge branch 'rc' into master-rc-merge
# Conflicts:
# dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
2 months ago
7b3272f46c
Merge branch 'lts-4.3' into rc
# Conflicts:
# monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java
2 months ago
7d8035b452
Merge pull request #15897 from zzzeebra/merge/lts-4.2-into-lts-4.3
Merged lts-4.2 deprecation-warning cleanups into lts-4.3
2 months ago
432262f358
Fix AlarmCommentControllerTest delete assertions for callSuper=true
The deprecation cleanup set @EqualsAndHashCode(callSuper = true) on AlarmComment,
so equals/hashCode now include the BaseData id and createdTime. The delete tests
built the expected comment via a fresh builder (no id), which no longer matches the
server-generated deletion comment (which reuses the original comment id).
Mutate the original alarm comment (already carrying the correct id/createdTime) into
the expected SYSTEM deletion comment instead of building a fresh one.
2 months ago
4ddf86a85c
Merge lts-4.2 into lts-4.3
Forward-merge of lts-4.2 into lts-4.3, bringing the deprecation-warning
cleanups (#15487 , #15491 , #15499 , #15503 , #15504 , #15505 , #15509 , #15511 ,
#15512 , #15515 , #15517 , #15522 ) in as real ancestry rather than the earlier
copy-paste (#15661 ).
Conflicts resolved toward the reviewed lts-4.2 form for shared code
(explicit @EqualsAndHashCode(callSuper=true), typed StringUtils/removeStart,
imported test annotations). lts-4.3-only implementations kept as-is
(calculated-field state classes, native CF repository); tests removed on
lts-4.3 (CalculatedFieldLinkDataValidatorTest, DefaultDataUpdateServiceTest)
stay removed.
2 months ago
c0dead8552
Address review comments: rename test config class and drop inline FQN annotations
2 months ago
54f04c1865
Merge pull request #15661 from zzzeebra/chore/build-warnings-cleanup-lts-4.3
Cleaned up build deprecation warnings on lts-4.3
2 months ago
e583a25927
Merge pull request #15509 from zzzeebra/chore/commons-lang3-deprecations-lts-4.2
Replaced deprecated string, number, and random-value helpers with modern equivalents
2 months ago
655d4ed55e
Fix invalid `callSuper = false` usages for EqualsAndHashCode
2 months ago
9e2ed18355
Merge pull request #15504 from zzzeebra/chore/eqhashcode-callsuper-lts-4.2
Technical cleanup of generated-equality annotations
2 months ago
Vladyslav_Prykhodko
Dmytro Pinkevych
Viacheslav Klimov
IrynaMatveieva
Nikita Mazurenko
nickAS21
Ruslan
Oleksandra Matviienko