diff options
Diffstat (limited to 'aai-traversal/pom.xml')
| -rw-r--r-- | aai-traversal/pom.xml | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml index 02f3eb6..d789c78 100644 --- a/aai-traversal/pom.xml +++ b/aai-traversal/pom.xml @@ -34,7 +34,8 @@ <artifactId>aai-traversal</artifactId> <properties> - <mockito.core.version>1.10.19</mockito.core.version> + <mockito.core.version>2.4.0</mockito.core.version> + <powermock.version>1.7.0RC2</powermock.version> <java.version>1.8</java.version> <start-class>org.onap.aai.TraversalApp</start-class> @@ -428,10 +429,10 @@ <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </dependency> - <!-- eelf dependency --> <dependency> <groupId>com.att.eelf</groupId> <artifactId>eelf-core</artifactId> + <version>2.0.0-oss</version> </dependency> <dependency> <groupId>ch.qos.logback</groupId> @@ -487,20 +488,28 @@ <artifactId>jackson-jaxrs-json-provider</artifactId> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + <version>${powermock.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> + <artifactId>powermock-api-mockito2</artifactId> + <version>${powermock.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-javaagent</artifactId> + <version>${powermock.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> + <artifactId>powermock-module-junit4-rule-agent</artifactId> + <version>${powermock.version}</version> <scope>test</scope> - <version>1.6.6</version> </dependency> <dependency> <groupId>com.beust</groupId> @@ -528,16 +537,6 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-javaagent</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4-rule-agent</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.github.fge</groupId> <artifactId>json-patch</artifactId> </dependency> @@ -634,6 +633,12 @@ <groupId>org.skyscreamer</groupId> <artifactId>jsonassert</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>com.vaadin.external.google</groupId> + <artifactId>android-json</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Explicitly stating the security spring framework and exclude the bouncy castle since that is somehow overwriting our p12 file decryption that's built |