From 6c59593a4b506c8ce21cae619a4fccd45923e1d1 Mon Sep 17 00:00:00 2001
From: HOCKLA <ah999m@att.com>
Date: Thu, 2 Jan 2020 09:20:42 -0600
Subject: Added mockito dependencies

Added latest versions of mockito-core and powermock-mockito2
Part of jdk11 upgrades

Issue-ID: POLICY-1594
Change-Id: Ifbd18a71f23ff38bfea41f75e9085322a47a421d
Signed-off-by: HOCKLA <ah999m@att.com>
---
 integration/pom.xml | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'integration')

diff --git a/integration/pom.xml b/integration/pom.xml
index 6d6a1318..68388a6c 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2018-2019 AT&T. All rights reserved.
+   Modifications Copyright (C) 2018-2020 AT&T. All rights reserved.
    Modifications Copyright (C) 2019 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,12 +37,15 @@
         <java.version>11</java.version>
         <version.logback>1.2.3</version.logback>
         <version.dmaap>1.1.9</version.dmaap>
-        <version.powermock>1.7.4</version.powermock>
+        <version.powermock>2.0.4</version.powermock>
         <version.eclipselink>2.7.5</version.eclipselink>
         <version.jackson>2.10.0.pr3</version.jackson>
         <version.drools>7.30.0.Final</version.drools>
         <version.jersey>2.29.1</version.jersey>
         <version.ccsdk>0.4.4</version.ccsdk>
+        <version.swagger>1.6.0</version.swagger>
+        <version.javax.json>1.1.4</version.javax.json>
+        <version.json>20190722</version.json>
     </properties>
 
     <distributionManagement>
@@ -176,7 +179,7 @@
             <dependency>
                 <groupId>io.swagger</groupId>
                 <artifactId>swagger-jersey2-jaxrs</artifactId>
-                <version>1.5.24</version>
+                <version>${version.swagger}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.glassfish.jersey.containers</groupId>
@@ -449,6 +452,12 @@
             </dependency>
 
             <!-- Mock libraries -->
+            <dependency>
+                <groupId>com.openpojo</groupId>
+                <artifactId>openpojo</artifactId>
+                <version>0.8.10</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-all</artifactId>
@@ -463,7 +472,7 @@
             </dependency>
             <dependency>
                 <groupId>org.powermock</groupId>
-                <artifactId>powermock-api-mockito</artifactId>
+                <artifactId>powermock-api-mockito2</artifactId>
                 <version>${version.powermock}</version>
                 <scope>test</scope>
             </dependency>
@@ -474,9 +483,9 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>com.openpojo</groupId>
-                <artifactId>openpojo</artifactId>
-                <version>0.8.10</version>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>3.2.4</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>
-- 
cgit 1.2.3-korg