Bug 9189: Add missing version feature dependencies

+ Add controller:mdsal-artifacts to artifact-artifacts.

Change-Id: I2f8ef31855af2786d3a872e7c34407ae186b6849
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index 69d74a246a0d77e85dfa364840e5f4009271df8d..fd9d5743c22a5944e0c5c3d4205479e5b49212fe 100644 (file)
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -62,6 +62,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${mdsal.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.daexim</groupId>
                 <artifactId>daexim-artifacts</artifactId>

diff --git a/features/singles/odl-distribution-version/pom.xml b/features/singles/odl-distribution-version/pom.xml
index 00f09301ec01b389118cb85f031b8894e0b4ac9a..80cdb6cb2b3c4fc8dc688091f131adabdcea00b7 100644 (file)
--- a/features/singles/odl-distribution-version/pom.xml
+++ b/features/singles/odl-distribution-version/pom.xml
@@ -65,6 +65,17 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-config-persister</artifactId>
+            <!-- This pulls in both config-api and yang-common -->
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <!-- Additional dependencies are needed because config-parent also requires sal-binding-config bundle. -->
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <!-- This is an overkill, but odl-mdsal-broker-local is the only feature which contains sal-binding-config
+                 bundle, and odl-mdsal-broker is its nearest ancestor tested to not fail SingleFeatureTest
+                 (others are blacklisted in feature-test so SFT is skipped and they would cause SFT failure here). -->
+            <artifactId>odl-mdsal-broker</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>