Use serviceutils artifacts

[netvirt.git] / natservice / impl / pom.xml

diff --git a/natservice/impl/pom.xml b/natservice/impl/pom.xml
index 6ab440b8193b7fa77384d1a66a1a2e686c996d78..fdd075adb64fae18c4d618b758c07a9491f9a253 100644 (file)
--- a/natservice/impl/pom.xml
+++ b/natservice/impl/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>0.8.0-SNAPSHOT</version>
         <relativePath>../../commons/binding-parent</relativePath>
     </parent>
 
@@ -44,9 +44,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <version>${genius.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.genius</groupId>
+            <groupId>org.opendaylight.serviceutils</groupId>
             <artifactId>tools-api</artifactId>
-            <version>${genius.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.serviceutils</groupId>
+            <artifactId>upgrade</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
@@ -69,9 +72,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <version>${genius.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.infrautils</groupId>
-            <artifactId>counters-api</artifactId>
-            <version>${infrautils.version}</version>
+            <groupId>org.opendaylight.genius</groupId>
+            <artifactId>networkutils</artifactId>
+            <version>${genius.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -108,14 +111,47 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>model-flow-service</artifactId>
             <version>${openflowplugin.version}</version>
         </dependency>
+        <!-- FIXME: Upgrade to Mockito 2 -->
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
+            <version>1.6.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>3.21.0-GA</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>1.10.19</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
+            <version>1.6.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-support</artifactId>
+            <version>1.6.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-reflect</artifactId>
+            <version>1.6.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-core</artifactId>
+            <version>1.6.4</version>
             <scope>test</scope>
         </dependency>
     </dependencies>