Merge branch 'staging/4.2' into release/4.2

Author: ashvayka

_config.yml

@@ -82,12 +82,12 @@ collections:
 release:
   branch: release-4.2
   branch_major_next: master
-  ver: 4.2.1
-  ce_ver: 4.2.1
-  ce_tag: v4.2.1
-  ce_full_ver: 4.2.1
-  pe_ver: 4.2.1pe
-  pe_full_ver: 4.2.1PE
+  ver: 4.2.1.1
+  ce_ver: 4.2.1.1
+  ce_tag: v4.2.1.1
+  ce_full_ver: 4.2.1.1
+  pe_ver: 4.2.1.1pe
+  pe_full_ver: 4.2.1.1PE
   wd_examples_commit: v4.2.1
   # >>> EDGE
   edge_ver: 4.2

_data/pe/resources.yml

@@ -1,3 +1,8 @@
+4.2.1.1:
+  centos-download: wget https://dist.thingsboard.io/thingsboard-4.2.1.1pe.rpm
+  centos-installation: sudo rpm -Uvh thingsboard-4.2.1.1pe.rpm
+  ubuntu-download: wget https://dist.thingsboard.io/thingsboard-4.2.1.1pe.deb
+  ubuntu-installation: sudo dpkg -i thingsboard-4.2.1.1pe.deb
 4.2.1:
   centos-download: wget https://dist.thingsboard.io/thingsboard-4.2.1pe.rpm
   centos-installation: sudo rpm -Uvh thingsboard-4.2.1pe.rpm

_data/resources.yml

@@ -1,3 +1,8 @@
+4.2.1.1:
+  centos-download: wget https://github.com/thingsboard/thingsboard/releases/download/v4.2.1.1/thingsboard-4.2.1.1.rpm
+  centos-installation: sudo rpm -Uvh thingsboard-4.2.1.1.rpm
+  ubuntu-download: wget https://github.com/thingsboard/thingsboard/releases/download/v4.2.1.1/thingsboard-4.2.1.1.deb
+  ubuntu-installation: sudo dpkg -i thingsboard-4.2.1.1.deb
 4.2.1:
   centos-download: wget https://github.com/thingsboard/thingsboard/releases/download/v4.2.1/thingsboard-4.2.1.rpm
   centos-installation: sudo rpm -Uvh thingsboard-4.2.1.rpm

_data/upgrade-unstructions-table.yml

@@ -1,3 +1,8 @@
+4.2.1.1:
+  upgradable-from: "4.2.1"
+  release-date: Dec 24 2025
+  lts: "true"
+  upgrade: "false"
 4.2.1:
   upgradable-from: "4.2.0"
   release-date: Oct 15 2025

_includes/docs/pe/releases/releases-table/v4-2-1.md

@@ -1,3 +1,50 @@
+### ThingsBoard PE v4.2.1.1 (Dec 24, 2025)
+
+Everything from [TB CE v4.2.1.1](https://github.com/thingsboard/thingsboard/releases/tag/v4.2.1.1) with the following bug fixes.
+
+* Core & Rule Engine
+
+  * Fixed concurrency issue when creating entity via integration
+  * Fixed secret replacement when additional text present
+  * Fixed mapping of uplink payload with null values
+  * Added validation for custom translation terminal key updating
+  * Fixed customer boundary access check for group entities
+  * Fixed version loading for entity group without entities
+  * Fixed EntityDataTable for multiple keys with aggregation in reports
+  * Fixed unit/decimal formatting for text components in reports
+  * Fixed report entity loading for entities table
+  * Fixed originator name in alarms view
+  * Fixed aggregation output for empty result in reports
+  * Marked Generate Dashboard Report scheduler event as deprecated
+  * Put zero for COUNT/COUNT_UNIQUE when all children are filtered out in Aggregate latest node
+  * Ensured message processing context is preserved when duplicating for new originators in Duplicate nodes
+  * Fixed CF reprocessing when current owner argument is used
+  * Fixed CF reprocessing for CFs with TS Rolling and Attributes arguments
+  * Fixed bug with casting number types and displaying errors in events for OPC-UA integration
+  * Fixed gateway info mapping for converters
+
+* Edge
+
+  * Fixed automatic syncing of Generic Permissions from Cloud to Edge for User Groups
+
+* UI
+
+  * Fixed report split components for Firefox browser
+  * Fixed scheduler event and enabled embed title for dashboard report and files widget
+  * Fixed minor bugs in Secret Storage
+  * Fixed ThingPark Enterprise integration disabled mode
+  * Fixed export widget timeseries data with multiple datasources
+  * Added validation for Application title in White labeling
+  * Added ability to add new converter on integrations modal
+  * Added validation for first/last name fields in signup
+  * Fixed data converter library selection for add/edit converter
+  * Fixed alignment of solution template card action buttons
+  * Unified button labels for "Make public/private" dialogs for entity groups
+  * Improved default hostnames for Apache, OPC-UA, and Kafka integrations
+  * Added downlink converter for OPC-UA
+  * Added missing default text for entity type report
+
+
 ### ThingsBoard PE v4.2.1 (Oct 15, 2025)
 
 Everything from [TB CE v4.2.1](https://github.com/thingsboard/thingsboard/releases/tag/v4.2.1) with the following improvements and bug fixes.

_includes/docs/pe/user-guide/install/docker-upgrade-steps.md

@@ -4,11 +4,22 @@
 
 2. Execute the following commands:
 
+
+{% if include.skipUpgrade %}
+  ```bash
+  docker pull thingsboard/tb-pe-node:{{ current_version }}
+  docker pull thingsboard/tb-web-report:{{ current_version }}
+  docker compose stop thingsboard-pe
+  docker compose up -d
+  ```
+  {: .copy-code}
+{% else %}
   ```bash
   docker pull thingsboard/tb-pe-node:{{ current_version }}
   docker pull thingsboard/tb-web-report:{{ current_version }}
   docker compose stop thingsboard-pe
   docker compose run --rm -e UPGRADE_TB=true thingsboard-pe
   docker compose up -d
   ```
-  {: .copy-code}
+  {: .copy-code}
+{% endif %}

_includes/docs/pe/user-guide/integrations/remote-integrations.md

@@ -138,7 +138,7 @@ CoAP<br> Integration<br>%,%coap%,%templates/install/integration/coap-ubuntu.md{%
 
 ### CentOS/RHEL Server
 
- - Install Java 11 (OpenJDK) 
+ - Install Java 17 (OpenJDK) 
 
 {% include templates/install/rhel-java-install.md %}
 

_includes/docs/releases/releases-table/v4-2-1.md

@@ -1,3 +1,80 @@
+### ThingsBoard CE v4.2.1.1 (Dec 24, 2025)
+
+Patch release with the following bug fixes:
+
+**What's Changed**
+
+* Core & Rule Engine
+
+  * [#14211](https://github.com/thingsboard/thingsboard/pull/14211) Fixed redundant credentials update event and device reconnect on bulk import by @AndriiLandiak
+  * [#14235](https://github.com/thingsboard/thingsboard/pull/14235) Added validation that prohibits last tenant admin deletion by @dashevchenko
+  * [#14062](https://github.com/thingsboard/thingsboard/pull/14062) Fixed check of pre-provisioned devices by @dashevchenko
+  * [#14179](https://github.com/thingsboard/thingsboard/pull/14179) Fixed firmware update when the OTA package has a URL instead of a file by @dashevchenko
+  * [#14209](https://github.com/thingsboard/thingsboard/pull/14209) Fixed error when using resources and templatization with GitHub Models AI provider by @dashevchenko
+  * [#14245](https://github.com/thingsboard/thingsboard/pull/14245) Fixed some tenant admins not displayed in related group with EDQS by @dashevchenko
+  * [#14457](https://github.com/thingsboard/thingsboard/pull/14457) Fixed XSS vulnerability for some entities by @dashevchenko
+  * [#14487](https://github.com/thingsboard/thingsboard/pull/14487) Fixed invalid alarm status subscription updates by @dashevchenko
+  * [#13836](https://github.com/thingsboard/thingsboard/pull/13836) Fixed NPE when evaluating dynamic duration rules in device profile node by @dskarzh
+  * [#14244](https://github.com/thingsboard/thingsboard/pull/14244) Improved support of customer-owned entities in `customer attributes` and `change originator` rule nodes by @dskarzh
+  * [#14467](https://github.com/thingsboard/thingsboard/pull/14467) Updated AI models autocomplete options by @dskarzh
+  * [#14195](https://github.com/thingsboard/thingsboard/pull/14195) Fixed incorrect CF calculation when same key is used across multiple arguments by @irynamatveieva
+  * [#14526](https://github.com/thingsboard/thingsboard/pull/14526) Fixed timestamp handling for calculated field arguments with missing telemetry by @irynamatveieva
+  * [#14623](https://github.com/thingsboard/thingsboard/pull/14623) Fixed processing of telemetry batch in calculated fields by @irynamatveieva
+  * [#14499](https://github.com/thingsboard/thingsboard/pull/14499) Fixed last update ts handling for CF arguments by @ShvaykaD
+  * [#14536](https://github.com/thingsboard/thingsboard/pull/14536) Fixed key dictionary race condition causing Hibernate to cache zero keyId in cluster mode by @ShvaykaD
+  * [#14264](https://github.com/thingsboard/thingsboard/pull/14264) Improve task cancellation handling in task manager by @ViacheslavKlimov
+  * [#14479](https://github.com/thingsboard/thingsboard/pull/14479) Fixed vulnerabilities by @ViacheslavKlimov
+  * [#14572](https://github.com/thingsboard/thingsboard/pull/14572) Fixed and improved CF states restore by @ViacheslavKlimov
+  * [#14587](https://github.com/thingsboard/thingsboard/pull/14587) Fixed Kafka topics cache by @ViacheslavKlimov
+
+* Transports
+
+  * [#14327](https://github.com/thingsboard/thingsboard/pull/14327) Fixed occasional application startup failure due to SNMP transport init by @artem-barysh-dev
+  * [#14407](https://github.com/thingsboard/thingsboard/pull/14407) Added ACK when Gateway connect goes wrong by @artem-barysh-dev
+  * [#14241](https://github.com/thingsboard/thingsboard/pull/14241) Fixed firmware update by URL for LwM2M by @nickAS21
+  * [#14294](https://github.com/thingsboard/thingsboard/pull/14294) Fixed observe after reboot without unregistration for LwM2M by @nickAS21
+  * [#14403](https://github.com/thingsboard/thingsboard/pull/14403) Fixed NPE after reboot if sleep for LwM2M by @nickAS21
+  * [#14624](https://github.com/thingsboard/thingsboard/pull/14624) Fixed tb-node startup when MQTT SSL enabled but MQTT transport disabled by @smatvienko-tb
+
+* Edge
+
+  * [#14461](https://github.com/thingsboard/thingsboard/pull/14461) Fixed customer unassignments in the dashboard during edge event processing by @MazurenkoNick
+  * [#14613](https://github.com/thingsboard/thingsboard/pull/14613) Fixed events from different edges being mixed together in one queue by @MazurenkoNick
+  * [#14425](https://github.com/thingsboard/thingsboard/pull/14425) Fixed dead Kafka consumer groups causing Edge sync failures by @volodymyr-babak
+  * [#14616](https://github.com/thingsboard/thingsboard/pull/14616) Fixed infinite loop on Edge Kafka consumer commit failure by @volodymyr-babak
+
+* UI
+
+  * [#14481](https://github.com/thingsboard/thingsboard/pull/14481) Fixed check connectivity request for AI models by @ArtemDzhereleiko
+  * [#14396](https://github.com/thingsboard/thingsboard/pull/14396) Fixed TinyMCE out-positioned image source by @deaflynx
+  * [#14377](https://github.com/thingsboard/thingsboard/pull/14377) Fixed JS module file encoding to include handling of special symbols by @DmytroKhylko
+  * [#14134](https://github.com/thingsboard/thingsboard/pull/14134) Fixed filtering entity and alarm tables by @LeoMorgan113
+  * [#14022](https://github.com/thingsboard/thingsboard/pull/14022) Fixed validation for "Email" fields by @mtsymbarov-del
+  * [#14048](https://github.com/thingsboard/thingsboard/pull/14048) Added ability to access logout button when hide toolbar option is enabled on dashboard by @mtsymbarov-del
+  * [#14085](https://github.com/thingsboard/thingsboard/pull/14085) Fixed dialogs adjusting to the screen resolution by @mtsymbarov-del
+  * [#14091](https://github.com/thingsboard/thingsboard/pull/14091) Added support for custom translations in LED Indicator widget title by @mtsymbarov-del
+  * [#14092](https://github.com/thingsboard/thingsboard/pull/14092) Fixed i18n custom translation in Attributes Card widget in data post-processing function by @mtsymbarov-del
+  * [#14140](https://github.com/thingsboard/thingsboard/pull/14140) Fixed widget entity alias empty entity list field by @mtsymbarov-del
+  * [#14143](https://github.com/thingsboard/thingsboard/pull/14143) Added alarm type list key translations by @mtsymbarov-del
+  * [#14151](https://github.com/thingsboard/thingsboard/pull/14151) Added support for custom translations in the dashboard user filters dialog by @mtsymbarov-del
+  * [#14185](https://github.com/thingsboard/thingsboard/pull/14185) Added draggable overlay option on map widget settings by @mtsymbarov-del
+  * [#14248](https://github.com/thingsboard/thingsboard/pull/14248) Fixed misspelling in Entity views Time series data section by @mtsymbarov-del
+  * [#14261](https://github.com/thingsboard/thingsboard/pull/14261) Fixed subscriptSizing of phone input by @mtsymbarov-del
+  * [#14296](https://github.com/thingsboard/thingsboard/pull/14296) Fixed typo in get queue statistics request method by @mtsymbarov-del
+  * [#14297](https://github.com/thingsboard/thingsboard/pull/14297) Fixed deleted user IDs remaining in Notification recipient user list by @mtsymbarov-del
+  * [#14298](https://github.com/thingsboard/thingsboard/pull/14298) Fixed parse function calling for control widgets by @mtsymbarov-del
+  * [#14569](https://github.com/thingsboard/thingsboard/pull/14569) Fixed profile saves triggers the saved configuration without changes by @mtsymbarov-del
+  * [#14615](https://github.com/thingsboard/thingsboard/pull/14615) Fixed mutation in mergeDeepIgnoreArray function by @mtsymbarov-del
+  * [#14392](https://github.com/thingsboard/thingsboard/pull/14392) Fixed incorrect error height of timeout message by @vvlladd28
+  * [#14243](https://github.com/thingsboard/thingsboard/pull/14243) Updated Lietuvių (Lithuanian) translation by @vvlladd28
+  * [#14254](https://github.com/thingsboard/thingsboard/pull/14254) Added show GitHub button to main toolbar by @vvlladd28
+  * [#14443](https://github.com/thingsboard/thingsboard/pull/14443) Fixed show duration in alarm details dialog by @vvlladd28
+  * [#14480](https://github.com/thingsboard/thingsboard/pull/14480) Fixed vulnerabilities by @vvlladd28
+  * [#14574](https://github.com/thingsboard/thingsboard/pull/14574) Updated translations by @vvlladd28
+
+**Full Changelog**: [https://github.com/thingsboard/thingsboard/compare/v4.2.1...v4.2.1.1](https://github.com/thingsboard/thingsboard/compare/v4.2.1...v4.2.1.1)
+
+
 ### ThingsBoard CE v4.2.1 (Oct 15, 2025)
 
 Minor release with the following bug fixes and improvements:

_includes/docs/user-guide/install/docker-compose-upgrade-steps.md

@@ -8,9 +8,17 @@
 
 2. Execute the following commands:
 
+{% if include.skipUpgrade %}
   ```bash
-  ./docker-stop-services.sh
+  ./docker-stop-services.sh  
+  ./docker-start-services.sh
+  ```
+{% else %}
+  ```bash
+  ./docker-stop-services.sh  
   ./docker-upgrade-tb.sh
   ./docker-start-services.sh
   ```
+{% endif %}
+
   {: .copy-code}

_includes/docs/user-guide/install/docker-upgrade-steps.md

@@ -4,10 +4,20 @@
 
 2. Execute the following commands:
 
+
+{% if include.skipUpgrade %}
+  ```bash
+  docker pull thingsboard/tb-node:{{ current_version }}
+  docker compose stop thingsboard-ce 
+  docker compose up -d
+  ```
+  {: .copy-code}
+{% else %}
   ```bash
   docker pull thingsboard/tb-node:{{ current_version }}
   docker compose stop thingsboard-ce
-  docker compose run --rm -e UPGRADE_TB=true thingsboard-ce
+  docker compose run --rm -e UPGRADE_TB=true thingsboard-ce 
   docker compose up -d
   ```
-  {: .copy-code}
+  {: .copy-code}
+{% endif %}