Merge "Use Fedora vs CentOS for tools VM, add Ubuntu cfg script"

[integration.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index d8fe0823ca479d92ee425ad96fe3f0488e3c9a87..919489fc6e6a7e5cc1a0684a135ccc8a1e3e6002 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,11 @@
 <?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">
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <relativePath/>
+  </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.integration</groupId>
   <artifactId>root</artifactId>
@@ -21,6 +27,7 @@
     <feature.flow.version>1.2.0-SNAPSHOT</feature.flow.version>
     <feature.yangtools.version>0.7.0-SNAPSHOT</feature.yangtools.version>
     <feature.adsal.version>0.9.0-SNAPSHOT</feature.adsal.version>
+    <feature.neutron.version>0.5.0-SNAPSHOT</feature.neutron.version>
     <feature.nsf.version>0.5.0-SNAPSHOT</feature.nsf.version>
     <feature.openflowplugin.version>0.1.0-SNAPSHOT</feature.openflowplugin.version>
     <feature.ovsdb.version>1.1.0-SNAPSHOT</feature.ovsdb.version>
@@ -30,16 +37,21 @@
     <feature.sfc.version>0.1.0-SNAPSHOT</feature.sfc.version>
     <feature.snbi.version>1.1.0-SNAPSHOT</feature.snbi.version>
     <feature.ttp.version>0.1.0-SNAPSHOT</feature.ttp.version>
+    <feature.usc.version>1.0-SNAPSHOT</feature.usc.version>
     <feature.vtn-manager.version>0.3.0-SNAPSHOT</feature.vtn-manager.version>
-    <feature.bgp.version>0.4.0-SNAPSHOT</feature.bgp.version>
+    <feature.bgpcep.version>0.4.0-SNAPSHOT</feature.bgpcep.version>
     <feature.packetcable.version>1.2.0-SNAPSHOT</feature.packetcable.version>
     <feature.plugin2oc.version>0.2.0-SNAPSHOT</feature.plugin2oc.version>
     <feature.tcpmd5.version>1.1.0-SNAPSHOT</feature.tcpmd5.version>
+    <feature.topoprocessing.version>0.0.1-SNAPSHOT</feature.topoprocessing.version>
     <karaf.branding.version>1.1.0-SNAPSHOT</karaf.branding.version>
-    <karaf.version>3.0.1</karaf.version>
     <maven.surefire.version>2.16</maven.surefire.version>
     <checkstyle.version>2.13</checkstyle.version>
     <enforcer.version>1.3.1</enforcer.version>
+    <snmp.plugin.version>1.0-SNAPSHOT</snmp.plugin.version>
+    <didm.version>0.1.0-SNAPSHOT</didm.version>
+    <feature.vpnservice.version>1.0-SNAPSHOT</feature.vpnservice.version>
+    <feature.lacp.version>1.0.0-SNAPSHOT</feature.lacp.version>
   </properties>
   <modules>
     <module>distributions/</module>
@@ -211,7 +223,21 @@
         <dependency>
           <groupId>org.opendaylight.bgpcep</groupId>
           <artifactId>features-bgp</artifactId>
-          <version>${feature.bgp.version}</version>
+          <version>${feature.bgpcep.version}</version>
+          <classifier>features</classifier>
+          <type>xml</type>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.bgpcep</groupId>
+          <artifactId>features-extras</artifactId>
+          <version>${feature.bgpcep.version}</version>
+          <classifier>features</classifier>
+          <type>xml</type>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.bgpcep</groupId>
+          <artifactId>features-pcep</artifactId>
+          <version>${feature.bgpcep.version}</version>
           <classifier>features</classifier>
           <type>xml</type>
         </dependency>
@@ -242,13 +268,6 @@
            <classifier>features</classifier>
           <type>xml</type>
         </dependency>
-
-        <!-- test to validate features.xml -->
-        <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>features-test</artifactId>
-          <version>${feature.yangtools.version}</version>
-        </dependency>
       </dependencies>
   </dependencyManagement>
   <build>