diff options
| author |   William Reehil <william.reehil@att.com> | 2022-10-13 13:32:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2022-10-13 13:32:11 +0000 |
| commit | 271e8f5f853c7ed8c277f5c12607a4633dd5b136 (patch) | |
| tree | 7e0f81011539646f1ca44bc5949c64deb0c596e0 /aai-core/pom.xml | |
| parent | 5175ddc0991f9bcf594394f9abbc85fdbca3cb9f (diff) | |
| parent | c7f83ca3344c52da125fc1efa217b666b74d57a6 (diff) | |
Merge "Migrate Mockito 1 to version 2 in aai-core"
Diffstat (limited to 'aai-core/pom.xml')
| -rw-r--r-- | aai-core/pom.xml | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/aai-core/pom.xml b/aai-core/pom.xml index 1cf73a78..9a990897 100644 --- a/aai-core/pom.xml +++ b/aai-core/pom.xml @@ -38,6 +38,7 @@ limitations under the License. <jacoco.line.coverage.limit>0.50</jacoco.line.coverage.limit> <gremlin.version>3.2.2</gremlin.version> <groovy.version>2.5.15</groovy.version> + <mockito.core.version>2.4.0</mockito.core.version> <!-- Start of Default ONAP Schema Properties --> <aai.wiki.link>https://wiki.onap.org/</aai.wiki.link> <gendoc.version>v15</gendoc.version> @@ -133,13 +134,7 @@ limitations under the License. <dependency> <groupId>com.att.eelf</groupId> <artifactId>eelf-core</artifactId> - <exclusions><!-- excluding transitive dependency coming from this artifact, - as we would need powermock-api-mockito2 --> - <exclusion> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - </exclusion> - </exclusions> + <version>2.0.0-oss</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> @@ -166,11 +161,6 @@ limitations under the License. </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> |