From 6fb8dfad11c84c0833e842183ec43a4ee95e81de Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Tue, 14 Jul 2020 08:55:33 -0400
Subject: Update adaptors to sodium

Update sli/adaptors to OpenDaylight Sodium release.  2 changes were
needed:

- mdsal-resource : needed to add unimplemented abstract methods in
inner anonymous BundleContext class in test case.
- resource-assignment: needed to correct unit test problems that were
ignored in earlier versions of h2

Change-Id: Ice63bfce64768e46c4376db55e3e9e97d0b934ad
Issue-ID: CCSDK-2551
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 features/ccsdk-ansible-adapter/pom.xml   |  6 ++++++
 features/ccsdk-saltstack-adapter/pom.xml | 10 +++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'features')

diff --git a/features/ccsdk-ansible-adapter/pom.xml b/features/ccsdk-ansible-adapter/pom.xml
index 32ec5058f..da497f56f 100644
--- a/features/ccsdk-ansible-adapter/pom.xml
+++ b/features/ccsdk-ansible-adapter/pom.xml
@@ -36,6 +36,12 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>ansible-adapter-bundle</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>powermock-api-mockito</artifactId>
+                    <groupId>org.powermock</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
 
diff --git a/features/ccsdk-saltstack-adapter/pom.xml b/features/ccsdk-saltstack-adapter/pom.xml
index ffc43e152..2e51c83be 100644
--- a/features/ccsdk-saltstack-adapter/pom.xml
+++ b/features/ccsdk-saltstack-adapter/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -33,6 +34,13 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>saltstack-adapter-provider</artifactId>
             <version>${project.version}</version>
+
+            <exclusions>
+                <exclusion>
+                    <artifactId>powermock-api-mockito</artifactId>
+                    <groupId>org.powermock</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 </project>
-- 
cgit 1.2.3-korg