From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 4 Sep 2020 08:45:49 +0000 (+0200)
Subject: Do not package mdsal.git's features-mdsal
X-Git-Tag: release/magnesium-sr3~6
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F06%2F92406%2F1;p=integration%2Fdistribution.git

Do not package mdsal.git's features-mdsal

Unfortunately feature repositories is a flat namespace, which means
we end up conflicting with controller's features-mdsal. Partially
revert previous patch, so that we no longer conflict.

JIRA: INTTEST-123
Change-Id: Iad05b5996ab5da4ab3822f6a2e49329b157ae577
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 65e6b56c..f30d6640 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -233,12 +233,15 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
+                <!-- Note: this is disabled due to naming conflict with
+                           controller's 'features-mdsal', above.
                 <dependency>
                     <groupId>org.opendaylight.mdsal</groupId>
                     <artifactId>features-mdsal</artifactId>
                     <classifier>features</classifier>
                     <type>xml</type>
                 </dependency>
+                 -->
                 <dependency>
                     <groupId>org.opendaylight.mdsal</groupId>
                     <artifactId>features-mdsal-experimental</artifactId>