From: Tony Tkacik <ttkacik@cisco.com>
Date: Fri, 20 Jun 2014 12:55:23 +0000 (+0000)
Subject: Merge "Fix checkstyle errors in sal-compatibility"
X-Git-Tag: release/helium~634
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=ceec41033ab311600969e595191a952ab4e6047d;hp=-c

Merge "Fix checkstyle errors in sal-compatibility"
---

ceec41033ab311600969e595191a952ab4e6047d
diff --combined opendaylight/commons/opendaylight/pom.xml
index 61febcfdc5,1c21351d57..990276468b
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@@ -20,9 -20,9 +20,9 @@@
      <appauth.version>0.4.2-SNAPSHOT</appauth.version>
      <archetype-app-northbound>0.0.1-SNAPSHOT</archetype-app-northbound>
      <aries.util.version>1.1.0</aries.util.version>
-     <arphandler.version>0.5.2-SNAPSHOT</arphandler.version>
      <!-- Controller Modules Versions -->
      <arphandler.version>0.5.2-SNAPSHOT</arphandler.version>
+     <arphandler.version>0.5.2-SNAPSHOT</arphandler.version>
      <asm.version>4.1</asm.version>
      <!-- Plugin Versions -->
      <bouncycastle.version>1.50</bouncycastle.version>
@@@ -340,11 -340,6 +340,11 @@@
          <artifactId>akka-remote_${scala.version}</artifactId>
          <version>${akka.version}</version>
        </dependency>
 +      <dependency>
 +        <groupId>com.typesafe.akka</groupId>
 +        <artifactId>akka-testkit_${scala.version}</artifactId>
 +        <version>${akka.version}</version>
 +      </dependency>
        <dependency>
          <groupId>commons-codec</groupId>
          <artifactId>commons-codec</artifactId>