dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,743 Commits 106 Branches 71 Tags
Commit Graph

637 Commits

Author SHA1 Message Date
nick
45dea3c8f3 tbel:fix bug Operations ADD, SUB ver 1.2.1 2024-06-27 21:56:27 +03:00
Igor Kulikov
468c007882 Version set to 3.7.1-SNAPSHOT 2024-06-20 15:53:41 +03:00
Andrew Shvayka
1f5ef423cf
Merge pull request #10686 from zzzeebra/Jave4to5-msa 
JUnit5 migration in msa.
 2024-05-13 12:16:40 +03:00
Oleksandra Matviienko
bdf577710e Mocks the few JUnit4 classes that testcontainers needs for successful compilation. 
Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com>
 2024-05-07 15:41:23 +02:00
Sergey Matvienko
cfab9c2d34 Standard Commons Logging discovery in action with spring-jcl: please remove commons-logging.jar from classpath in order to avoid potential conflicts 2024-05-06 21:49:46 +02:00
YevhenBondarenko
61306c8026 Merge branch 'master' of github.com:thingsboard/thingsboard into feature/jwt-version-update 2024-05-02 16:44:26 +02:00
YevhenBondarenko
fdfebe085c fixed mail sender 2024-04-30 17:28:01 +02:00
YevhenBondarenko
1a61e4d064 removed unnecessary comment 2024-04-29 15:46:20 +02:00
YevhenBondarenko
e32797400c updated jjwt version 2024-04-29 15:18:37 +02:00
Sergey Matvienko
f26849a979 Revert "dependency management: added jackson-dataformat-xml for easy merging (not present in the build output)" 
This reverts commit 3d52487d3570bcc007e11f4a9ade05af302e2e66.
 2024-04-22 20:05:05 +02:00
Sergey Matvienko
3d52487d35 dependency management: added jackson-dataformat-xml for easy merging (not present in the build output) 2024-04-22 19:32:11 +02:00
Sergey Matvienko
d11bc722b5 bouncycastle.version 1.78 to be compatible with ext 2024-04-22 19:17:50 +02:00
Sergey Matvienko
f5c9a2e080 Dependency management: bouncycastle added for bcutil-jdk18on and bcprov-ext-jdk18on (mostly for easy merge purposes) 2024-04-22 19:11:25 +02:00
Sergey Matvienko
ee589386cd dependency management com.fasterxml.jackson.dataformat:jackson-dataformat-yaml 2024-04-20 00:02:54 +02:00
Sergey Matvienko
e3f2974fcd dependency: bouncycastle jdk15on moved to jdk18on 2024-04-19 23:25:15 +02:00
Sergey Matvienko
9119352495 dependency: manage grpc-rls version 2024-04-19 23:17:09 +02:00
Sergey Matvienko
5769bfab0a dependency: manage netty versions 2024-04-19 23:16:32 +02:00
Sergey Matvienko
da3b496a68 dependency updated to fix userSettingsDao.findByTypeAndPath: hypersistence-utils-hibernate-63:3.7.4 for hibernate-core:6.4.4. Test and notes added 2024-04-19 22:47:30 +02:00
Sergey Matvienko
c5aef4c8be rollback jjwt version to 0.9.1 as the upgrade to the latest requires an extra effort with a separate PR 2024-04-19 10:04:33 +02:00
Sergey Matvienko
baed75173c rollback jakarta.el.version 2024-04-18 20:49:31 +02:00
Sergey Matvienko
a3e7e0b4a1 major dependency update 2024-04-18 17:11:29 +02:00
Viacheslav Klimov
ae2533162e
Merge branch 'master' into fix_bug_californium_3_11 2024-04-05 16:24:37 +03:00
Andrii Shvaika
a88b1ef349 Merge hotfix/3.6.3 to master 2024-04-04 12:56:17 +03:00
Sergey Matvienko
1a2dd01608 org.apache.zookeeper:zookeeper 3.9.2 2024-04-03 23:28:14 +02:00
Sergey Matvienko
866792fd86 postgresql.driver.version 42.7.3 2024-04-03 23:03:50 +02:00
nick
4ad4b7fc86 lwm2m/coap: add californium 3.11.0 2024-03-28 11:54:03 +02:00
Sergey Matvienko
cd722a1148 bump delight-nashorn-sandbox.version to the latest 0.4.2. As it supports Java 17 2024-03-26 19:34:13 +01:00
Igor Kulikov
8910b4b1df Swagger docs Open API 3.1 2024-03-22 20:02:51 +02:00
ViacheslavKlimov
2ee4d10621 Update TBEL version to 1.2.0 2024-03-19 16:24:06 +02:00
ViacheslavKlimov
4ed952a9d6 Merge branch 'master' into develop/3.7 2024-03-19 15:44:23 +02:00
Andrew Shvayka
a8e1ac9257
Merge pull request #8522 from thingsboard/feature/push-notifications 
Notifications to mobile app
 2024-02-16 16:15:39 +02:00
Armin Felder
3c306a2e70 update logback to 1.4.14 to allow for json logging 2024-02-14 23:23:25 +01:00
Rhyaldir
f35ce53fce Add mockito-inline to support mocking statics and final classes 2024-01-31 14:13:57 +01:00
nick
41adbe1003 coap: final version 2024-01-30 16:37:14 +02:00
nick
cdc6daa7a9 lwm2m: fix buf license excludes 2024-01-22 10:57:05 +02:00
nick
7a173f98bf lwm2m: comments1 2024-01-21 15:50:31 +02:00
nick
32e3d9050b Merge branch 'develop/3.7' into californium_3_9_1 
# Conflicts:
#	application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationWriteAttributesTest.java
 2024-01-16 21:15:44 +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
YevhenBondarenko
71bd6f2bd2 added tests for proto entities 2024-01-10 21:47:39 +01:00
Vladyslav_Prykhodko
5739802fda Merge remote-tracking branch 'upstream/master' into feature/push-notifications 2024-01-09 15:20:49 +02:00
Igor Kulikov
c5a72ed8df Update license header to 2024 year. 2024-01-09 10:46:16 +02:00
nick
38fc45ffc1 Merge branch 'develop/3.7' into californium_3_9_1 2023-12-28 15:16:58 +02:00
Igor Kulikov
bc35df1dd7 Version set to 3.6.3-SNAPSHOT 2023-12-27 12:58:15 +02:00
ViacheslavKlimov
6c0c891f60 Merge branch 'master' into feature/push-notifications 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
#	common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationDeliveryMethod.java
#	common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/NotificationTargetType.java
#	common/data/src/main/java/org/thingsboard/server/common/data/notification/template/DeliveryMethodNotificationTemplate.java
#	pom.xml
#	ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
#	ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss
#	ui-ngx/src/app/modules/home/pages/notification/template/template-configuration.ts
#	ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.html
#	ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.scss
#	ui-ngx/src/app/shared/models/notification.models.ts
 2023-12-27 11:49:28 +02:00
YevhenBondarenko
1fc704bae1 test fixes and minor refactoring 2023-12-26 11:08:06 +01:00
YevhenBondarenko
feb44656f1 merge with master 2023-12-26 00:58:31 +01:00
nick
74daec474f lwm2ml: ver 3.9.1 - start 2023-12-25 22:09:39 +02:00
nick
e6aee089c3 tbBel: ver 1.1.5 2023-12-18 17:49:34 +02:00
YevhenBondarenko
a537ad9b20 fixed flaky tests 2023-12-11 15:50:03 +01:00