Commit 9c9aee04c7c1c10bdd48eacabbada91de6b4bf86
Merge branch 'master' of github.com:thingsboard/thingsboard
Showing
2 changed files
with
9 additions
and
10 deletions
| @@ -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> |
| @@ -117,7 +117,6 @@ | @@ -117,7 +117,6 @@ | ||
| 117 | <javax.validation-api.version>2.0.1.Final</javax.validation-api.version> | 117 | <javax.validation-api.version>2.0.1.Final</javax.validation-api.version> |
| 118 | <antisamy.version>1.6.2</antisamy.version> | 118 | <antisamy.version>1.6.2</antisamy.version> |
| 119 | <snmp4j.version>2.8.5</snmp4j.version> | 119 | <snmp4j.version>2.8.5</snmp4j.version> |
| 120 | - <httpclient.version>4.5.13</httpclient.version> | ||
| 121 | <!-- TEST SCOPE --> | 120 | <!-- TEST SCOPE --> |
| 122 | <awaitility.version>4.1.0</awaitility.version> | 121 | <awaitility.version>4.1.0</awaitility.version> |
| 123 | <cassandra-unit.version>4.3.1.0</cassandra-unit.version> | 122 | <cassandra-unit.version>4.3.1.0</cassandra-unit.version> |
| @@ -1848,11 +1847,6 @@ | @@ -1848,11 +1847,6 @@ | ||
| 1848 | <version>${zeroturnaround.version}</version> | 1847 | <version>${zeroturnaround.version}</version> |
| 1849 | <scope>test</scope> | 1848 | <scope>test</scope> |
| 1850 | </dependency> | 1849 | </dependency> |
| 1851 | - <dependency> | ||
| 1852 | - <groupId>org.apache.httpcomponents</groupId> | ||
| 1853 | - <artifactId>httpclient</artifactId> | ||
| 1854 | - <version>${httpclient.version}</version> | ||
| 1855 | - </dependency> | ||
| 1856 | </dependencies> | 1850 | </dependencies> |
| 1857 | </dependencyManagement> | 1851 | </dependencyManagement> |
| 1858 | 1852 |