Migrate off deprecated APIs, to mdsal.binding.api.DataBroker

[unimgr.git] / ovs-driver / pom.xml

diff --git a/ovs-driver/pom.xml b/ovs-driver/pom.xml
index 373248542270896dff9291549eddbcd29bb7fdbb..74a14758a1fb0ecc51753c30e3457f512d58cc04 100644 (file)
--- a/ovs-driver/pom.xml
+++ b/ovs-driver/pom.xml
@@ -11,11 +11,10 @@
     </parent>
 
     <properties>
-        <checkstyle.skip>true</checkstyle.skip>
-        <powermock.version>1.6.4</powermock.version>
+        <powermock.version>2.0.0-beta.5</powermock.version>
         <openflow.version>0.8.0-SNAPSHOT</openflow.version>
         <ovsdb.version>1.8.0-SNAPSHOT</ovsdb.version>
-        <mdsal.version>1.9.0-SNAPSHOT</mdsal.version>
+        <mdsal.version>2.6.0-SNAPSHOT</mdsal.version>
     </properties>
 
     <modelVersion>4.0.0</modelVersion>
@@ -40,18 +39,6 @@
         </plugins>
     </build>
 
-    <dependencyManagement>
-      <dependencies>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>mdsal-artifacts</artifactId>
-          <version>${mdsal.version}</version>
-          <type>pom</type>
-          <scope>import</scope>
-        </dependency>
-      </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -72,18 +59,21 @@
             <version>${ovsdb.version}</version>
         </dependency>
 
-        <!-- Testing Dependencies -->
+        <!-- dependencies to use AbstractConcurrentDataBrokerTest -->
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-dom-adapter</artifactId>
+            <version>${mdsal.version}</version>
+            <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-            <type>test-jar</type>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-dom-adapter</artifactId>
             <scope>test</scope>
         </dependency>
+ 
+        <!-- Testing Dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -93,37 +83,44 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
+            <version>2.10.0</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-core</artifactId>
+            <version>${powermock.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
+            <version>${powermock.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <version>${powermock.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-support</artifactId>
+            <version>${powermock.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-reflect</artifactId>
+            <version>${powermock.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-yang-types-20130715</artifactId>
+            <version>2013.07.15.14.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>