Remove TTP & Cardinal from oxygen distribution

https://lists.opendaylight.org/pipermail/release/2017-October/012667.html
https://lists.opendaylight.org/pipermail/release/2017-October/012668.html

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

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index 6ef30be5997827811ef3aa8ffcaff285fe6d6937..d19d18bc652f3bbcc7a2eff1da2aa66c06fe7ac5 100644 (file)
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -78,15 +78,6 @@
                 <type>xml</type>
             </dependency>
 
-            <!-- Cardinal -->
-            <dependency>
-                <groupId>org.opendaylight.cardinal</groupId>
-                <artifactId>cardinal-features4</artifactId>
-                <version>${cardinal.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
             <!-- Controller -->
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
@@ -268,15 +259,6 @@
                 <type>xml</type>
             </dependency>
 
-            <!-- TTP -->
-            <dependency>
-                <groupId>org.opendaylight.ttp</groupId>
-                <artifactId>features-ttp</artifactId>
-                <version>${ttp.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
             <!-- USC -->
             <dependency>
                 <groupId>org.opendaylight.usc</groupId>

diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 12664bcf0fd6acc07a24e2dd9d220edd4850af63..fa05be74df8bc28d6994bd491c026aa17fed1e9d 100644 (file)
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -50,7 +50,6 @@
         <benchmark.version>1.5.0-SNAPSHOT</benchmark.version>
         <bgpcep.version>0.9.0-SNAPSHOT</bgpcep.version>
         <bier.version>0.3.0-SNAPSHOT</bier.version>
-        <cardinal.version>0.4.0-SNAPSHOT</cardinal.version>
         <coe.version>0.3.0-SNAPSHOT</coe.version>
         <config.version>0.8.0-SNAPSHOT</config.version>
         <controller.extras.version>1.10.0-SNAPSHOT</controller.extras.version>
@@ -90,7 +89,6 @@
         <snmp4sdn.version>0.7.0-SNAPSHOT</snmp4sdn.version>
         <sxp.version>1.6.0-SNAPSHOT</sxp.version>
         <tsdr.version>1.5.0-SNAPSHOT</tsdr.version>
-        <ttp.version>0.6.0-SNAPSHOT</ttp.version>
         <unimgr.version>0.4.0-SNAPSHOT</unimgr.version>
         <usc.version>1.5.0-SNAPSHOT</usc.version>
         <vpnservice.version>0.6.0-SNAPSHOT</vpnservice.version>

diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index a7b82357324ffe2bdee3539fab5b1a840644fcd4..a6e675b06c9352db28f761c8692a35eb5a78c775 100644 (file)
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -104,22 +104,6 @@
                 <type>xml</type>
             </dependency>
 
-            <!-- Cardinal -->
-            <dependency>
-                <groupId>org.opendaylight.cardinal</groupId>
-                <artifactId>odl-cardinal-ui</artifactId>
-                <version>${cardinal.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.cardinal</groupId>
-                <artifactId>odl-cardinal</artifactId>
-                <version>${cardinal.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-
             <!-- Dlux Apps -->
             <dependency>
                 <groupId>org.opendaylight.dluxapps</groupId>
@@ -440,15 +424,6 @@
                 <type>xml</type>
             </dependency>
 
-            <!-- TTP -->
-            <dependency>
-                <groupId>org.opendaylight.ttp</groupId>
-                <artifactId>odl-ttp-model-rest</artifactId>
-                <version>${ttp.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
             <!-- UNIMGR -->
             <dependency>
                 <groupId>org.opendaylight.unimgr</groupId>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index f44d27f6bbd6e657c70e343ba0a863a2955e08a7..5879a3376e9f382ae6cde5bf3435d6a8933f29ba 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -151,14 +151,6 @@
             <type>xml</type>
         </dependency>
 
-        <!-- Cardinal -->
-        <dependency>
-            <groupId>org.opendaylight.cardinal</groupId>
-            <artifactId>cardinal-features4</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
         <!-- Daexim -->
         <dependency>
             <groupId>org.opendaylight.daexim</groupId>
@@ -419,14 +411,6 @@
             <type>xml</type>
         </dependency>
 
-        <!-- TTP -->
-        <dependency>
-            <groupId>org.opendaylight.ttp</groupId>
-            <artifactId>features-ttp</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
         <!-- Unimgr -->
         <dependency>
             <groupId>org.opendaylight.unimgr</groupId>

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index 4b2e3dd7213d6feab7b65555d1372e89824016ee..a907c1eb0045001a43c26015da0b1104eeac2209 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -70,20 +70,6 @@
         </dependency>
         -->
 
-        <!-- Cardinal -->
-        <dependency>
-            <groupId>org.opendaylight.cardinal</groupId>
-            <artifactId>odl-cardinal-ui</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.cardinal</groupId>
-            <artifactId>odl-cardinal</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
         <!-- COE -->
         <dependency>
             <groupId>org.opendaylight.coe</groupId>

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 74870b2541fed7ba75be65a8956b661c509bb768..7efd75974feedd9910a97e5467cf2fc3dde64c66 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -448,14 +448,6 @@
             <type>xml</type>
         </dependency>
 
-        <!-- TTP -->
-        <dependency>
-            <groupId>org.opendaylight.ttp</groupId>
-            <artifactId>odl-ttp-model-rest</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
         <!-- Unimgr -->
         <dependency>
             <groupId>org.opendaylight.unimgr</groupId>