dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:thingsboard/thingsboard

Browse Source
This commit is contained in:
Igor Kulikov 2021-09-01 15:40:10 +03:00
commit 9c9aee04c7
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/cluster-api/pom.xml
View File

@ -101,13 +101,18 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>junit</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.junit.vintage</groupId>
<artifactId>mockito-core</artifactId> <artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

6
pom.xml
View File

@ -117,7 +117,6 @@
<javax.validation-api.version>2.0.1.Final</javax.validation-api.version> <javax.validation-api.version>2.0.1.Final</javax.validation-api.version>
<antisamy.version>1.6.2</antisamy.version> <antisamy.version>1.6.2</antisamy.version>
<snmp4j.version>2.8.5</snmp4j.version> <snmp4j.version>2.8.5</snmp4j.version>
<httpclient.version>4.5.13</httpclient.version>
<!-- TEST SCOPE --> <!-- TEST SCOPE -->
<awaitility.version>4.1.0</awaitility.version> <awaitility.version>4.1.0</awaitility.version>
<cassandra-unit.version>4.3.1.0</cassandra-unit.version> <cassandra-unit.version>4.3.1.0</cassandra-unit.version>
@ -1848,11 +1847,6 @@
<version>${zeroturnaround.version}</version> <version>${zeroturnaround.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>