Remove COE and SFC from master distribution

Change-Id: I017aa878885a8fabdeeb93f14d6e2e91262ea832
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index 4afe68bb0bab3d45d9b4e0cc3df99021ab367035..54f5b98c5a1a9f3746fa10aa408fdd93779751c3 100644 (file)
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -57,23 +57,6 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
-        <profile>
-            <id>coe</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.coe</groupId>
-                        <artifactId>coe-artifacts</artifactId>
-                        <version>${coe.version}</version>
-                        <type>pom</type>
-                        <scope>import</scope>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
         <profile>
             <id>controller</id>
             <activation>

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index c7f57bd5eadbb7d5f69d2a6dec1317888f8d509f..126e454dd991ac4d4fbae8f068afa3db8f3465ba 100644 (file)
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -133,23 +133,5 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
-        <!-- SFC -->
-        <profile>
-            <id>sfc</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.sfc</groupId>
-                        <artifactId>features4-sfc</artifactId>
-                        <version>${sfc.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
     </profiles>
 </project>

diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 9e3762c154fc43ecc7220329341cc166964eda4f..4f7851e768d9ed7fbd0c81e8e125e6698b4c1537 100644 (file)
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -46,7 +46,6 @@
         <aaa.version>0.11.0-SNAPSHOT</aaa.version>
         <benchmark.version>1.9.0-SNAPSHOT</benchmark.version>
         <bgpcep.version>0.13.0-SNAPSHOT</bgpcep.version>
-        <coe.version>0.7.0-SNAPSHOT</coe.version>
         <config.version>0.12.0-SNAPSHOT</config.version>
         <controller.version>1.11.0-SNAPSHOT</controller.version>
         <controller.extras.version>1.14.0-SNAPSHOT</controller.extras.version>
@@ -63,7 +62,6 @@
         <openflowplugin.version>0.10.0-SNAPSHOT</openflowplugin.version>
         <ovsdb.version>1.10.0-SNAPSHOT</ovsdb.version>
         <serviceutils.version>0.5.0-SNAPSHOT</serviceutils.version>
-        <sfc.version>0.11.0-SNAPSHOT</sfc.version>
         <yangtools.version>4.0.2</yangtools.version>
         <!-- Keep this list sorted alphabetically please. -->
     </properties>

diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index a645a0d65cb63789455065bc6b9cc910ee2ee6f2..364eacec22f0b41834f9995dbb636bf9bdfe2a10 100644 (file)
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -83,72 +83,5 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
-        <!-- SFC -->
-        <profile>
-            <id>sfc</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.sfc</groupId>
-                        <artifactId>odl-sfc-ios-xe-renderer</artifactId>
-                        <version>${sfc.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.sfc</groupId>
-                        <artifactId>odl-sfc-netconf</artifactId>
-                        <version>${sfc.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.sfc</groupId>
-                        <artifactId>odl-sfc-openflow-renderer</artifactId>
-                        <version>${sfc.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.sfc</groupId>
-                        <artifactId>odl-sfc-ovs</artifactId>
-                        <version>${sfc.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.sfc</groupId>
-                        <artifactId>odl-sfc-sb-rest</artifactId>
-                        <version>${sfc.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.sfc</groupId>
-                        <artifactId>odl-sfc-vpp-renderer</artifactId>
-                        <version>${sfc.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.sfc</groupId>
-                        <artifactId>odl-sfclisp</artifactId>
-                        <version>${sfc.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.sfc</groupId>
-                        <artifactId>odl-sfc-shell</artifactId>
-                        <version>${sfc.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
     </profiles>
 </project>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index c5f8e14634e968b13e82b6d358b1687e8372e042..9de31d0c898929fa6c688dc7adc7f44a0e519284 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -106,21 +106,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- COE -->
-        <profile>
-            <id>coe</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.coe</groupId>
-                    <artifactId>features-coe</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-            </dependencies>
-        </profile>
         <!-- Controller -->
         <profile>
             <id>controller</id>
@@ -371,21 +356,5 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- SFC -->
-        <profile>
-            <id>sfc</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.sfc</groupId>
-                    <artifactId>features4-sfc</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-            </dependencies>
-        </profile>
-        <!-- FIXME: Add Yangtools -->
     </profiles>
 </project>

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index 086de385f70b2bdf7f73cb03151c799ea1e05b2f..7258e104d566a00dfdded823e02041dc82f394be 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -59,21 +59,6 @@
 
     <!-- External single feature dependencies in alphabetical order -->
     <profiles>
-        <!-- COE -->
-        <profile>
-            <id>coe</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.coe</groupId>
-                    <artifactId>odl-coe</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
         <!-- Genius -->
         <profile>
             <id>genius</id>
@@ -143,39 +128,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- SFC -->
-        <profile>
-            <id>sfc</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.sfc</groupId>
-                    <artifactId>odl-sfc-ios-xe-renderer</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.sfc</groupId>
-                    <artifactId>odl-sfc-netconf</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.sfc</groupId>
-                    <artifactId>odl-sfc-openflow-renderer</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.sfc</groupId>
-                    <artifactId>odl-sfc-vpp-renderer</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
         <!-- Serviceutils -->
         <profile>
             <id>serviceutils</id>

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 57241856831279510e69ac1b154a7323d3d81cc1..9655228bfdd1dca4f166ad40aae623696c1c711c 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -249,38 +249,5 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- SFC -->
-        <profile>
-            <id>sfc</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.sfc</groupId>
-                    <artifactId>odl-sfc-ovs</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.sfc</groupId>
-                    <artifactId>odl-sfc-sb-rest</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.sfc</groupId>
-                    <artifactId>odl-sfclisp</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.sfc</groupId>
-                    <artifactId>odl-sfc-shell</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
     </profiles>
 </project>