From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Thu, 7 Apr 2016 19:30:25 +0000 (-0400)
Subject: Remove Reservation from Boron
X-Git-Tag: release/boron~69
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=5354a5131569fe5f544f78ad6224c92de87e00bf

Remove Reservation from Boron

Project has declined to participate in Boron.

See:
https://lists.opendaylight.org/pipermail/reservation-dev/2016-March/000020.html

Change-Id: Ice6542642218ad035b60a773da72719287cd9ab6
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/features-index/pom.xml b/features-index/pom.xml
index cc58043a..41427a22 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -336,13 +336,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.reservation</groupId>
-      <artifactId>features-reservation</artifactId>
-      <version>${feature.reservation.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.sdninterfaceapp</groupId>
       <artifactId>features-sdninterfaceapp</artifactId>
diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 55d6a8cf..74bbb4c5 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -79,7 +79,6 @@
     <repository>mvn:org.opendaylight.ovsdb/openstack.net-virt-sfc-features/${feature.ovsdb.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/southbound-features/${feature.ovsdb.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.packetcable/features-packetcable-policy/${feature.packetcable.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.reservation/features-reservation/${feature.reservation.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.sdninterfaceapp/features-sdninterfaceapp/${feature.sdninterfaceapp.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.sfc/features-sfc/${feature.sfc.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.snbi/features-snbi/${feature.snbi.version}/xml/features</repository>
diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 08a4fc0d..0faee16f 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -107,7 +107,6 @@
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-library</feature>
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-southbound-impl</feature>
         <feature version='${feature.packetcable.version}'>odl-packetcable-policy-server-all</feature>
-        <feature version='${feature.reservation.version}'>odl-reservation-models</feature>
         <feature version='${feature.restconf.version}'>odl-restconf-noauth</feature>
 <!--
         <feature version="${feature.sdninterfaceapp.version}">odl-sdninterfaceapp-all</feature>
diff --git a/pom.xml b/pom.xml
index 5385997e..8b1aa846 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,6 @@
     <feature.openflowplugin.version>0.3.0-SNAPSHOT</feature.openflowplugin.version>
     <feature.ovsdb.version>1.3.0-SNAPSHOT</feature.ovsdb.version>
     <feature.packetcable.version>1.4.0-SNAPSHOT</feature.packetcable.version>
-    <feature.reservation.version>1.2.0-SNAPSHOT</feature.reservation.version>
     <feature.restconf.version>1.4.0-SNAPSHOT</feature.restconf.version>
     <feature.sdninterfaceapp.version>1.7.0-SNAPSHOT</feature.sdninterfaceapp.version>
     <feature.sfc.version>0.3.0-SNAPSHOT</feature.sfc.version>