Merge "Removing ovsdb plugin dependency on sal.utils classes"

[netvirt.git] / commons / parent / pom.xml

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index a3b3b7afdc9547231be0a0df982968571666160c..c29f3b0de0cbda43062292702d099fc0521c21d0 100755 (executable)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -39,7 +39,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <openstack.netvirt.providers.version>1.1.0-SNAPSHOT</openstack.netvirt.providers.version>
     <ovsdb.library.version>1.1.0-SNAPSHOT</ovsdb.library.version>
     <ovsdb.northbound.version>0.7.0-SNAPSHOT</ovsdb.northbound.version>
-    <ovsdb.plugin.version>1.1.0-SNAPSHOT</ovsdb.plugin.version>
+    <ovsdb.plugin.version>1.1.1-SNAPSHOT</ovsdb.plugin.version>
     <ovsdb.ovssfc.version>0.1.0-SNAPSHOT</ovsdb.ovssfc.version>
     <ovsdb.utils.config.version>1.1.0-SNAPSHOT</ovsdb.utils.config.version>
     <plugin.shell.version>1.1.0-SNAPSHOT</plugin.shell.version>
@@ -68,6 +68,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <northbound.commons.version>0.5.0-SNAPSHOT</northbound.commons.version>
     <nsf.version>0.5.0-SNAPSHOT</nsf.version>
     <odl.karaf.base.version>1.5.0-SNAPSHOT</odl.karaf.base.version>
+    <odlparent.version>1.5.0-SNAPSHOT</odlparent.version>
     <opendaylight-l2-types.version>2013.08.27.7-SNAPSHOT</opendaylight-l2-types.version>
     <openflowjava-nicira.version>0.1.0-SNAPSHOT</openflowjava-nicira.version>
     <openflowjava-extension.version>0.1.0-SNAPSHOT</openflowjava-extension.version>
@@ -192,6 +193,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>model-inventory</artifactId>
         <version>${mdsal.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>features-test</artifactId>
+        <version>${odlparent.version}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>concepts</artifactId>
@@ -207,12 +214,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>yang-common</artifactId>
         <version>${yangtools.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>features-test</artifactId>
-        <version>${yangtools.version}</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.yangtools.model</groupId>
         <artifactId>ietf-inet-types</artifactId>
@@ -604,6 +605,46 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
   </scm>
 
+  <pluginRepositories>
+    <!-- Opendaylight public group -->
+    <pluginRepository>
+      <id>opendaylight-public</id>
+      <name>opendaylight-public</name>
+      <url>${nexusproxy}/groups/public/</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+    </pluginRepository>
+    <!-- OpenDayLight Released artifact -->
+    <pluginRepository>
+      <id>opendaylight-release</id>
+      <name>opendaylight-release</name>
+      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.release/</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </pluginRepository>
+    <!-- OpenDayLight Snapshot artifact -->
+    <pluginRepository>
+      <id>opendaylight-snapshot</id>
+      <name>opendaylight-snapshot</name>
+      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </pluginRepository>
+  </pluginRepositories>
+
   <profiles>
     <profile>
       <id>integrationtest</id>