From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Thu, 16 Mar 2017 18:13:44 +0000 (-0400)
Subject: Remove natapp from Carbon
X-Git-Tag: release/carbon~33
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F20%2F53420%2F1;p=integration%2Fdistribution.git

Remove natapp from Carbon

Per TSC meeting on 2017-03-16 natapp is not participating in the Carbon
SimRel so we need to remove them from the distribution.

https://meetings.opendaylight.org/opendaylight-meeting
/2017/tsc/opendaylight-meeting-tsc.2017-03-16-17.00.html

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

diff --git a/artifacts/upstream/feature3-repos/pom.xml b/artifacts/upstream/feature3-repos/pom.xml
index c6eb8fae..227c9a81 100644
--- a/artifacts/upstream/feature3-repos/pom.xml
+++ b/artifacts/upstream/feature3-repos/pom.xml
@@ -293,14 +293,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <!-- Natapp -->
-            <dependency>
-                <groupId>org.opendaylight.natapp</groupId>
-                <artifactId>natapp-features</artifactId>
-                <version>${natapp.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
             <!-- Nemo -->
             <dependency>
                 <groupId>org.opendaylight.nemo</groupId>
diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 3f240911..ebfd2d66 100644
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -76,7 +76,6 @@
         <lacp.version>1.3.0-SNAPSHOT</lacp.version>
         <lispflowmapping.version>1.5.0-SNAPSHOT</lispflowmapping.version>
         <mdsal.version>1.5.0-SNAPSHOT</mdsal.version>
-        <natapp.version>0.2.0-SNAPSHOT</natapp.version>
         <nemo.version>1.2.0-SNAPSHOT</nemo.version>
         <netconf.version>1.2.0-SNAPSHOT</netconf.version>
         <netide.version>0.3.0-SNAPSHOT</netide.version>
diff --git a/features3-index/pom.xml b/features3-index/pom.xml
index 628c187a..9b1238df 100644
--- a/features3-index/pom.xml
+++ b/features3-index/pom.xml
@@ -258,12 +258,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.natapp</groupId>
-            <artifactId>natapp-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.nemo</groupId>
             <artifactId>nemo-features</artifactId>
diff --git a/features3-index/src/main/features/features.xml b/features3-index/src/main/features/features.xml
index 92f125d0..bc8e2a47 100644
--- a/features3-index/src/main/features/features.xml
+++ b/features3-index/src/main/features/features.xml
@@ -67,7 +67,6 @@
     <repository>mvn:org.opendaylight.l2switch/features-l2switch/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.lacp/features-lacp/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.lispflowmapping/features-lispflowmapping/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.natapp/natapp-features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.nemo/nemo-features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.netconf/features-netconf/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.netconf/features-netconf-connector/{{VERSION}}/xml/features</repository>
diff --git a/features3-test/src/main/features/features.xml b/features3-test/src/main/features/features.xml
index 0deb2bee..1af62a9e 100644
--- a/features3-test/src/main/features/features.xml
+++ b/features3-test/src/main/features/features.xml
@@ -154,8 +154,6 @@
         <feature>odl-l2switch-switch-rest</feature>
         <feature>odl-l2switch-switch-ui</feature>
         <feature>odl-lacp-ui</feature>
-        <feature>odl-natapp</feature>
-        <feature>odl-natapp-api</feature>
         <!-- The following two Netconf features are incompatible with each other.
         As CSIT jobs may use either of them, none of them can be in odl-integration-compatible-with-all. -->
         <feature>odl-netconf-clustered-topology</feature>