From: Colin Dixon <colin@colindixon.com>
Date: Wed, 3 Sep 2014 14:50:27 +0000 (-0500)
Subject: Adding ttp features
X-Git-Tag: release/lithium-sr2~113^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=ea8ffdaf91d37bac05cd13ea1e37675c5e419e66;p=integration%2Fdistribution.git

Adding ttp features

1) Feature Tests Pass: https://jenkins.opendaylight.org/ttp/job/ttp-merge/org.opendaylight.ttp$features-ttp/lastCompletedBuild/testReport/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=ttp.git;a=blob;f=features/src/main/resources/features.xml;hb=HEAD
3) Features Tested: Features have been tested for functionality with
   a) feature:install odl-ttp-all
   b) feature:install odl-integration-compatible-with-all
4) Integration Test Impact: none that we are aware of

Change-Id: Ic9d5e54c9298b0121df7a4040a482884c80d257a
Signed-off-by: Colin Dixon <colin@colindixon.com>
---

diff --git a/features/pom.xml b/features/pom.xml
index bb5ecdf8..b9bf7f3c 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -90,6 +90,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ttp</groupId>
+      <artifactId>features-ttp</artifactId>
+      <version>${feature.ttp.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
       <artifactId>features-lispflowmapping</artifactId>
diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index c98a65b0..d5f7ae13 100644
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -60,6 +60,7 @@
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.0.3-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/features-openflow-nxm/0.0.3-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/features-ovsdb/${feature.ovsdb.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.ttp/features-ttp/${feature.ttp.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.vtn/features-vtn-manager/${feature.vtn-manager.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-bgp/${feature.bgp.version}/xml/features</repository>
     <feature name='odl-integration-compatible-with-all' version='${project.version}'>
@@ -75,6 +76,7 @@
         <feature version='0.1.0-SNAPSHOT'>odl-aaa-all</feature>
         <feature version='${feature.bgp.version}'>odl-bgpcep-all</feature>
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-all</feature>
+        <feature version='${feature.ttp.version}'>odl-ttp-all</feature>
     </feature>
 
     <!--
diff --git a/pom.xml b/pom.xml
index 68151d03..a10c6cc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,7 @@
     <feature.ovsdb.version>1.0.0-SNAPSHOT</feature.ovsdb.version>
     <feature.ovsdb.openstack.version>1.0.0-SNAPSHOT</feature.ovsdb.openstack.version>
     <feature.lispflowmapping.version>1.1.11-SNAPSHOT</feature.lispflowmapping.version>
+    <feature.ttp.version>0.0.1-SNAPSHOT</feature.ttp.version>
     <feature.vtn-manager.version>0.2.0-SNAPSHOT</feature.vtn-manager.version>
     <feature.bgp.version>0.3.1-SNAPSHOT</feature.bgp.version>
     <karaf.branding.version>1.0.0-SNAPSHOT</karaf.branding.version>