简柏林 / thingskit · Commits

Commit 7ca2b3dbb3f512af0c3a043f71bac4884320c03a

Authored by Igor Kulikov
Committed by GitHub
2 parents 193c0ce6 02b8b8b8

Merge pull request #5045 from smatvienko-tb/dependency-upgrade-test-scope 

[3.3.1] Test scope: dependency upgraded a refactored for all POMs in project
Inline Side-by-side
Showing 23 changed files with 214 additions and 155 deletions
@@ -263,17 +263,6 @@ @@ -263,17 +263,6 @@
263 <scope>test</scope> 263 <scope>test</scope>
264 </dependency> 264 </dependency>
265 <dependency> 265 <dependency>
266 - <groupId>org.springframework.boot</groupId>  
267 - <artifactId>spring-boot-starter-test</artifactId>  
268 - <scope>test</scope>  
269 - <exclusions>  
270 - <exclusion>  
271 - <groupId>com.vaadin.external.google</groupId>  
272 - <artifactId>android-json</artifactId>  
273 - </exclusion>  
274 - </exclusions>  
275 - </dependency>  
276 - <dependency>  
277 <groupId>org.springframework.security</groupId> 266 <groupId>org.springframework.security</groupId>
278 <artifactId>spring-security-test</artifactId> 267 <artifactId>spring-security-test</artifactId>
279 <scope>test</scope> 268 <scope>test</scope>
@@ -289,18 +278,18 @@ @@ -289,18 +278,18 @@
289 <scope>test</scope> 278 <scope>test</scope>
290 </dependency> 279 </dependency>
291 <dependency> 280 <dependency>
292 - <groupId>junit</groupId>  
293 - <artifactId>junit</artifactId> 281 + <groupId>org.springframework.boot</groupId>
  282 + <artifactId>spring-boot-starter-test</artifactId>
294 <scope>test</scope> 283 <scope>test</scope>
295 </dependency> 284 </dependency>
296 <dependency> 285 <dependency>
297 - <groupId>org.awaitility</groupId>  
298 - <artifactId>awaitility</artifactId> 286 + <groupId>org.junit.vintage</groupId>
  287 + <artifactId>junit-vintage-engine</artifactId>
299 <scope>test</scope> 288 <scope>test</scope>
300 </dependency> 289 </dependency>
301 <dependency> 290 <dependency>
302 - <groupId>org.mockito</groupId>  
303 - <artifactId>mockito-core</artifactId> 291 + <groupId>org.awaitility</groupId>
  292 + <artifactId>awaitility</artifactId>
304 <scope>test</scope> 293 <scope>test</scope>
305 </dependency> 294 </dependency>
306 <dependency> 295 <dependency>
@@ -316,6 +305,7 @@ @@ -316,6 +305,7 @@
316 <dependency> 305 <dependency>
317 <groupId>org.hsqldb</groupId> 306 <groupId>org.hsqldb</groupId>
318 <artifactId>hsqldb</artifactId> 307 <artifactId>hsqldb</artifactId>
  308 + <scope>test</scope>
319 </dependency> 309 </dependency>
320 <dependency> 310 <dependency>
321 <groupId>org.javadelight</groupId> 311 <groupId>org.javadelight</groupId>
@@ -61,13 +61,18 @@ @@ -61,13 +61,18 @@
61 <artifactId>logback-classic</artifactId> 61 <artifactId>logback-classic</artifactId>
62 </dependency> 62 </dependency>
63 <dependency> 63 <dependency>
64 - <groupId>junit</groupId>  
65 - <artifactId>junit</artifactId> 64 + <groupId>org.springframework.boot</groupId>
  65 + <artifactId>spring-boot-starter-test</artifactId>
66 <scope>test</scope> 66 <scope>test</scope>
67 </dependency> 67 </dependency>
68 <dependency> 68 <dependency>
69 - <groupId>org.mockito</groupId>  
70 - <artifactId>mockito-core</artifactId> 69 + <groupId>org.junit.vintage</groupId>
  70 + <artifactId>junit-vintage-engine</artifactId>
  71 + <scope>test</scope>
  72 + </dependency>
  73 + <dependency>
  74 + <groupId>org.awaitility</groupId>
  75 + <artifactId>awaitility</artifactId>
71 <scope>test</scope> 76 <scope>test</scope>
72 </dependency> 77 </dependency>
73 </dependencies> 78 </dependencies>
@@ -82,6 +82,11 @@ @@ -82,6 +82,11 @@
82 <scope>test</scope> 82 <scope>test</scope>
83 </dependency> 83 </dependency>
84 <dependency> 84 <dependency>
  85 + <groupId>org.junit.vintage</groupId>
  86 + <artifactId>junit-vintage-engine</artifactId>
  87 + <scope>test</scope>
  88 + </dependency>
  89 + <dependency>
85 <groupId>org.awaitility</groupId> 90 <groupId>org.awaitility</groupId>
86 <artifactId>awaitility</artifactId> 91 <artifactId>awaitility</artifactId>
87 <scope>test</scope> 92 <scope>test</scope>
@@ -101,13 +101,18 @@ @@ -101,13 +101,18 @@
101 <scope>provided</scope> 101 <scope>provided</scope>
102 </dependency> 102 </dependency>
103 <dependency> 103 <dependency>
104 - <groupId>junit</groupId>  
105 - <artifactId>junit</artifactId> 104 + <groupId>org.springframework.boot</groupId>
  105 + <artifactId>spring-boot-starter-test</artifactId>
  106 + <scope>test</scope>
  107 + </dependency>
  108 + <dependency>
  109 + <groupId>org.junit.vintage</groupId>
  110 + <artifactId>junit-vintage-engine</artifactId>
106 <scope>test</scope> 111 <scope>test</scope>
107 </dependency> 112 </dependency>
108 <dependency> 113 <dependency>
109 - <groupId>org.mockito</groupId>  
110 - <artifactId>mockito-core</artifactId> 114 + <groupId>org.awaitility</groupId>
  115 + <artifactId>awaitility</artifactId>
111 <scope>test</scope> 116 <scope>test</scope>
112 </dependency> 117 </dependency>
113 </dependencies> 118 </dependencies>
@@ -63,15 +63,20 @@ @@ -63,15 +63,20 @@
63 <dependency> 63 <dependency>
64 <groupId>com.fasterxml.jackson.core</groupId> 64 <groupId>com.fasterxml.jackson.core</groupId>
65 <artifactId>jackson-databind</artifactId> 65 <artifactId>jackson-databind</artifactId>
66 - </dependency> 66 + </dependency>
67 <dependency> 67 <dependency>
68 - <groupId>junit</groupId>  
69 - <artifactId>junit</artifactId> 68 + <groupId>org.springframework.boot</groupId>
  69 + <artifactId>spring-boot-starter-test</artifactId>
70 <scope>test</scope> 70 <scope>test</scope>
71 </dependency> 71 </dependency>
72 <dependency> 72 <dependency>
73 - <groupId>org.mockito</groupId>  
74 - <artifactId>mockito-core</artifactId> 73 + <groupId>org.junit.vintage</groupId>
  74 + <artifactId>junit-vintage-engine</artifactId>
  75 + <scope>test</scope>
  76 + </dependency>
  77 + <dependency>
  78 + <groupId>org.awaitility</groupId>
  79 + <artifactId>awaitility</artifactId>
75 <scope>test</scope> 80 <scope>test</scope>
76 </dependency> 81 </dependency>
77 <dependency> 82 <dependency>
@@ -70,13 +70,18 @@ @@ -70,13 +70,18 @@
70 <scope>provided</scope> 70 <scope>provided</scope>
71 </dependency> 71 </dependency>
72 <dependency> 72 <dependency>
73 - <groupId>junit</groupId>  
74 - <artifactId>junit</artifactId> 73 + <groupId>org.springframework.boot</groupId>
  74 + <artifactId>spring-boot-starter-test</artifactId>
75 <scope>test</scope> 75 <scope>test</scope>
76 </dependency> 76 </dependency>
77 <dependency> 77 <dependency>
78 - <groupId>org.mockito</groupId>  
79 - <artifactId>mockito-core</artifactId> 78 + <groupId>org.junit.vintage</groupId>
  79 + <artifactId>junit-vintage-engine</artifactId>
  80 + <scope>test</scope>
  81 + </dependency>
  82 + <dependency>
  83 + <groupId>org.awaitility</groupId>
  84 + <artifactId>awaitility</artifactId>
80 <scope>test</scope> 85 <scope>test</scope>
81 </dependency> 86 </dependency>
82 </dependencies> 87 </dependencies>
@@ -125,18 +125,18 @@ @@ -125,18 +125,18 @@
125 <artifactId>curator-recipes</artifactId> 125 <artifactId>curator-recipes</artifactId>
126 </dependency> 126 </dependency>
127 <dependency> 127 <dependency>
128 - <groupId>junit</groupId>  
129 - <artifactId>junit</artifactId> 128 + <groupId>org.springframework.boot</groupId>
  129 + <artifactId>spring-boot-starter-test</artifactId>
130 <scope>test</scope> 130 <scope>test</scope>
131 </dependency> 131 </dependency>
132 <dependency> 132 <dependency>
133 - <groupId>org.hamcrest</groupId>  
134 - <artifactId>hamcrest</artifactId> 133 + <groupId>org.junit.vintage</groupId>
  134 + <artifactId>junit-vintage-engine</artifactId>
135 <scope>test</scope> 135 <scope>test</scope>
136 </dependency> 136 </dependency>
137 <dependency> 137 <dependency>
138 - <groupId>org.mockito</groupId>  
139 - <artifactId>mockito-core</artifactId> 138 + <groupId>org.awaitility</groupId>
  139 + <artifactId>awaitility</artifactId>
140 <scope>test</scope> 140 <scope>test</scope>
141 </dependency> 141 </dependency>
142 </dependencies> 142 </dependencies>
@@ -71,15 +71,19 @@ @@ -71,15 +71,19 @@
71 <groupId>io.micrometer</groupId> 71 <groupId>io.micrometer</groupId>
72 <artifactId>micrometer-registry-prometheus</artifactId> 72 <artifactId>micrometer-registry-prometheus</artifactId>
73 </dependency> 73 </dependency>
74 -  
75 <dependency> 74 <dependency>
76 - <groupId>junit</groupId>  
77 - <artifactId>junit</artifactId> 75 + <groupId>org.springframework.boot</groupId>
  76 + <artifactId>spring-boot-starter-test</artifactId>
  77 + <scope>test</scope>
  78 + </dependency>
  79 + <dependency>
  80 + <groupId>org.junit.vintage</groupId>
  81 + <artifactId>junit-vintage-engine</artifactId>
78 <scope>test</scope> 82 <scope>test</scope>
79 </dependency> 83 </dependency>
80 <dependency> 84 <dependency>
81 - <groupId>org.mockito</groupId>  
82 - <artifactId>mockito-core</artifactId> 85 + <groupId>org.awaitility</groupId>
  86 + <artifactId>awaitility</artifactId>
83 <scope>test</scope> 87 <scope>test</scope>
84 </dependency> 88 </dependency>
85 </dependencies> 89 </dependencies>
@@ -82,13 +82,13 @@ @@ -82,13 +82,13 @@
82 <scope>test</scope> 82 <scope>test</scope>
83 </dependency> 83 </dependency>
84 <dependency> 84 <dependency>
85 - <groupId>junit</groupId>  
86 - <artifactId>junit</artifactId> 85 + <groupId>org.junit.vintage</groupId>
  86 + <artifactId>junit-vintage-engine</artifactId>
87 <scope>test</scope> 87 <scope>test</scope>
88 </dependency> 88 </dependency>
89 <dependency> 89 <dependency>
90 - <groupId>org.mockito</groupId>  
91 - <artifactId>mockito-core</artifactId> 90 + <groupId>org.awaitility</groupId>
  91 + <artifactId>awaitility</artifactId>
92 <scope>test</scope> 92 <scope>test</scope>
93 </dependency> 93 </dependency>
94 <dependency> 94 <dependency>
@@ -67,13 +67,13 @@ @@ -67,13 +67,13 @@
67 <scope>test</scope> 67 <scope>test</scope>
68 </dependency> 68 </dependency>
69 <dependency> 69 <dependency>
70 - <groupId>junit</groupId>  
71 - <artifactId>junit</artifactId> 70 + <groupId>org.junit.vintage</groupId>
  71 + <artifactId>junit-vintage-engine</artifactId>
72 <scope>test</scope> 72 <scope>test</scope>
73 </dependency> 73 </dependency>
74 <dependency> 74 <dependency>
75 - <groupId>org.mockito</groupId>  
76 - <artifactId>mockito-core</artifactId> 75 + <groupId>org.awaitility</groupId>
  76 + <artifactId>awaitility</artifactId>
77 <scope>test</scope> 77 <scope>test</scope>
78 </dependency> 78 </dependency>
79 </dependencies> 79 </dependencies>
@@ -90,13 +90,13 @@ @@ -90,13 +90,13 @@
90 <scope>test</scope> 90 <scope>test</scope>
91 </dependency> 91 </dependency>
92 <dependency> 92 <dependency>
93 - <groupId>junit</groupId>  
94 - <artifactId>junit</artifactId> 93 + <groupId>org.junit.vintage</groupId>
  94 + <artifactId>junit-vintage-engine</artifactId>
95 <scope>test</scope> 95 <scope>test</scope>
96 </dependency> 96 </dependency>
97 <dependency> 97 <dependency>
98 - <groupId>org.mockito</groupId>  
99 - <artifactId>mockito-core</artifactId> 98 + <groupId>org.awaitility</groupId>
  99 + <artifactId>awaitility</artifactId>
100 <scope>test</scope> 100 <scope>test</scope>
101 </dependency> 101 </dependency>
102 <dependency> 102 <dependency>
@@ -84,8 +84,8 @@ @@ -84,8 +84,8 @@
84 <scope>test</scope> 84 <scope>test</scope>
85 </dependency> 85 </dependency>
86 <dependency> 86 <dependency>
87 - <groupId>junit</groupId>  
88 - <artifactId>junit</artifactId> 87 + <groupId>org.junit.vintage</groupId>
  88 + <artifactId>junit-vintage-engine</artifactId>
89 <scope>test</scope> 89 <scope>test</scope>
90 </dependency> 90 </dependency>
91 <dependency> 91 <dependency>
@@ -93,11 +93,6 @@ @@ -93,11 +93,6 @@
93 <artifactId>awaitility</artifactId> 93 <artifactId>awaitility</artifactId>
94 <scope>test</scope> 94 <scope>test</scope>
95 </dependency> 95 </dependency>
96 - <dependency>  
97 - <groupId>org.mockito</groupId>  
98 - <artifactId>mockito-core</artifactId>  
99 - <scope>test</scope>  
100 - </dependency>  
101 </dependencies> 96 </dependencies>
102 97
103 </project> 98 </project>
@@ -85,13 +85,18 @@ @@ -85,13 +85,18 @@
85 <artifactId>logback-classic</artifactId> 85 <artifactId>logback-classic</artifactId>
86 </dependency> 86 </dependency>
87 <dependency> 87 <dependency>
88 - <groupId>junit</groupId>  
89 - <artifactId>junit</artifactId> 88 + <groupId>org.springframework.boot</groupId>
  89 + <artifactId>spring-boot-starter-test</artifactId>
  90 + <scope>test</scope>
  91 + </dependency>
  92 + <dependency>
  93 + <groupId>org.junit.vintage</groupId>
  94 + <artifactId>junit-vintage-engine</artifactId>
90 <scope>test</scope> 95 <scope>test</scope>
91 </dependency> 96 </dependency>
92 <dependency> 97 <dependency>
93 - <groupId>org.mockito</groupId>  
94 - <artifactId>mockito-core</artifactId> 98 + <groupId>org.awaitility</groupId>
  99 + <artifactId>awaitility</artifactId>
95 <scope>test</scope> 100 <scope>test</scope>
96 </dependency> 101 </dependency>
97 <dependency> 102 <dependency>
@@ -70,18 +70,18 @@ @@ -70,18 +70,18 @@
70 <artifactId>logback-classic</artifactId> 70 <artifactId>logback-classic</artifactId>
71 </dependency> 71 </dependency>
72 <dependency> 72 <dependency>
73 - <groupId>junit</groupId>  
74 - <artifactId>junit</artifactId> 73 + <groupId>org.springframework.boot</groupId>
  74 + <artifactId>spring-boot-starter-test</artifactId>
75 <scope>test</scope> 75 <scope>test</scope>
76 </dependency> 76 </dependency>
77 <dependency> 77 <dependency>
78 - <groupId>org.hamcrest</groupId>  
79 - <artifactId>hamcrest</artifactId> 78 + <groupId>org.junit.vintage</groupId>
  79 + <artifactId>junit-vintage-engine</artifactId>
80 <scope>test</scope> 80 <scope>test</scope>
81 </dependency> 81 </dependency>
82 <dependency> 82 <dependency>
83 - <groupId>org.mockito</groupId>  
84 - <artifactId>mockito-core</artifactId> 83 + <groupId>org.awaitility</groupId>
  84 + <artifactId>awaitility</artifactId>
85 <scope>test</scope> 85 <scope>test</scope>
86 </dependency> 86 </dependency>
87 </dependencies> 87 </dependencies>
@@ -80,8 +80,18 @@ @@ -80,8 +80,18 @@
80 <artifactId>postgresql</artifactId> 80 <artifactId>postgresql</artifactId>
81 </dependency> 81 </dependency>
82 <dependency> 82 <dependency>
83 - <groupId>junit</groupId>  
84 - <artifactId>junit</artifactId> 83 + <groupId>org.springframework.boot</groupId>
  84 + <artifactId>spring-boot-starter-test</artifactId>
  85 + <scope>test</scope>
  86 + </dependency>
  87 + <dependency>
  88 + <groupId>org.junit.vintage</groupId>
  89 + <artifactId>junit-vintage-engine</artifactId>
  90 + <scope>test</scope>
  91 + </dependency>
  92 + <dependency>
  93 + <groupId>org.awaitility</groupId>
  94 + <artifactId>awaitility</artifactId>
85 <scope>test</scope> 95 <scope>test</scope>
86 </dependency> 96 </dependency>
87 <dependency> 97 <dependency>
@@ -95,11 +105,6 @@ @@ -95,11 +105,6 @@
95 <scope>test</scope> 105 <scope>test</scope>
96 </dependency> 106 </dependency>
97 <dependency> 107 <dependency>
98 - <groupId>org.mockito</groupId>  
99 - <artifactId>mockito-core</artifactId>  
100 - <scope>test</scope>  
101 - </dependency>  
102 - <dependency>  
103 <groupId>org.apache.commons</groupId> 108 <groupId>org.apache.commons</groupId>
104 <artifactId>commons-lang3</artifactId> 109 <artifactId>commons-lang3</artifactId>
105 </dependency> 110 </dependency>
@@ -207,11 +212,6 @@ @@ -207,11 +212,6 @@
207 <scope>test</scope> 212 <scope>test</scope>
208 </dependency> 213 </dependency>
209 <dependency> 214 <dependency>
210 - <groupId>org.junit.jupiter</groupId>  
211 - <artifactId>junit-jupiter-params</artifactId>  
212 - <scope>test</scope>  
213 - </dependency>  
214 - <dependency>  
215 <groupId>org.springframework</groupId> 215 <groupId>org.springframework</groupId>
216 <artifactId>spring-context-support</artifactId> 216 <artifactId>spring-context-support</artifactId>
217 </dependency> 217 </dependency>
@@ -34,34 +34,33 @@ @@ -34,34 +34,33 @@
34 <properties> 34 <properties>
35 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 35 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
36 <main.dir>${basedir}/../..</main.dir> 36 <main.dir>${basedir}/../..</main.dir>
37 - <testcontainers.version>1.11.4</testcontainers.version>  
38 - <zeroturnaround.version>1.10</zeroturnaround.version>  
39 - <httpclient.version>4.5.13</httpclient.version>  
40 </properties> 37 </properties>
41 38
42 <dependencies> 39 <dependencies>
43 <dependency> 40 <dependency>
44 <groupId>org.testcontainers</groupId> 41 <groupId>org.testcontainers</groupId>
45 <artifactId>testcontainers</artifactId> 42 <artifactId>testcontainers</artifactId>
46 - <version>${testcontainers.version}</version> 43 + <scope>test</scope>
47 </dependency> 44 </dependency>
48 <dependency> 45 <dependency>
49 <groupId>org.zeroturnaround</groupId> 46 <groupId>org.zeroturnaround</groupId>
50 <artifactId>zt-exec</artifactId> 47 <artifactId>zt-exec</artifactId>
51 - <version>${zeroturnaround.version}</version> 48 + <scope>test</scope>
52 </dependency> 49 </dependency>
53 <dependency> 50 <dependency>
54 <groupId>org.java-websocket</groupId> 51 <groupId>org.java-websocket</groupId>
55 <artifactId>Java-WebSocket</artifactId> 52 <artifactId>Java-WebSocket</artifactId>
  53 + <scope>test</scope>
56 </dependency> 54 </dependency>
57 <dependency> 55 <dependency>
58 <groupId>org.apache.httpcomponents</groupId> 56 <groupId>org.apache.httpcomponents</groupId>
59 <artifactId>httpclient</artifactId> 57 <artifactId>httpclient</artifactId>
60 - <version>${httpclient.version}</version> 58 + <scope>test</scope>
61 </dependency> 59 </dependency>
62 <dependency> 60 <dependency>
63 <groupId>io.takari.junit</groupId> 61 <groupId>io.takari.junit</groupId>
64 <artifactId>takari-cpsuite</artifactId> 62 <artifactId>takari-cpsuite</artifactId>
  63 + <scope>test</scope>
65 </dependency> 64 </dependency>
66 <dependency> 65 <dependency>
67 <groupId>ch.qos.logback</groupId> 66 <groupId>ch.qos.logback</groupId>
@@ -46,21 +46,13 @@ @@ -46,21 +46,13 @@
46 <spring-data-redis.version>2.4.3</spring-data-redis.version> 46 <spring-data-redis.version>2.4.3</spring-data-redis.version>
47 <jedis.version>3.3.0</jedis.version> 47 <jedis.version>3.3.0</jedis.version>
48 <jjwt.version>0.7.0</jjwt.version> 48 <jjwt.version>0.7.0</jjwt.version>
49 - <json-path.version>2.2.0</json-path.version>  
50 - <junit.version>4.12</junit.version>  
51 - <jupiter.version>5.7.1</jupiter.version>  
52 - <awaitility.version>4.1.0</awaitility.version>  
53 - <hamcrest.version>2.2</hamcrest.version>  
54 <slf4j.version>1.7.7</slf4j.version> 49 <slf4j.version>1.7.7</slf4j.version>
55 <logback.version>1.2.3</logback.version> 50 <logback.version>1.2.3</logback.version>
56 - <mockito.version>3.3.3</mockito.version>  
57 <rat.version>0.10</rat.version> 51 <rat.version>0.10</rat.version>
58 <cassandra.version>4.10.0</cassandra.version> 52 <cassandra.version>4.10.0</cassandra.version>
59 <metrics.version>4.0.5</metrics.version> 53 <metrics.version>4.0.5</metrics.version>
60 - <cassandra-unit.version>4.3.1.0</cassandra-unit.version>  
61 <cassandra-all.version>3.11.10</cassandra-all.version> 54 <cassandra-all.version>3.11.10</cassandra-all.version>
62 <cassandra-driver-core.version>3.11.0</cassandra-driver-core.version> 55 <cassandra-driver-core.version>3.11.0</cassandra-driver-core.version>
63 - <takari-cpsuite.version>1.2.7</takari-cpsuite.version>  
64 <guava.version>28.2-jre</guava.version> 56 <guava.version>28.2-jre</guava.version>
65 <caffeine.version>2.6.1</caffeine.version> 57 <caffeine.version>2.6.1</caffeine.version>
66 <commons-lang3.version>3.4</commons-lang3.version> 58 <commons-lang3.version>3.4</commons-lang3.version>
@@ -92,9 +84,6 @@ @@ -92,9 +84,6 @@
92 <jts.version>1.15.0</jts.version> 84 <jts.version>1.15.0</jts.version>
93 <bouncycastle.version>1.64</bouncycastle.version> 85 <bouncycastle.version>1.64</bouncycastle.version>
94 <winsw.version>2.0.1</winsw.version> 86 <winsw.version>2.0.1</winsw.version>
95 - <hsqldb.version>2.6.0</hsqldb.version>  
96 - <dbunit.version>2.5.3</dbunit.version>  
97 - <spring-test-dbunit.version>1.2.1</spring-test-dbunit.version>  
98 <postgresql.driver.version>42.2.20</postgresql.driver.version> 87 <postgresql.driver.version>42.2.20</postgresql.driver.version>
99 <sonar.exclusions>org/thingsboard/server/gen/**/*, 88 <sonar.exclusions>org/thingsboard/server/gen/**/*,
100 org/thingsboard/server/extensions/core/plugin/telemetry/gen/**/* 89 org/thingsboard/server/extensions/core/plugin/telemetry/gen/**/*
@@ -113,7 +102,6 @@ @@ -113,7 +102,6 @@
113 <ua-parser.version>1.4.3</ua-parser.version> 102 <ua-parser.version>1.4.3</ua-parser.version>
114 <commons-beanutils.version>1.9.4</commons-beanutils.version> 103 <commons-beanutils.version>1.9.4</commons-beanutils.version>
115 <commons-collections.version>3.2.2</commons-collections.version> 104 <commons-collections.version>3.2.2</commons-collections.version>
116 - <java-websocket.version>1.5.0</java-websocket.version>  
117 <micrometer.version>1.5.2</micrometer.version> 105 <micrometer.version>1.5.2</micrometer.version>
118 <protobuf-dynamic.version>1.0.3TB</protobuf-dynamic.version> 106 <protobuf-dynamic.version>1.0.3TB</protobuf-dynamic.version>
119 <wire-schema.version>3.4.0</wire-schema.version> 107 <wire-schema.version>3.4.0</wire-schema.version>
@@ -123,6 +111,20 @@ @@ -123,6 +111,20 @@
123 <javax.validation-api.version>2.0.1.Final</javax.validation-api.version> 111 <javax.validation-api.version>2.0.1.Final</javax.validation-api.version>
124 <antisamy.version>1.6.2</antisamy.version> 112 <antisamy.version>1.6.2</antisamy.version>
125 <snmp4j.version>2.8.5</snmp4j.version> 113 <snmp4j.version>2.8.5</snmp4j.version>
  114 + <httpclient.version>4.5.13</httpclient.version>
  115 + <!-- TEST SCOPE -->
  116 + <awaitility.version>4.1.0</awaitility.version>
  117 + <cassandra-unit.version>4.3.1.0</cassandra-unit.version>
  118 + <dbunit.version>2.7.2</dbunit.version>
  119 + <hsqldb.version>2.6.0</hsqldb.version>
  120 + <java-websocket.version>1.5.2</java-websocket.version>
  121 + <jupiter.version>5.6.3</jupiter.version> <!-- keep the same version as spring-boot-starter-test depend on jupiter-->
  122 + <json-path.version>2.6.0</json-path.version>
  123 + <spring-test-dbunit.version>1.3.0</spring-test-dbunit.version> <!-- 2016 -->
  124 + <takari-cpsuite.version>1.2.7</takari-cpsuite.version> <!-- 2015 -->
  125 + <!-- BLACKBOX TEST SCOPE -->
  126 + <testcontainers.version>1.11.4</testcontainers.version>
  127 + <zeroturnaround.version>1.10</zeroturnaround.version>
126 </properties> 128 </properties>
127 129
128 <modules> 130 <modules>
@@ -1102,6 +1104,12 @@ @@ -1102,6 +1104,12 @@
1102 <artifactId>spring-boot-starter-test</artifactId> 1104 <artifactId>spring-boot-starter-test</artifactId>
1103 <version>${spring-boot.version}</version> 1105 <version>${spring-boot.version}</version>
1104 <scope>test</scope> 1106 <scope>test</scope>
  1107 + <exclusions>
  1108 + <exclusion>
  1109 + <groupId>com.vaadin.external.google</groupId>
  1110 + <artifactId>android-json</artifactId>
  1111 + </exclusion>
  1112 + </exclusions>
1105 </dependency> 1113 </dependency>
1106 <dependency> 1114 <dependency>
1107 <groupId>org.springframework.boot</groupId> 1115 <groupId>org.springframework.boot</groupId>
@@ -1431,12 +1439,32 @@ @@ -1431,12 +1439,32 @@
1431 <artifactId>takari-cpsuite</artifactId> 1439 <artifactId>takari-cpsuite</artifactId>
1432 <version>${takari-cpsuite.version}</version> 1440 <version>${takari-cpsuite.version}</version>
1433 <scope>test</scope> 1441 <scope>test</scope>
  1442 + <exclusions>
  1443 + <exclusion>
  1444 + <groupId>junit</groupId>
  1445 + <artifactId>junit</artifactId>
  1446 + </exclusion>
  1447 + </exclusions>
1434 </dependency> 1448 </dependency>
1435 <dependency> 1449 <dependency>
1436 <groupId>org.cassandraunit</groupId> 1450 <groupId>org.cassandraunit</groupId>
1437 <artifactId>cassandra-unit</artifactId> 1451 <artifactId>cassandra-unit</artifactId>
1438 <version>${cassandra-unit.version}</version> 1452 <version>${cassandra-unit.version}</version>
1439 <scope>test</scope> 1453 <scope>test</scope>
  1454 + <exclusions>
  1455 + <exclusion>
  1456 + <groupId>junit</groupId>
  1457 + <artifactId>junit</artifactId>
  1458 + </exclusion>
  1459 + <exclusion>
  1460 + <groupId>org.hamcrest</groupId>
  1461 + <artifactId>hamcrest-core</artifactId>
  1462 + </exclusion>
  1463 + <exclusion>
  1464 + <groupId>org.hamcrest</groupId>
  1465 + <artifactId>hamcrest-library</artifactId>
  1466 + </exclusion>
  1467 + </exclusions>
1440 </dependency> 1468 </dependency>
1441 <dependency> 1469 <dependency>
1442 <groupId>org.apache.cassandra</groupId> 1470 <groupId>org.apache.cassandra</groupId>
@@ -1444,10 +1472,16 @@ @@ -1444,10 +1472,16 @@
1444 <version>${cassandra-all.version}</version> 1472 <version>${cassandra-all.version}</version>
1445 </dependency> 1473 </dependency>
1446 <dependency> 1474 <dependency>
1447 - <groupId>junit</groupId>  
1448 - <artifactId>junit</artifactId>  
1449 - <version>${junit.version}</version> 1475 + <groupId>org.junit.vintage</groupId>
  1476 + <artifactId>junit-vintage-engine</artifactId>
  1477 + <version>${jupiter.version}</version>
1450 <scope>test</scope> 1478 <scope>test</scope>
  1479 + <exclusions>
  1480 + <exclusion>
  1481 + <groupId>org.hamcrest</groupId>
  1482 + <artifactId>hamcrest-core</artifactId>
  1483 + </exclusion>
  1484 + </exclusions>
1451 </dependency> 1485 </dependency>
1452 <dependency> 1486 <dependency>
1453 <groupId>org.awaitility</groupId> 1487 <groupId>org.awaitility</groupId>
@@ -1456,30 +1490,12 @@ @@ -1456,30 +1490,12 @@
1456 <scope>test</scope> 1490 <scope>test</scope>
1457 </dependency> 1491 </dependency>
1458 <dependency> 1492 <dependency>
1459 - <groupId>org.hamcrest</groupId>  
1460 - <artifactId>hamcrest</artifactId>  
1461 - <version>${hamcrest.version}</version>  
1462 - <scope>test</scope>  
1463 - </dependency>  
1464 - <dependency>  
1465 - <groupId>org.junit.jupiter</groupId>  
1466 - <artifactId>junit-jupiter-params</artifactId>  
1467 - <version>${jupiter.version}</version>  
1468 - <scope>test</scope>  
1469 - </dependency>  
1470 - <dependency>  
1471 <groupId>org.dbunit</groupId> 1493 <groupId>org.dbunit</groupId>
1472 <artifactId>dbunit</artifactId> 1494 <artifactId>dbunit</artifactId>
1473 <version>${dbunit.version}</version> 1495 <version>${dbunit.version}</version>
1474 <scope>test</scope> 1496 <scope>test</scope>
1475 </dependency> 1497 </dependency>
1476 <dependency> 1498 <dependency>
1477 - <groupId>org.mockito</groupId>  
1478 - <artifactId>mockito-core</artifactId>  
1479 - <version>${mockito.version}</version>  
1480 - <scope>test</scope>  
1481 - </dependency>  
1482 - <dependency>  
1483 <groupId>org.projectlombok</groupId> 1499 <groupId>org.projectlombok</groupId>
1484 <artifactId>lombok</artifactId> 1500 <artifactId>lombok</artifactId>
1485 <version>${lombok.version}</version> 1501 <version>${lombok.version}</version>
@@ -1514,6 +1530,7 @@ @@ -1514,6 +1530,7 @@
1514 <groupId>org.hsqldb</groupId> 1530 <groupId>org.hsqldb</groupId>
1515 <artifactId>hsqldb</artifactId> 1531 <artifactId>hsqldb</artifactId>
1516 <version>${hsqldb.version}</version> 1532 <version>${hsqldb.version}</version>
  1533 + <scope>test</scope>
1517 </dependency> 1534 </dependency>
1518 <dependency> 1535 <dependency>
1519 <groupId>org.springframework.data</groupId> 1536 <groupId>org.springframework.data</groupId>
@@ -1714,6 +1731,23 @@ @@ -1714,6 +1731,23 @@
1714 <artifactId>snmp4j</artifactId> 1731 <artifactId>snmp4j</artifactId>
1715 <version>${snmp4j.version}</version> 1732 <version>${snmp4j.version}</version>
1716 </dependency> 1733 </dependency>
  1734 + <dependency>
  1735 + <groupId>org.testcontainers</groupId>
  1736 + <artifactId>testcontainers</artifactId>
  1737 + <version>${testcontainers.version}</version>
  1738 + <scope>test</scope>
  1739 + </dependency>
  1740 + <dependency>
  1741 + <groupId>org.zeroturnaround</groupId>
  1742 + <artifactId>zt-exec</artifactId>
  1743 + <version>${zeroturnaround.version}</version>
  1744 + <scope>test</scope>
  1745 + </dependency>
  1746 + <dependency>
  1747 + <groupId>org.apache.httpcomponents</groupId>
  1748 + <artifactId>httpclient</artifactId>
  1749 + <version>${httpclient.version}</version>
  1750 + </dependency>
1717 </dependencies> 1751 </dependencies>
1718 </dependencyManagement> 1752 </dependencyManagement>
1719 1753
@@ -94,14 +94,18 @@ @@ -94,14 +94,18 @@
94 <scope>provided</scope> 94 <scope>provided</scope>
95 </dependency> 95 </dependency>
96 <dependency> 96 <dependency>
97 - <groupId>junit</groupId>  
98 - <artifactId>junit</artifactId>  
99 - <version>${junit.version}</version> 97 + <groupId>org.springframework.boot</groupId>
  98 + <artifactId>spring-boot-starter-test</artifactId>
100 <scope>test</scope> 99 <scope>test</scope>
101 </dependency> 100 </dependency>
102 <dependency> 101 <dependency>
103 - <groupId>org.mockito</groupId>  
104 - <artifactId>mockito-core</artifactId> 102 + <groupId>org.junit.vintage</groupId>
  103 + <artifactId>junit-vintage-engine</artifactId>
  104 + <scope>test</scope>
  105 + </dependency>
  106 + <dependency>
  107 + <groupId>org.awaitility</groupId>
  108 + <artifactId>awaitility</artifactId>
105 <scope>test</scope> 109 <scope>test</scope>
106 </dependency> 110 </dependency>
107 </dependencies> 111 </dependencies>
@@ -126,9 +126,18 @@ @@ -126,9 +126,18 @@
126 <scope>provided</scope> 126 <scope>provided</scope>
127 </dependency> 127 </dependency>
128 <dependency> 128 <dependency>
129 - <groupId>junit</groupId>  
130 - <artifactId>junit</artifactId>  
131 - <version>${junit.version}</version> 129 + <groupId>org.springframework.boot</groupId>
  130 + <artifactId>spring-boot-starter-test</artifactId>
  131 + <scope>test</scope>
  132 + </dependency>
  133 + <dependency>
  134 + <groupId>org.junit.vintage</groupId>
  135 + <artifactId>junit-vintage-engine</artifactId>
  136 + <scope>test</scope>
  137 + </dependency>
  138 + <dependency>
  139 + <groupId>org.awaitility</groupId>
  140 + <artifactId>awaitility</artifactId>
132 <scope>test</scope> 141 <scope>test</scope>
133 </dependency> 142 </dependency>
134 <dependency> 143 <dependency>
@@ -146,12 +155,6 @@ @@ -146,12 +155,6 @@
146 </exclusions> 155 </exclusions>
147 <scope>test</scope> 156 <scope>test</scope>
148 </dependency> 157 </dependency>
149 - <dependency>  
150 - <groupId>org.mockito</groupId>  
151 - <artifactId>mockito-core</artifactId>  
152 - <scope>test</scope>  
153 - </dependency>  
154 -  
155 </dependencies> 158 </dependencies>
156 159
157 <build> 160 <build>
@@ -70,13 +70,13 @@ @@ -70,13 +70,13 @@
70 <scope>test</scope> 70 <scope>test</scope>
71 </dependency> 71 </dependency>
72 <dependency> 72 <dependency>
73 - <groupId>junit</groupId>  
74 - <artifactId>junit</artifactId> 73 + <groupId>org.junit.vintage</groupId>
  74 + <artifactId>junit-vintage-engine</artifactId>
75 <scope>test</scope> 75 <scope>test</scope>
76 </dependency> 76 </dependency>
77 <dependency> 77 <dependency>
78 - <groupId>org.mockito</groupId>  
79 - <artifactId>mockito-core</artifactId> 78 + <groupId>org.awaitility</groupId>
  79 + <artifactId>awaitility</artifactId>
80 <scope>test</scope> 80 <scope>test</scope>
81 </dependency> 81 </dependency>
82 </dependencies> 82 </dependencies>
@@ -70,13 +70,13 @@ @@ -70,13 +70,13 @@
70 <scope>test</scope> 70 <scope>test</scope>
71 </dependency> 71 </dependency>
72 <dependency> 72 <dependency>
73 - <groupId>junit</groupId>  
74 - <artifactId>junit</artifactId> 73 + <groupId>org.junit.vintage</groupId>
  74 + <artifactId>junit-vintage-engine</artifactId>
75 <scope>test</scope> 75 <scope>test</scope>
76 </dependency> 76 </dependency>
77 <dependency> 77 <dependency>
78 - <groupId>org.mockito</groupId>  
79 - <artifactId>mockito-core</artifactId> 78 + <groupId>org.awaitility</groupId>
  79 + <artifactId>awaitility</artifactId>
80 <scope>test</scope> 80 <scope>test</scope>
81 </dependency> 81 </dependency>
82 </dependencies> 82 </dependencies>
@@ -104,13 +104,13 @@ @@ -104,13 +104,13 @@
104 <scope>test</scope> 104 <scope>test</scope>
105 </dependency> 105 </dependency>
106 <dependency> 106 <dependency>
107 - <groupId>junit</groupId>  
108 - <artifactId>junit</artifactId> 107 + <groupId>org.junit.vintage</groupId>
  108 + <artifactId>junit-vintage-engine</artifactId>
109 <scope>test</scope> 109 <scope>test</scope>
110 </dependency> 110 </dependency>
111 <dependency> 111 <dependency>
112 - <groupId>org.mockito</groupId>  
113 - <artifactId>mockito-core</artifactId> 112 + <groupId>org.awaitility</groupId>
  113 + <artifactId>awaitility</artifactId>
114 <scope>test</scope> 114 <scope>test</scope>
115 </dependency> 115 </dependency>
116 <dependency> 116 <dependency>
@@ -70,13 +70,13 @@ @@ -70,13 +70,13 @@
70 <scope>test</scope> 70 <scope>test</scope>
71 </dependency> 71 </dependency>
72 <dependency> 72 <dependency>
73 - <groupId>junit</groupId>  
74 - <artifactId>junit</artifactId> 73 + <groupId>org.junit.vintage</groupId>
  74 + <artifactId>junit-vintage-engine</artifactId>
75 <scope>test</scope> 75 <scope>test</scope>
76 </dependency> 76 </dependency>
77 <dependency> 77 <dependency>
78 - <groupId>org.mockito</groupId>  
79 - <artifactId>mockito-core</artifactId> 78 + <groupId>org.awaitility</groupId>
  79 + <artifactId>awaitility</artifactId>
80 <scope>test</scope> 80 <scope>test</scope>
81 </dependency> 81 </dependency>
82 </dependencies> 82 </dependencies>