X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-broker%2Fpom.xml;h=1f834a1ec12bcc601f09df6c32ded4587f0f9ada;hp=e0714eb151b65d36eac64007cb1e2a5377deedee;hb=3ca70e9627d39e21be5957b65b8253448e0c35cc;hpb=ce545d9c00a5d1be4189a09c8205cda702ecb27b

diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml
index e0714eb151..1f834a1ec1 100644
--- a/opendaylight/md-sal/sal-binding-broker/pom.xml
+++ b/opendaylight/md-sal/sal-binding-broker/pom.xml
@@ -3,21 +3,17 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.controller</groupId>
-    <artifactId>sal-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <artifactId>mdsal-parent</artifactId>
+    <version>1.11.0-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
   </parent>
+
+  <groupId>org.opendaylight.controller</groupId>
   <artifactId>sal-binding-broker-impl</artifactId>
+  <version>1.11.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.javassist</groupId>
-      <artifactId>javassist</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
@@ -44,12 +40,16 @@
       <artifactId>sal-core-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>binding-generator-impl</artifactId>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-generator-impl</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>binding-data-codec</artifactId>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-dom-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-dom-adapter</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
@@ -59,9 +59,21 @@
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-model-util</artifactId>
     </dependency>
+
+    <dependency>
+      <!-- Required because BindingToNormalizedNodeCodec extends an annotated class and annotation
+           processors have a hard time with that. -->
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
+
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
-      <artifactId>ietf-inet-types</artifactId>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-inmemory-datastore</artifactId>
+      <!-- FIXME: this should be scope=test
+      <scope>test</scope-->
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -72,28 +84,17 @@
       <artifactId>org.osgi.core</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>yang-parser-impl</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <!-- FIXME : Delete this
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
-      <artifactId>ietf-topology-l3-unicast-igp</artifactId>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
       <scope>test</scope>
     </dependency>
-    -->
+
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-test-model</artifactId>
@@ -117,11 +118,11 @@
           <instructions>
             <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
             <Export-Package>
-                            org.opendaylight.controller.sal.binding.impl,
-                            org.opendaylight.controller.md.sal.binding.impl,
-                            org.opendaylight.controller.md.sal.binding.compat,
-                            org.opendaylight.controller.md.sal.binding.spi,
-                            org.opendaylight.controller.sal.binding.codegen.impl,
+              org.opendaylight.controller.sal.binding.impl,
+              org.opendaylight.controller.md.sal.binding.impl,
+              org.opendaylight.controller.md.sal.binding.compat,
+              org.opendaylight.controller.md.sal.binding.spi,
+              org.opendaylight.controller.sal.binding.codegen.impl,
             </Export-Package>
           </instructions>
         </configuration>
@@ -139,35 +140,26 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>org.opendaylight.controller.*</include>
-          </includes>
-        </configuration>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
         <executions>
           <execution>
-            <id>pre-test</id>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>post-test</id>
+            <id>attach-sources</id>
+            <phase>verify</phase>
             <goals>
-              <goal>report</goal>
+              <goal>test-jar</goal>
             </goals>
-            <phase>test</phase>
           </execution>
         </executions>
       </plugin>
     </plugins>
   </build>
+
   <scm>
     <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <tag>HEAD</tag>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
   </scm>
+
 </project>