From: Luis Gomez <ecelgp@gmail.com>
Date: Fri, 8 Nov 2019 01:57:31 +0000 (-0800)
Subject: Remove COE and SFC from master distribution
X-Git-Tag: release/magnesium~8
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=088131e5ebb9ba5545ab7361d51c424d422a8aac

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 4afe68bb..54f5b98c 100644
--- 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 c7f57bd5..126e454d 100644
--- 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 9e3762c1..4f7851e7 100644
--- 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 a645a0d6..364eacec 100644
--- 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 c5f8e146..9de31d0c 100644
--- 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 086de385..7258e104 100644
--- 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 57241856..9655228b 100644
--- 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>