Merge "Optimized version of NormalizedNode Serialization"

diff --combined opendaylight/md-sal/sal-clustering-commons/pom.xml
index 504bb743ef0df283898b31ffc4ed68745521d61a,c533cb1e0bf2d666497c64811294d401a5613484..2bf1a5597362c9eeee9a312ea179dda1a093815f
--- 1/opendaylight/md-sal/sal-clustering-commons/pom.xml
--- 2/opendaylight/md-sal/sal-clustering-commons/pom.xml
+++ b/opendaylight/md-sal/sal-clustering-commons/pom.xml
@@@ -12,46 -12,7 +12,46 @@@
  
    <packaging>bundle</packaging>
  
 -  <dependencies>
 +    <dependencies>
 +
 +    <dependency>
 +        <groupId>com.typesafe.akka</groupId>
 +        <artifactId>akka-actor_${scala.version}</artifactId>
 +    </dependency>
 +
 +    <dependency>
 +        <groupId>com.typesafe.akka</groupId>
 +        <artifactId>akka-cluster_${scala.version}</artifactId>
 +    </dependency>
 +
 +    <dependency>
 +        <groupId>com.typesafe.akka</groupId>
 +        <artifactId>akka-persistence-experimental_${scala.version}</artifactId>
 +    </dependency>
 +
 +    <dependency>
 +        <groupId>com.typesafe.akka</groupId>
 +        <artifactId>akka-remote_${scala.version}</artifactId>
 +    </dependency>
 +
 +    <dependency>
 +        <groupId>com.typesafe.akka</groupId>
 +        <artifactId>akka-testkit_${scala.version}</artifactId>
 +    </dependency>
 +
 +
 +    <dependency>
 +        <groupId>org.scala-lang</groupId>
 +        <artifactId>scala-library</artifactId>
 +    </dependency>
 +
 +
 +    <dependency>
 +        <groupId>com.typesafe.akka</groupId>
 +        <artifactId>akka-slf4j_${scala.version}</artifactId>
 +    </dependency>
 +
 +
      <dependency>
        <groupId>com.google.code.findbugs</groupId>
        <artifactId>jsr305</artifactId>
@@@ -123,6 -84,11 +123,11 @@@
        <artifactId>junit</artifactId>
        <scope>test</scope>
      </dependency>
+     <dependency>
+       <groupId>org.mockito</groupId>
+       <artifactId>mockito-all</artifactId>
+       <scope>test</scope>
+     </dependency>
      <dependency>
        <groupId>org.slf4j</groupId>
        <artifactId>slf4j-simple</artifactId>
@@@ -158,6 -124,11 +163,6 @@@
            <artifactId>yang-binding</artifactId>
        </dependency>
  
 -      <dependency>
 -          <groupId>org.opendaylight.controller</groupId>
 -          <artifactId>sal-akka-raft</artifactId>
 -          <version>1.1-SNAPSHOT</version>
 -      </dependency>
  
        <dependency>
            <groupId>com.google.guava</groupId>
@@@ -201,5 -172,37 +206,37 @@@
            <version>3.0.1</version>
        </dependency>
    </dependencies>
+   <build>
+       <plugins>
+           <plugin>
+               <groupId>org.jacoco</groupId>
+               <artifactId>jacoco-maven-plugin</artifactId>
+               <configuration>
+                   <includes>
+                       <include>org.opendaylight.controller.*</include>
+                   </includes>
+                   <excludes>
+                       <exclude>org.opendaylight.controller.protobuff.*</exclude>
+                   </excludes>
+                   <check>false</check>
+               </configuration>
+               <executions>
+                   <execution>
+                       <id>pre-test</id>
+                       <goals>
+                           <goal>prepare-agent</goal>
+                       </goals>
+                   </execution>
+                   <execution>
+                       <id>post-test</id>
+                       <goals>
+                           <goal>report</goal>
+                       </goals>
+                       <phase>test</phase>
+                   </execution>
+               </executions>
+           </plugin>
+       </plugins>
+   </build>
  
  </project>