aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-01-10 16:59:48 -0500
committerJim Hahn <jrh3@att.com>2020-01-10 17:11:58 -0500
commitfe23721d28abc621637eabc8f0d58e777f706661 (patch)
tree1bf9ce420dcafa99b13d97b5011c731f5d0e1f90
parent613946040a9e49bed487b5946f925bb6f22c5ee8 (diff)
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
-rw-r--r--common-logging/pom.xml12
-rw-r--r--utils/pom.xml5
2 files changed, 11 insertions, 6 deletions
diff --git a/common-logging/pom.xml b/common-logging/pom.xml
index 5e096c7..335af71 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 fa46a18..ef05914 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -34,6 +34,11 @@
<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>
</dependency>