From 73805759f6866c505586f813e5d860fe1f5b4bc9 Mon Sep 17 00:00:00 2001 From: YevhenBondarenko Date: Mon, 4 May 2020 14:45:27 +0300 Subject: [PATCH 1/9] updated spring and netty versions, excluded log4j from zookeeper dependency --- pom.xml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 4a8fcad0ee..7ccafddac9 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 @@ -69,7 +69,7 @@ 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 @@ -606,6 +606,12 @@ org.apache.zookeeper zookeeper ${zookeeper.version} + + + log4j + log4j + + com.jayway.jsonpath From 9d8a7f04265b4e4944b7668a5a1b443d75c5282c Mon Sep 17 00:00:00 2001 From: YevhenBondarenko Date: Mon, 4 May 2020 17:30:22 +0300 Subject: [PATCH 2/9] improvements --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 7ccafddac9..95b5354a78 100755 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ thingsboard 2.2.6.RELEASE 2.1.2.RELEASE - 5.2.6.RELEASE + 5.2.3.RELEASE 5.2.3.RELEASE 2.2.4.RELEASE 3.1.0 @@ -467,12 +467,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 From b592e88643f12d21e5eb2c0869336de2a9207041 Mon Sep 17 00:00:00 2001 From: Andrii Shvaika Date: Mon, 4 May 2020 17:40:35 +0300 Subject: [PATCH 3/9] Default Statistics interval is 1 min --- application/src/main/resources/thingsboard.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 254162b56b..2d1fdc2190 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -638,7 +638,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}" @@ -658,7 +658,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}" From a167ee2e322dfa7fdfca975c9f71fa20ee4ff830 Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Mon, 4 May 2020 18:54:14 +0300 Subject: [PATCH 4/9] Revert "improvements" This reverts commit 9d8a7f04265b4e4944b7668a5a1b443d75c5282c. --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 95b5354a78..7ccafddac9 100755 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ thingsboard 2.2.6.RELEASE 2.1.2.RELEASE - 5.2.3.RELEASE + 5.2.6.RELEASE 5.2.3.RELEASE 2.2.4.RELEASE 3.1.0 @@ -467,12 +467,12 @@ org.springframework.security spring-security-oauth2-client - ${spring-security.version} + ${spring.version} org.springframework.security spring-security-oauth2-jose - ${spring-security.version} + ${spring.version} org.springframework.boot From a6648163bb64fe2aed85f20f3002857a0bfae9c5 Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Mon, 4 May 2020 18:54:14 +0300 Subject: [PATCH 5/9] Revert "updated spring and netty versions, excluded log4j from zookeeper dependency" This reverts commit 73805759f6866c505586f813e5d860fe1f5b4bc9. --- pom.xml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 7ccafddac9..4a8fcad0ee 100755 --- a/pom.xml +++ b/pom.xml @@ -30,10 +30,10 @@ ${basedir} thingsboard - 2.2.6.RELEASE + 2.2.4.RELEASE 2.1.2.RELEASE - 5.2.6.RELEASE - 5.2.3.RELEASE + 5.2.2.RELEASE + 5.2.2.RELEASE 2.2.4.RELEASE 3.1.0 0.7.0 @@ -69,7 +69,7 @@ 1.22.1 1.16.18 1.1.0 - 4.1.49.Final + 4.1.45.Final 1.5.0 4.8.0 2.19.1 @@ -606,12 +606,6 @@ org.apache.zookeeper zookeeper ${zookeeper.version} - - - log4j - log4j - - com.jayway.jsonpath From 9f773fb37f2b4e152bcfa109132dad54c53a1834 Mon Sep 17 00:00:00 2001 From: YevhenBondarenko Date: Mon, 4 May 2020 14:45:27 +0300 Subject: [PATCH 6/9] updated spring and netty versions, excluded log4j from zookeeper dependency --- pom.xml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 4a8fcad0ee..7ccafddac9 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 @@ -69,7 +69,7 @@ 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 @@ -606,6 +606,12 @@ org.apache.zookeeper zookeeper ${zookeeper.version} + + + log4j + log4j + + com.jayway.jsonpath From f1e651bb7dbe6615a036c6f1f24ee04377c03142 Mon Sep 17 00:00:00 2001 From: YevhenBondarenko Date: Mon, 4 May 2020 17:30:22 +0300 Subject: [PATCH 7/9] improvements --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 7ccafddac9..95b5354a78 100755 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ thingsboard 2.2.6.RELEASE 2.1.2.RELEASE - 5.2.6.RELEASE + 5.2.3.RELEASE 5.2.3.RELEASE 2.2.4.RELEASE 3.1.0 @@ -467,12 +467,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 From 3e92a6a8d82c5d99973ec34954a8b2e016ef1645 Mon Sep 17 00:00:00 2001 From: YevhenBondarenko Date: Mon, 4 May 2020 19:02:04 +0300 Subject: [PATCH 8/9] fix spring versions conflict --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 95b5354a78..9c1a1d54c6 100755 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ thingsboard 2.2.6.RELEASE 2.1.2.RELEASE - 5.2.3.RELEASE + 5.2.6.RELEASE 5.2.3.RELEASE 2.2.4.RELEASE 3.1.0 From b8de64f3fb49238e721d84d8353d4b642ddb4191 Mon Sep 17 00:00:00 2001 From: YevhenBondarenko Date: Mon, 4 May 2020 23:59:29 +0300 Subject: [PATCH 9/9] fix problem with duplication mail dependencies --- application/pom.xml | 4 ++-- pom.xml | 18 +++++++++--------- rule-engine/rule-engine-api/pom.xml | 5 +++++ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/application/pom.xml b/application/pom.xml index 55009709d1..4792dbf93a 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/pom.xml b/pom.xml index 9c1a1d54c6..524fb8ec3e 100755 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 2.6.2 1.7 2.0 - 1.4.3 + 1.6.2 4.2.0 3.5.5 3.11.4 @@ -587,8 +587,8 @@ ${rabbitmq.version} - javax.mail - mail + com.sun.mail + javax.mail ${mail.version} @@ -694,6 +694,12 @@ com.github.fge json-schema-validator ${json-schema-validator.version} + + + javax.mail + mailapi + + com.typesafe.akka @@ -930,12 +936,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 2cc6bf8d64..3978251987 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 +