Dmytro Skarzhynets
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							bee8f370b9
							
						
					 | 
					
						
						
							
							Merge branch 'master' into ai
						
						
						
						
						
						
						
						# Conflicts:
#	application/src/main/data/upgrade/basic/schema_update.sql
#	application/src/main/java/org/thingsboard/server/controller/BaseController.java
#	application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
#	application/src/main/java/org/thingsboard/server/service/security/permission/Resource.java
#	application/src/main/java/org/thingsboard/server/service/security/permission/TenantAdminPermissions.java
#	common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
#	common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java
#	common/proto/src/main/proto/queue.proto
#	dao/pom.xml
#	dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
#	dao/src/main/resources/sql/schema-entities.sql
#	rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/TenantIdLoader.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/TenantIdLoaderTest.java 
						
						
					 | 
					
						2025-06-23 20:31:59 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							ebf6f66cbe
							
						
					 | 
					
						
						
							
							Version set to 4.2.0-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2025-06-03 18:55:18 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							2de733ef69
							
						
					 | 
					
						
						
							
							Version set to 4.2.0
						
						
						
						
						
						
					 | 
					
						2025-06-03 18:42:01 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							850af5d126
							
						
					 | 
					
						
						
							
							Version set to 4.1.0-RC
						
						
						
						
						
						
					 | 
					
						2025-06-02 15:19:20 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dmytro Skarzhynets
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c2776ce7a6
							
						
					 | 
					
						
						
							
							AI rule node: add JSON Schema to rule node config
						
						
						
						
						
						
					 | 
					
						2025-05-20 17:59:58 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ViacheslavKlimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							ac9e738018
							
						
					 | 
					
						
						
							
							Task processing timeout
						
						
						
						
						
						
					 | 
					
						2025-05-02 17:43:14 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							bee6c19a51
							
						
					 | 
					
						
						
							
							Version 4.1.0-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2025-04-22 10:58:36 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							a40f9d6ae4
							
						
					 | 
					
						
						
							
							Ver 4.0.1-RC
						
						
						
						
						
						
					 | 
					
						2025-04-22 10:56:47 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							757c887034
							
						
					 | 
					
						
						
							
							Version 4.1.0-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2025-04-15 13:06:03 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							508f00ab24
							
						
					 | 
					
						
						
							
							Merge branch 'rc'
						
						
						
						
						
						
					 | 
					
						2025-04-15 12:56:17 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								IrynaMatveieva
							
						 
					 | 
					
						
						
						
						
							
						
						
							c87b14847c
							
						
					 | 
					
						
						
							
							added custom expressions for math node
						
						
						
						
						
						
					 | 
					
						2025-04-07 14:18:58 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								IrynaMatveieva
							
						 
					 | 
					
						
						
						
						
							
						
						
							56598a5247
							
						
					 | 
					
						
						
							
							added tests and moved to common util
						
						
						
						
						
						
					 | 
					
						2025-03-21 13:17:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							da2bada90b
							
						
					 | 
					
						
						
							
							Merge with RC
						
						
						
						
						
						
					 | 
					
						2025-03-14 15:52:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							3b4ee01aac
							
						
					 | 
					
						
						
							
							Version set to 4.0.0-RC
						
						
						
						
						
						
					 | 
					
						2025-03-14 15:08:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							5cf26d4851
							
						
					 | 
					
						
						
							
							Update license header
						
						
						
						
						
						
					 | 
					
						2025-02-25 09:39:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							b7750bc342
							
						
					 | 
					
						
						
							
							Version set to 4.0.0-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2025-02-25 09:28:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							6a0fff0737
							
						
					 | 
					
						
						
							
							Version set to 3.9.1-RC
						
						
						
						
						
						
					 | 
					
						2025-02-25 09:27:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							77d2826f96
							
						
					 | 
					
						
						
							
							Version set to 4.0.0-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2024-12-04 16:53:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							190bba72f9
							
						
					 | 
					
						
						
							
							Temp Version set to 3.9.0-RC
						
						
						
						
						
						
					 | 
					
						2024-12-04 16:52:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ac0468edd
							
						
					 | 
					
						
						
							
							Version set to 4.0.0-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2024-12-04 16:51:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							fdbe59c610
							
						
					 | 
					
						
						
							
							Version set to 3.9.0-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2024-10-14 18:32:35 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							d11f866856
							
						
					 | 
					
						
						
							
							Version set to 3.8.1-RC
						
						
						
						
						
						
					 | 
					
						2024-10-14 18:27:21 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							b4124f7c4c
							
						
					 | 
					
						
						
							
							Merge with RC
						
						
						
						
						
						
					 | 
					
						2024-09-26 11:10:56 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d705f26fd
							
						
					 | 
					
						
						
							
							Version set to 3.8.0-RC
						
						
						
						
						
						
					 | 
					
						2024-09-26 11:09:26 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							3dadc34b5b
							
						
					 | 
					
						
						
							
							Version set to 3.9.0-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2024-09-26 10:38:27 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							025fb1ca8c
							
						
					 | 
					
						
						
							
							Version set to 3.8.0
						
						
						
						
						
						
					 | 
					
						2024-09-26 09:46:57 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							468c007882
							
						
					 | 
					
						
						
							
							Version set to 3.7.1-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2024-06-20 15:53:41 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oleksandra Matviienko
							
						 
					 | 
					
						
						
						
						
							
						
						
							63df92e995
							
						
					 | 
					
						
						
							
							JUnit5 migration in common. Junit-platform.properties and logback-test.xml where added to java resource directories if needed.
						
						
						
						
						
						
						
						Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com> 
						
						
					 | 
					
						2024-04-26 23:55:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Matvienko
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f1086f106
							
						
					 | 
					
						
						
							
							JacksonUtil Jdk8Module added along with jackson-datatype-jdk8 dependency to address the Optional mapping
						
						
						
						
						
						
					 | 
					
						2024-04-23 11:00:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sergey Matvienko
							
						 
					 | 
					
						
						
						
						
							
						
						
							e3f2974fcd
							
						
					 | 
					
						
						
							
							dependency: bouncycastle jdk15on moved to jdk18on
						
						
						
						
						
						
					 | 
					
						2024-04-19 23:25:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							5acf527f1a
							
						
					 | 
					
						
						
							
							Version set to 3.7.0-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2024-01-16 11:43:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							60be820915
							
						
					 | 
					
						
						
							
							merge with master
						
						
						
						
						
						
					 | 
					
						2024-01-15 18:51:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5a72ed8df
							
						
					 | 
					
						
						
							
							Update license header to 2024 year.
						
						
						
						
						
						
					 | 
					
						2024-01-09 10:46:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							bc35df1dd7
							
						
					 | 
					
						
						
							
							Version set to 3.6.3-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2023-12-27 12:58:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							feb44656f1
							
						
					 | 
					
						
						
							
							merge with master
						
						
						
						
						
						
					 | 
					
						2023-12-26 00:58:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							df24c363ce
							
						
					 | 
					
						
						
							
							Version set to 3.6.2-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2023-11-13 17:07:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a2bc396f2
							
						
					 | 
					
						
						
							
							Merge with hotfix/3.6
						
						
						
						
						
						
					 | 
					
						2023-10-25 15:43:12 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							cf32544e71
							
						
					 | 
					
						
						
							
							added SslUtil and tests
						
						
						
						
						
						
					 | 
					
						2023-10-17 23:20:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							dd4b874b5f
							
						
					 | 
					
						
						
							
							Version set to 3.6.1-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2023-09-27 17:38:27 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							8cefca23ac
							
						
					 | 
					
						
						
							
							Version set to 3.6.1-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2023-09-25 11:27:00 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							98c245e293
							
						
					 | 
					
						
						
							
							Switch to version 3.6.0
						
						
						
						
						
						
					 | 
					
						2023-09-05 18:28:15 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							db6f310284
							
						
					 | 
					
						
						
							
							migration to spring boot 3.1
						
						
						
						
						
						
					 | 
					
						2023-06-05 15:24:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ae1f1e329
							
						
					 | 
					
						
						
							
							Version set to 3.5.2-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2023-05-22 16:32:24 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Kulikov
							
						 
					 | 
					
						
						
						
						
							
						
						
							59cc8244b5
							
						
					 | 
					
						
						
							
							Version set to 3.5.1-SNAPSHOT
						
						
						
						
						
						
					 | 
					
						2023-05-22 16:31:19 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrii Shvaika
							
						 
					 | 
					
						
						
						
						
							
						
						
							6120fb132a
							
						
					 | 
					
						
						
							
							Version set to 3.5.2. Migration script improved
						
						
						
						
						
						
					 | 
					
						2023-05-22 13:16:06 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							3caae012d6
							
						
					 | 
					
						
						
							
							minor improvements
						
						
						
						
						
						
					 | 
					
						2023-05-19 19:39:45 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YevhenBondarenko
							
						 
					 | 
					
						
						
						
						
							
						
						
							bcd2b94156
							
						
					 | 
					
						
						
							
							fixed start for windows
						
						
						
						
						
						
					 | 
					
						2023-05-10 17:18:45 +02:00 | 
					
					
						
						
							
							
							
						
					 |