Merge dev/fluorine work across to master

[unimgr.git] / impl / pom.xml

diff --git a/impl/pom.xml b/impl/pom.xml
index 38b3b79ffbab49b19f6cde2c976bdf1bfe05560b..2a7b509d0d4cac711c947fa5c3407ee32a128437 100644 (file)
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -12,12 +12,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>0.12.0-SNAPSHOT</version>
+        <version>0.13.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <properties>
-        <ovsdb.version>1.6.0-SNAPSHOT</ovsdb.version>
+        <ovsdb.version>1.7.0-SNAPSHOT</ovsdb.version>
+        <mdsal.version>1.8.0-SNAPSHOT</mdsal.version>
+        <netconf.version>1.5.0-SNAPSHOT</netconf.version>
     </properties>
 
     <modelVersion>4.0.0</modelVersion>
@@ -25,7 +27,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <artifactId>unimgr-impl</artifactId>
     <version>0.4.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <!-- <name> formatting is used by autorelease to parse and notify projects on
+    <!-- <name> formatting is used by autorelse to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
     <name>ODL :: unimgr :: ${project.artifactId}</name>
     <build>
@@ -66,47 +68,33 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
         </plugins>
     </build>
 
-    <dependencyManagement>
-      <dependencies>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>mdsal-artifacts</artifactId>
-          <version>1.7.0-SNAPSHOT</version>
-          <type>pom</type>
-          <scope>import</scope>
-        </dependency>
-      </dependencies>
-    </dependencyManagement>
+
 
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>unimgr-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
-        <!--     OVSDB dependency -->
         <dependency>
-            <groupId>org.opendaylight.ovsdb</groupId>
-            <artifactId>southbound-impl</artifactId>
-            <version>${ovsdb.version}</version>
+            <groupId>org.opendaylight.unimgr</groupId>
+            <artifactId>unimgr-nrp-tapi-api</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-topology</artifactId>
-            <version>1.4.0-SNAPSHOT</version>
+            <version>${netconf.version}</version>
         </dependency>
 
         <!-- dependencies to use AbstractDataBrokerTest -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
+            <version>${mdsal.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
+            <version>${mdsal.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
@@ -168,10 +156,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.unimgr</groupId>
-            <artifactId>unimgr-nrp-tapi-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
 </project>