X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=features%2Fmdsal%2Fodl-mdsal-broker-local%2Fpom.xml;h=b947c7e0d8b7b94d5035e1cc6bd14fea3784210f;hb=refs%2Fchanges%2F07%2F54607%2F1;hp=f3ada9aaecd01c6a6a94d15c6064405d746192bc;hpb=d7f30e5e7d77b7310add0d856621aacbfb4ac74f;p=controller.git

diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml
index f3ada9aaec..b947c7e0d8 100644
--- a/features/mdsal/odl-mdsal-broker-local/pom.xml
+++ b/features/mdsal/odl-mdsal-broker-local/pom.xml
@@ -79,6 +79,13 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <!-- This needs to come first, otherwise mdsal's odl-mdsal-common is picked instead -->
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-common</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>odl-yangtools-common</artifactId>
@@ -97,12 +104,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-common</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-config-startup</artifactId>
@@ -209,21 +210,7 @@
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>config</classifier>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>karaf-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <includeTransitiveDependency>false</includeTransitiveDependency>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
+</project>
\ No newline at end of file