Viacheslav Klimov
e6771bb9d3
Add missing EdgeVersion entries V_4_2_2_2 and V_4_3_1_2
3 months ago
Viacheslav Klimov
9c5a363f1e
Merge remote-tracking branch 'origin/rc' into master-rc-merge
# 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
3 months ago
Viacheslav Klimov
00424373fe
Merge remote-tracking branch 'origin/lts-4.3' into rc
3 months ago
Viacheslav Klimov
ee975cf386
Version set to 4.3.1.2-SNAPSHOT
3 months ago
Viacheslav Klimov
1e8e9d5d68
Merge remote-tracking branch 'origin/lts-4.2' into lts-4.3
# 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
3 months ago
Viacheslav Klimov
2a7eab3db5
Version set to 4.2.2.2-SNAPSHOT
3 months ago
Viacheslav Klimov
1fb979600a
Merge pull request #15324 from thingsboard/rc
Merge rc into master
3 months ago
Viacheslav Klimov
11c2deffdc
Merge remote-tracking branch 'origin/lts-4.3' into rc
3 months ago
Viacheslav Klimov
8f57542f81
Merge remote-tracking branch 'origin/lts-4.2' into lts-4.3
3 months ago
Viacheslav Klimov
aad0b2adee
Merge pull request #15323 from vvlladd28/fix/vulnerability/30-03-26-lts-4.3
Fixed CVE-2026-33895, CVE-2026-33894, CVE-2026-33896, CVE-2026-33750, CVE-2026-4923, CVE-2026-33671
3 months ago
Viacheslav Klimov
d805fa96e9
Merge pull request #15322 from vvlladd28/fix/vulnerability/30-03-26
Fixed CVE-2026-33895, CVE-2026-33894, CVE-2026-33896, CVE-2026-33750, CVE-2026-4923, CVE-2026-33671
3 months ago
Vladyslav_Prykhodko
d7853ec14f
Merge branch 'fix/vulnerability/30-03-26' into fix/vulnerability/30-03-26-lts-4.3
3 months ago
Vladyslav_Prykhodko
d5d86dcce5
Fixed CVE-2026-33671
3 months ago
Vladyslav_Prykhodko
e24f0cbaa5
Fixed CVE-2026-4923
3 months ago
Vladyslav_Prykhodko
0f6eab38fa
Fixed CVE-2026-33750
3 months ago
Vladyslav_Prykhodko
479141141e
Fixed CVE-2026-33895, CVE-2026-33894, CVE-2026-33896
3 months ago
Viacheslav Klimov
5a514af0b8
Merge pull request #15316 from thingsboard/rc
Merge rc into master
3 months ago
Viacheslav Klimov
d02ed15a31
Merge remote-tracking branch 'origin/lts-4.3' into rc
3 months ago
Viacheslav Klimov
1cb4df5dd1
Merge remote-tracking branch 'origin/lts-4.2' into lts-4.3
3 months ago
Viacheslav Klimov
20bdca7e47
Merge pull request #15309 from thingsboard/fix/tb-dockerfiles
Add font installation to docker-postgres and docker-cassandra Dockerfiles
3 months ago
Viacheslav Klimov
28424b0d23
Merge pull request #15315 from thingsboard/fix/cves
Fixed CVE-2026-33870, CVE-2026-33871 and GHSA-72hv-8253-57qq
3 months ago
Viacheslav Klimov
f0cfd83f2c
Bump netty-bom from 4.1.131.Final to 4.1.132.Final to fix CVE-2026-33870 and CVE-2026-33871
3 months ago
Viacheslav Klimov
0465d96e1a
Bump jackson-bom from 2.19.4 to 2.21.1 to fix GHSA-72hv-8253-57qq
3 months ago
Viacheslav Klimov
16636f05a1
Merge pull request #15311 from thingsboard/rc
Merge rc into master
3 months ago
Viacheslav Klimov
df936a6247
Merge remote-tracking branch 'origin/lts-4.3' into rc
3 months ago
Viacheslav Klimov
a57bcab2b0
Merge remote-tracking branch 'origin/lts-4.2' into lts-4.3
3 months ago
Viacheslav Klimov
71233b4ab5
Update build.sh to skip packaging
3 months ago
Viacheslav Klimov
0cf75a5b72
Merge pull request #15139 from smatvienko-tb/improvement/per-format-packaging-skip-flags
Add per-format packaging skip flags and replace Spotify dockerfile-maven-plugin
3 months ago
Viacheslav Klimov
daf529bfa1
Merge pull request #15310 from thingsboard/rc
Merge rc into master
3 months ago
Viacheslav Klimov
b5b6425520
Merge remote-tracking branch 'origin/lts-4.3' into rc
3 months ago
Viacheslav Klimov
628defac14
Merge pull request #15308 from irynamatveieva/lts-4.3-fix/cf-cache-tenant-filtering
Fix calculated field cache to filter by tenant
3 months ago
IrynaMatveieva
0e8995eb93
revert tenant filtering except for type-based lookup
3 months ago
Viacheslav Klimov
8185a3418a
Add font installation to docker-postgres and docker-cassandra Dockerfiles
Use ${docker.base.image} instead of hardcoded base image and add the SVG renderer font installation script matching tb-node Dockerfile.
3 months ago
IrynaMatveieva
663fded846
Merge branch 'lts-4.2-fix/cf-cache-tenant-filtering' into lts-4.3-fix/cf-cache-tenant-filtering
3 months ago
IrynaMatveieva
5b94f14096
Fix calculated field cache to filter by tenant
3 months ago
Viacheslav Klimov
4a03ac490a
Merge pull request #15121 from vvlladd28/improvement/rule-chain/note
Rule chain notes
3 months ago
Sergey Matvienko
7bb708888f
Address review: fix pkg.skip.bootjar precedence and remove unused surefire.version
Remove <pkg.skip.bootjar>false</pkg.skip.bootjar> from all child
module <properties> blocks. The root POM already defaults it to false,
and child declarations block the skip-pkg profile override, so
-Dpkg.skip=true was never actually skipping spring-boot:repackage.
Also remove the unused surefire.version property (superseded by
maven-surefire-plugin.version).
3 months ago
Sergey Matvienko
d4bc299833
Fix black-box-tests docker-info dependency resolution
The docker-info artifact type was produced by the removed
dockerfile-maven-plugin. Replace with pom type since the
upstream docker modules use pom packaging. This preserves
the reactor ordering dependency.
3 months ago
Sergey Matvienko
ac96b4035b
Replace Spotify dockerfile-maven-plugin with exec-maven-plugin
The com.spotify:dockerfile-maven-plugin:1.4.13 is deprecated and broken
on modern macOS (Apple Silicon) due to its Java HTTP client being
incompatible with current Docker Desktop socket/API.
Replace the Java-based plugin with exec-maven-plugin calling the docker
CLI directly — the same approach already used by the multiarch push
profiles (push-docker-amd-arm-images).
All existing Maven property contracts preserved:
- dockerfile.skip (default true) controls docker build
- push-docker-image profile for single-arch push
- push-docker-amd-arm-images profiles unchanged (already use exec)
3 months ago
Sergey Matvienko
d2cde5ba94
Add per-format packaging skip flags (pkg.skip.bootjar/deb/rpm/zip)
Introduces four independent flags to skip individual packaging artifacts:
-Dpkg.skip.bootjar=true skip spring-boot repackage (*-boot.jar)
-Dpkg.skip.deb=true skip Gradle buildDeb + Maven attach-artifact
-Dpkg.skip.rpm=true skip Gradle buildRpm
-Dpkg.skip.zip=true skip maven-assembly-plugin Windows ZIP
Adds -Dpkg.skip=true as a single convenience flag that sets all four
at once. msa/pom.xml mirrors the skip-pkg profile to override its own
<pkg.deb.phase>package</pkg.deb.phase> property (child POM properties
have higher priority than parent profile properties in Maven).
msa/* docker modules used ${basedir}/../.. (non-canonical) for main.dir.
maven-enforcer-plugin 3.5.0's osIndependentNameMatch() compares
file.toURI() vs file.getCanonicalFile().toURI() — these differ when the
path contains '..', causing RequireFilesExist to report false-negative.
Fix: replace ${basedir}/../.. with ${maven.multiModuleProjectDirectory}.
4 months ago
Viacheslav Klimov
8d6eaa85d8
Merge pull request #15291 from dashevchenko/shortCustomerInfoFix
Fixed json property name for ShortCustomerInfo.publicCustomer
3 months ago
Viacheslav Klimov
729ac2c3f8
Fixes after review
3 months ago
Vladyslav Prykhodko
49ab06db70
Merge pull request #15294 from thingsboard/rc
Megre rc to master
3 months ago
Vladyslav Prykhodko
2469d97e0d
Merge remote-tracking branch 'upstream/lts-4.3' into rc
3 months ago
Vladyslav Prykhodko
697a31af7a
Merge remote-tracking branch 'upstream/lts-4.2' into lts-4.3
# Conflicts:
# ui-ngx/src/app/shared/components/string-items-list.component.html
# ui-ngx/src/app/shared/components/string-items-list.component.ts
3 months ago
Vladyslav Prykhodko
411b600183
Merge pull request #15273 from vvlladd28/fix/string-items-list-autocomplete
Fixed string-items-list autocomplete selection and blur handling
3 months ago
Vladyslav Prykhodko
00e35f745e
Fix proxy error handling for 502/503/504 HTTP status codes
Move 504 handling from interceptor to parseHttpErrorMessage, add
user-friendly messages for 502/503/504 via httpStatusMessageMap,
and scope isProxyError to only match proxy status codes to avoid
breaking error handling for other HTTP errors.
3 months ago
Vladyslav Prykhodko
46ef7c51a0
Fixed CVE-2026-33228
3 months ago
Vladyslav Prykhodko
7c6fa8e99b
Merge pull request #15267 from mtsymbarov-del/fix/timeseries-tab-styles
Fixed time series table widgets tab style
3 months ago
dashevchenko
87476a94a6
fixed json property name for ShortCustomerInfo.publicCustomer
3 months ago