Remove reliance on org.opendaylight.controller.sal.core.api.Broker

[controller.git] / opendaylight / md-sal / sal-dom-config / pom.xml

diff --git a/opendaylight/md-sal/sal-dom-config/pom.xml b/opendaylight/md-sal/sal-dom-config/pom.xml
index b73358c0d2c350225a475c06e6ec652f957f0044..0bfc3205fe677bbb84516d059bf92f04b01f2a0e 100644 (file)
--- a/opendaylight/md-sal/sal-dom-config/pom.xml
+++ b/opendaylight/md-sal/sal-dom-config/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-dom-config</artifactId>
   <packaging>bundle</packaging>
@@ -14,6 +14,10 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-common-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-core-api</artifactId>
@@ -22,6 +26,10 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-core-spi</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-singleton-dom-impl</artifactId>
+    </dependency>
   </dependencies>
 
   <build>
@@ -30,6 +38,17 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Import-Package>
+              com.google.common.base,
+              org.opendaylight.mdsal.eos.common.api,
+              org.opendaylight.mdsal.eos.dom.api,
+              org.opendaylight.mdsal.singleton.common.api,
+              *
+            </Import-Package>
+          </instructions>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.opendaylight.yangtools</groupId>
@@ -44,6 +63,7 @@
                 <generator>
                   <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
                   <outputBaseDir>${salGeneratorPath}</outputBaseDir>
+                  <resourceBaseDir>${project.build.directory}/generated-sources/spi</resourceBaseDir>
                 </generator>
                 <generator>
                   <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>