Remove Packetcable from integration.

Packetcable project in current state is preventing
Integration project to create ODL distribution builds.

Until https://git.opendaylight.org/gerrit/#/c/17222/ is merged,
packetcable features and repositories are commented out.

Change-Id: I1a6125586fe1d423a73f767483084efcaa5928e6
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 86953bfb57db11dc66fb25ca684447de202e0743..1a81a428ee6cea5fa32613589254248655a3e0c4 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -230,7 +230,7 @@
       <type>xml</type>
     </dependency>
 
-
+<!--
     <dependency>
        <groupId>org.opendaylight.packetcable</groupId>
        <artifactId>features-packetcable</artifactId>
@@ -238,7 +238,7 @@
        <classifier>features</classifier>
        <type>xml</type>
     </dependency>
-
+-->
     <dependency>
       <groupId>org.opendaylight.snmp4sdn</groupId>
       <artifactId>features-snmp4sdn</artifactId>

diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index c436a95e21e05a4bb9ba3a9f9d607095fcb3c496..d6c9fd8ac5858164cbb5d42f1c822dd8f54904b0 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -53,7 +53,9 @@
     <repository>mvn:org.opendaylight.openflowplugin.legacy/features-legacy/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/features-ovsdb/${feature.ovsdb.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/features-ovs-sfc/0.1.0-SNAPSHOT/xml/features</repository>
+<!--
     <repository>mvn:org.opendaylight.packetcable/features-packetcable/${feature.packetcable.version}/xml/features</repository>
+-->
 <!--
     <repository>mvn:org.opendaylight.plugin2oc/features-plugin2oc/0.2.0-SNAPSHOT/xml/features</repository>
 -->

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index a4b5645c77a3b993d6a52b4eb50acb1952bd5be6..2ffcd2784ccc4acf48b4c56972996722bd3d1d6e 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -82,7 +82,9 @@
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-ui</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-nxm-extensions</feature>
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-all</feature>
+<!--
         <feature version='${feature.packetcable.version}'>odl-packetcable-all</feature>
+-->
         <feature version='1.2.0-SNAPSHOT'>odl-restconf</feature>
         <feature version="1.5.0-SNAPSHOT">odl-sdninterfaceapp-all</feature>
         <feature version='0.1.0-SNAPSHOT'>odl-sfc-core</feature>

diff --git a/pom.xml b/pom.xml
index 919489fc6e6a7e5cc1a0684a135ccc8a1e3e6002..f34d95f7904bce3b8f61f16894bc4ec8c4e77658 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,9 @@
     <feature.usc.version>1.0-SNAPSHOT</feature.usc.version>
     <feature.vtn-manager.version>0.3.0-SNAPSHOT</feature.vtn-manager.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>
@@ -260,7 +262,7 @@
           <type>xml</type>
         </dependency>
 
-        <!-- packetcable Related Features -->
+        <!-- packetcable Related Features
         <dependency>
            <groupId>org.opendaylight.packetcable</groupId>
            <artifactId>features-packetcable</artifactId>
@@ -268,6 +270,7 @@
            <classifier>features</classifier>
           <type>xml</type>
         </dependency>
+         -->
       </dependencies>
   </dependencyManagement>
   <build>