Browse Source
Merge pull request #5179 from smatvienko-tb/dependency-hotfix-after-merge-ce
dependency-hotfix-after-merge-ce (httpclient doubled, test dependency…
pull/5186/head
Igor Kulikov
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
9 additions and
10 deletions
-
common/cluster-api/pom.xml
-
pom.xml
|
|
|
@ -101,13 +101,18 @@ |
|
|
|
<scope>provided</scope> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>junit</groupId> |
|
|
|
<artifactId>junit</artifactId> |
|
|
|
<groupId>org.springframework.boot</groupId> |
|
|
|
<artifactId>spring-boot-starter-test</artifactId> |
|
|
|
<scope>test</scope> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.junit.vintage</groupId> |
|
|
|
<artifactId>junit-vintage-engine</artifactId> |
|
|
|
<scope>test</scope> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.mockito</groupId> |
|
|
|
<artifactId>mockito-core</artifactId> |
|
|
|
<groupId>org.awaitility</groupId> |
|
|
|
<artifactId>awaitility</artifactId> |
|
|
|
<scope>test</scope> |
|
|
|
</dependency> |
|
|
|
</dependencies> |
|
|
|
|
|
|
|
@ -117,7 +117,6 @@ |
|
|
|
<javax.validation-api.version>2.0.1.Final</javax.validation-api.version> |
|
|
|
<antisamy.version>1.6.2</antisamy.version> |
|
|
|
<snmp4j.version>2.8.5</snmp4j.version> |
|
|
|
<httpclient.version>4.5.13</httpclient.version> |
|
|
|
<!-- TEST SCOPE --> |
|
|
|
<awaitility.version>4.1.0</awaitility.version> |
|
|
|
<cassandra-unit.version>4.3.1.0</cassandra-unit.version> |
|
|
|
@ -1848,11 +1847,6 @@ |
|
|
|
<version>${zeroturnaround.version}</version> |
|
|
|
<scope>test</scope> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.apache.httpcomponents</groupId> |
|
|
|
<artifactId>httpclient</artifactId> |
|
|
|
<version>${httpclient.version}</version> |
|
|
|
</dependency> |
|
|
|
</dependencies> |
|
|
|
</dependencyManagement> |
|
|
|
|
|
|
|
|
