diff --git a/application/pom.xml b/application/pom.xml
index 6ca5822d21..91dec1847e 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -193,8 +193,8 @@
logback-classic
- javax.mail
- mail
+ com.sun.mail
+ javax.mail
org.apache.curator
diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index 3e24054396..4ed2838ca8 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -637,7 +637,7 @@ queue:
pack-processing-timeout: "${TB_QUEUE_CORE_PACK_PROCESSING_TIMEOUT_MS:60000}"
stats:
enabled: "${TB_QUEUE_CORE_STATS_ENABLED:true}"
- print-interval-ms: "${TB_QUEUE_CORE_STATS_PRINT_INTERVAL_MS:10000}"
+ print-interval-ms: "${TB_QUEUE_CORE_STATS_PRINT_INTERVAL_MS:60000}"
js:
# JS Eval request topic
request_topic: "${REMOTE_JS_EVAL_REQUEST_TOPIC:js_eval.requests}"
@@ -657,7 +657,7 @@ queue:
pack-processing-timeout: "${TB_QUEUE_RULE_ENGINE_PACK_PROCESSING_TIMEOUT_MS:60000}"
stats:
enabled: "${TB_QUEUE_RULE_ENGINE_STATS_ENABLED:true}"
- print-interval-ms: "${TB_QUEUE_RULE_ENGINE_STATS_PRINT_INTERVAL_MS:10000}"
+ print-interval-ms: "${TB_QUEUE_RULE_ENGINE_STATS_PRINT_INTERVAL_MS:60000}"
queues:
- name: "${TB_QUEUE_RE_MAIN_QUEUE_NAME:Main}"
topic: "${TB_QUEUE_RE_MAIN_TOPIC:tb_rule_engine.main}"
diff --git a/pom.xml b/pom.xml
index c76b9c4180..e70ae211cd 100755
--- a/pom.xml
+++ b/pom.xml
@@ -30,10 +30,10 @@
${basedir}
thingsboard
- 2.2.4.RELEASE
+ 2.2.6.RELEASE
2.1.2.RELEASE
- 5.2.2.RELEASE
- 5.2.2.RELEASE
+ 5.2.6.RELEASE
+ 5.2.3.RELEASE
2.2.4.RELEASE
3.1.0
0.7.0
@@ -62,14 +62,14 @@
2.6.2
1.7
2.0
- 1.4.3
+ 1.6.2
4.2.0
3.5.5
3.11.4
1.22.1
1.16.18
1.1.0
- 4.1.45.Final
+ 4.1.49.Final
1.5.0
4.8.0
2.19.1
@@ -471,12 +471,12 @@
org.springframework.security
spring-security-oauth2-client
- ${spring.version}
+ ${spring-security.version}
org.springframework.security
spring-security-oauth2-jose
- ${spring.version}
+ ${spring-security.version}
org.springframework.boot
@@ -591,8 +591,8 @@
${rabbitmq.version}
- javax.mail
- mail
+ com.sun.mail
+ javax.mail
${mail.version}
@@ -610,6 +610,12 @@
org.apache.zookeeper
zookeeper
${zookeeper.version}
+
+
+ log4j
+ log4j
+
+
com.jayway.jsonpath
@@ -692,6 +698,12 @@
com.github.fge
json-schema-validator
${json-schema-validator.version}
+
+
+ javax.mail
+ mailapi
+
+
com.typesafe.akka
@@ -928,12 +940,6 @@
com.microsoft.azure
azure-servicebus
${azure-servicebus.version}
-
-
- com.microsoft.azure
- adal4j
-
-
org.passay
diff --git a/rule-engine/rule-engine-api/pom.xml b/rule-engine/rule-engine-api/pom.xml
index 8070bac591..58104ea07e 100644
--- a/rule-engine/rule-engine-api/pom.xml
+++ b/rule-engine/rule-engine-api/pom.xml
@@ -93,5 +93,10 @@
spring-data-redis
provided
+
+ com.sun.mail
+ javax.mail
+ provided
+