From: Robert Varga <robert.varga@pantheon.tech>
Date: Sun, 19 Sep 2021 19:48:19 +0000 (+0200)
Subject: Remove neutron from distribution
X-Git-Tag: release/phosphorus~6
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=57906ff892689417793fe9ab0bc728cfb9366717

Remove neutron from distribution

lispflowmapping no longer depends on neutron, remove it from
distribution.

Change-Id: I632bfdfb735e1a8d53d1bad204518869c8bd555f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index b656b6cb..ac4d9023 100644
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -193,23 +193,6 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
-        <profile>
-            <id>neutron</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.neutron</groupId>
-                        <artifactId>neutron-artifacts</artifactId>
-                        <version>${neutron.version}</version>
-                        <type>pom</type>
-                        <scope>import</scope>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
         <profile>
             <id>odlparent</id>
             <activation>
diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index e1290070..5ceba7e0 100644
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -52,7 +52,6 @@
         <lispflowmapping.version>1.14.0-SNAPSHOT</lispflowmapping.version>
         <mdsal.version>8.0.4</mdsal.version>
         <netconf.version>2.0.3</netconf.version>
-        <neutron.version>0.17.0-SNAPSHOT</neutron.version>
         <odlparent.version>9.0.5</odlparent.version>
         <openflowplugin.version>0.13.0-SNAPSHOT</openflowplugin.version>
         <ovsdb.version>1.13.0-SNAPSHOT</ovsdb.version>
diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index f32b624b..f49d2282 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -271,21 +271,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- Neutron Northbound -->
-        <profile>
-            <id>neutron</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.neutron</groupId>
-                    <artifactId>features-neutron-service</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-            </dependencies>
-        </profile>
         <!-- ODL Parent -->
         <profile>
             <id>odlparent</id>
diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 91a52b3e..f7105f22 100644
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -171,21 +171,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- Neutron Northbound -->
-        <profile>
-            <id>neutron</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.neutron</groupId>
-                    <artifactId>odl-neutron-service</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
         <!-- OpenflowPlugin -->
         <profile>
             <id>openflowplugin</id>