diff --git a/application/pom.xml b/application/pom.xml index 03832654fa..9a782ea46d 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -262,17 +262,6 @@ rest-client test - - org.springframework.boot - spring-boot-starter-test - test - - - com.vaadin.external.google - android-json - - - org.springframework.security spring-security-test @@ -289,18 +278,18 @@ test - junit - junit + org.springframework.boot + spring-boot-starter-test test - org.awaitility - awaitility + org.junit.vintage + junit-vintage-engine test - org.mockito - mockito-core + org.awaitility + awaitility test @@ -316,6 +305,7 @@ org.hsqldb hsqldb + test org.javadelight diff --git a/common/actor/pom.xml b/common/actor/pom.xml index c732b86440..e331463be0 100644 --- a/common/actor/pom.xml +++ b/common/actor/pom.xml @@ -61,13 +61,18 @@ logback-classic - junit - junit + org.springframework.boot + spring-boot-starter-test test - org.mockito - mockito-core + org.junit.vintage + junit-vintage-engine + test + + + org.awaitility + awaitility test diff --git a/common/cache/pom.xml b/common/cache/pom.xml index 45798eed3a..605597b159 100644 --- a/common/cache/pom.xml +++ b/common/cache/pom.xml @@ -81,6 +81,11 @@ spring-boot-starter-test test + + org.junit.vintage + junit-vintage-engine + test + org.awaitility awaitility diff --git a/common/dao-api/pom.xml b/common/dao-api/pom.xml index 4eee5646fd..555a436ad0 100644 --- a/common/dao-api/pom.xml +++ b/common/dao-api/pom.xml @@ -101,13 +101,18 @@ provided - junit - junit + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine test - org.mockito - mockito-core + org.awaitility + awaitility test diff --git a/common/data/pom.xml b/common/data/pom.xml index 7468469e53..cdcedac009 100644 --- a/common/data/pom.xml +++ b/common/data/pom.xml @@ -63,15 +63,20 @@ com.fasterxml.jackson.core jackson-databind - + - junit - junit + org.springframework.boot + spring-boot-starter-test test - org.mockito - mockito-core + org.junit.vintage + junit-vintage-engine + test + + + org.awaitility + awaitility test diff --git a/common/message/pom.xml b/common/message/pom.xml index f191cf276e..aba650f63c 100644 --- a/common/message/pom.xml +++ b/common/message/pom.xml @@ -70,13 +70,18 @@ provided - junit - junit + org.springframework.boot + spring-boot-starter-test test - org.mockito - mockito-core + org.junit.vintage + junit-vintage-engine + test + + + org.awaitility + awaitility test diff --git a/common/queue/pom.xml b/common/queue/pom.xml index f1ef7b0fdd..d717192d5d 100644 --- a/common/queue/pom.xml +++ b/common/queue/pom.xml @@ -125,18 +125,18 @@ curator-recipes - junit - junit + org.springframework.boot + spring-boot-starter-test test - org.hamcrest - hamcrest + org.junit.vintage + junit-vintage-engine test - org.mockito - mockito-core + org.awaitility + awaitility test diff --git a/common/stats/pom.xml b/common/stats/pom.xml index dc08e84ada..7d801fce08 100644 --- a/common/stats/pom.xml +++ b/common/stats/pom.xml @@ -71,15 +71,19 @@ io.micrometer micrometer-registry-prometheus - - junit - junit + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine test - org.mockito - mockito-core + org.awaitility + awaitility test diff --git a/common/transport/coap/pom.xml b/common/transport/coap/pom.xml index d737776963..960f98024c 100644 --- a/common/transport/coap/pom.xml +++ b/common/transport/coap/pom.xml @@ -82,13 +82,13 @@ test - junit - junit + org.junit.vintage + junit-vintage-engine test - org.mockito - mockito-core + org.awaitility + awaitility test diff --git a/common/transport/http/pom.xml b/common/transport/http/pom.xml index 513d4a90c2..78eee5dfb5 100644 --- a/common/transport/http/pom.xml +++ b/common/transport/http/pom.xml @@ -67,13 +67,13 @@ test - junit - junit + org.junit.vintage + junit-vintage-engine test - org.mockito - mockito-core + org.awaitility + awaitility test diff --git a/common/transport/lwm2m/pom.xml b/common/transport/lwm2m/pom.xml index 78e6bb62aa..5aaa8f2ce4 100644 --- a/common/transport/lwm2m/pom.xml +++ b/common/transport/lwm2m/pom.xml @@ -90,13 +90,13 @@ test - junit - junit + org.junit.vintage + junit-vintage-engine test - org.mockito - mockito-core + org.awaitility + awaitility test diff --git a/common/transport/mqtt/pom.xml b/common/transport/mqtt/pom.xml index e3e3d3bab7..cec03bb318 100644 --- a/common/transport/mqtt/pom.xml +++ b/common/transport/mqtt/pom.xml @@ -84,8 +84,8 @@ test - junit - junit + org.junit.vintage + junit-vintage-engine test @@ -93,11 +93,6 @@ awaitility test - - org.mockito - mockito-core - test - diff --git a/common/transport/transport-api/pom.xml b/common/transport/transport-api/pom.xml index c647964a84..f06f9a066e 100644 --- a/common/transport/transport-api/pom.xml +++ b/common/transport/transport-api/pom.xml @@ -85,13 +85,18 @@ logback-classic - junit - junit + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine test - org.mockito - mockito-core + org.awaitility + awaitility test diff --git a/common/util/pom.xml b/common/util/pom.xml index cda226ec8d..c9c922bcf0 100644 --- a/common/util/pom.xml +++ b/common/util/pom.xml @@ -70,18 +70,18 @@ logback-classic - junit - junit + org.springframework.boot + spring-boot-starter-test test - org.hamcrest - hamcrest + org.junit.vintage + junit-vintage-engine test - org.mockito - mockito-core + org.awaitility + awaitility test diff --git a/dao/pom.xml b/dao/pom.xml index 15b329d2c1..71f539f593 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -80,8 +80,18 @@ postgresql - junit - junit + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + test + + + org.awaitility + awaitility test @@ -94,11 +104,6 @@ spring-test-dbunit test - - org.mockito - mockito-core - test - org.apache.commons commons-lang3 @@ -206,11 +211,6 @@ hsqldb test - - org.junit.jupiter - junit-jupiter-params - test - org.springframework spring-context-support diff --git a/msa/black-box-tests/pom.xml b/msa/black-box-tests/pom.xml index 6d4465f3c4..5e8e06c1a3 100644 --- a/msa/black-box-tests/pom.xml +++ b/msa/black-box-tests/pom.xml @@ -34,34 +34,33 @@ UTF-8 ${basedir}/../.. - 1.11.4 - 1.10 - 4.5.13 org.testcontainers testcontainers - ${testcontainers.version} + test org.zeroturnaround zt-exec - ${zeroturnaround.version} + test org.java-websocket Java-WebSocket + test org.apache.httpcomponents httpclient - ${httpclient.version} + test io.takari.junit takari-cpsuite + test ch.qos.logback diff --git a/pom.xml b/pom.xml index 687b6031fd..869646d220 100755 --- a/pom.xml +++ b/pom.xml @@ -46,21 +46,13 @@ 2.4.3 3.3.0 0.7.0 - 2.2.0 - 4.12 - 5.7.1 - 4.1.0 - 2.2 1.7.7 1.2.3 - 3.3.3 0.10 4.10.0 4.0.5 - 4.3.1.0 3.11.10 3.11.0 - 1.2.7 28.2-jre 2.6.1 3.4 @@ -92,9 +84,6 @@ 1.15.0 1.64 2.0.1 - 2.6.0 - 2.5.3 - 1.2.1 42.2.20 org/thingsboard/server/gen/**/*, org/thingsboard/server/extensions/core/plugin/telemetry/gen/**/* @@ -113,7 +102,6 @@ 1.4.3 1.9.4 3.2.2 - 1.5.0 1.5.2 1.0.3TB 3.4.0 @@ -123,6 +111,20 @@ 2.0.1.Final 1.6.2 2.8.5 + 4.5.13 + + 4.1.0 + 4.3.1.0 + 2.7.2 + 2.6.0 + 1.5.2 + 5.6.3 + 2.6.0 + 1.3.0 + 1.2.7 + + 1.11.4 + 1.10 @@ -1102,6 +1104,12 @@ spring-boot-starter-test ${spring-boot.version} test + + + com.vaadin.external.google + android-json + + org.springframework.boot @@ -1431,12 +1439,32 @@ takari-cpsuite ${takari-cpsuite.version} test + + + junit + junit + + org.cassandraunit cassandra-unit ${cassandra-unit.version} test + + + junit + junit + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + org.apache.cassandra @@ -1444,10 +1472,16 @@ ${cassandra-all.version} - junit - junit - ${junit.version} + org.junit.vintage + junit-vintage-engine + ${jupiter.version} test + + + org.hamcrest + hamcrest-core + + org.awaitility @@ -1455,30 +1489,12 @@ ${awaitility.version} test - - org.hamcrest - hamcrest - ${hamcrest.version} - test - - - org.junit.jupiter - junit-jupiter-params - ${jupiter.version} - test - org.dbunit dbunit ${dbunit.version} test - - org.mockito - mockito-core - ${mockito.version} - test - org.projectlombok lombok @@ -1514,6 +1530,7 @@ org.hsqldb hsqldb ${hsqldb.version} + test org.springframework.data @@ -1714,6 +1731,23 @@ snmp4j ${snmp4j.version} + + org.testcontainers + testcontainers + ${testcontainers.version} + test + + + org.zeroturnaround + zt-exec + ${zeroturnaround.version} + test + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + diff --git a/rule-engine/rule-engine-api/pom.xml b/rule-engine/rule-engine-api/pom.xml index 03fa42b606..2530532938 100644 --- a/rule-engine/rule-engine-api/pom.xml +++ b/rule-engine/rule-engine-api/pom.xml @@ -94,14 +94,18 @@ provided - junit - junit - ${junit.version} + org.springframework.boot + spring-boot-starter-test test - org.mockito - mockito-core + org.junit.vintage + junit-vintage-engine + test + + + org.awaitility + awaitility test diff --git a/rule-engine/rule-engine-components/pom.xml b/rule-engine/rule-engine-components/pom.xml index ccd905f897..6809641eae 100644 --- a/rule-engine/rule-engine-components/pom.xml +++ b/rule-engine/rule-engine-components/pom.xml @@ -126,9 +126,18 @@ provided - junit - junit - ${junit.version} + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + test + + + org.awaitility + awaitility test @@ -146,12 +155,6 @@ test - - org.mockito - mockito-core - test - - diff --git a/transport/coap/pom.xml b/transport/coap/pom.xml index 756e4bbeaa..2b004cf56a 100644 --- a/transport/coap/pom.xml +++ b/transport/coap/pom.xml @@ -70,13 +70,13 @@ test - junit - junit + org.junit.vintage + junit-vintage-engine test - org.mockito - mockito-core + org.awaitility + awaitility test diff --git a/transport/http/pom.xml b/transport/http/pom.xml index efaef36edb..0da06ff778 100644 --- a/transport/http/pom.xml +++ b/transport/http/pom.xml @@ -70,13 +70,13 @@ test - junit - junit + org.junit.vintage + junit-vintage-engine test - org.mockito - mockito-core + org.awaitility + awaitility test diff --git a/transport/lwm2m/pom.xml b/transport/lwm2m/pom.xml index bd1b9a22b4..f5e330b628 100644 --- a/transport/lwm2m/pom.xml +++ b/transport/lwm2m/pom.xml @@ -104,13 +104,13 @@ test - junit - junit + org.junit.vintage + junit-vintage-engine test - org.mockito - mockito-core + org.awaitility + awaitility test diff --git a/transport/mqtt/pom.xml b/transport/mqtt/pom.xml index aa3ea2598a..87982cab42 100644 --- a/transport/mqtt/pom.xml +++ b/transport/mqtt/pom.xml @@ -70,13 +70,13 @@ test - junit - junit + org.junit.vintage + junit-vintage-engine test - org.mockito - mockito-core + org.awaitility + awaitility test