From: Jim Hahn <jrh3@att.com>
Date: Fri, 10 Jan 2020 21:59:48 +0000 (-0500)
Subject: Fix mockito import in common
X-Git-Tag: 1.6.2~31
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=fe23721d28abc621637eabc8f0d58e777f706661;p=policy%2Fcommon.git

Fix mockito import in common

ONAP-Logging was failing when using powermock-mockito2.
This change also requires a property (version.javax.bind) to be
added to the parent/integration pom.

Issue-ID: POLICY-1406
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: If8813edaf86d84cff72c0e476ebf2a36bf5dcf18
---

diff --git a/common-logging/pom.xml b/common-logging/pom.xml
index 5e096c74..335af71b 100644
--- a/common-logging/pom.xml
+++ b/common-logging/pom.xml
@@ -55,6 +55,12 @@
             <groupId>com.att.eelf</groupId>
             <artifactId>eelf-core</artifactId>
             <version>1.0.1-oss</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.powermock</groupId>
+                    <artifactId>powermock-api-mockito</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
          <dependency>
             <groupId>org.apache.commons</groupId>
@@ -65,12 +71,6 @@
             <artifactId>powermock-api-mockito2</artifactId>
             <scope>test</scope>
         </dependency>
-         <dependency>
-             <groupId>org.powermock</groupId>
-             <artifactId>powermock-api-mockito</artifactId>
-             <version>1.7.4</version>
-             <scope>test</scope>
-         </dependency>
     </dependencies>
 
     <build>
diff --git a/utils/pom.xml b/utils/pom.xml
index fa46a182..ef059147 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -33,6 +33,11 @@
     <packaging>jar</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${version.javax.bind}</version>
+        </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>