Merge "Cosmetics: check in pom.xml files as _sort_pom_ wants them to be"
authorEd Warnicke <eaw@cisco.com>
Tue, 20 May 2014 21:55:37 +0000 (21:55 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 20 May 2014 21:55:37 +0000 (21:55 +0000)
1  2 
opendaylight/commons/opendaylight/pom.xml

@@@ -18,8 -18,8 +18,8 @@@
      <aopalliance.version>1.0.0</aopalliance.version>
      <appauth.version>0.4.2-SNAPSHOT</appauth.version>
      <!-- Controller Modules Versions -->
-     <arphandler.version>0.5.2-SNAPSHOT</arphandler.version>
      <aries.util.version>1.1.0</aries.util.version>
+     <arphandler.version>0.5.2-SNAPSHOT</arphandler.version>
      <asm.version>4.1</asm.version>
      <!-- Plugin Versions -->
      <bouncycastle.version>1.50</bouncycastle.version>
          <artifactId>netconf-netty-util</artifactId>
          <version>${netconf.version}</version>
        </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>netconf-netty-util</artifactId>
-         <version>${netconf.version}</version>
-         <type>test-jar</type>
-       </dependency>
        <dependency>
          <groupId>ch.qos.logback</groupId>
          <artifactId>logback-classic</artifactId>
          <artifactId>netconf-monitoring</artifactId>
          <version>${netconf.version}</version>
        </dependency>
+       <dependency>
+         <groupId>org.opendaylight.controller</groupId>
+         <artifactId>netconf-netty-util</artifactId>
+         <version>${netconf.version}</version>
+         <type>test-jar</type>
+       </dependency>
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>netconf-ssh</artifactId>
          <artifactId>concepts</artifactId>
          <version>${yangtools.version}</version>
        </dependency>
 +      <dependency>
 +        <groupId>org.opendaylight.yangtools</groupId>
 +        <artifactId>object-cache-api</artifactId>
 +        <version>${yangtools.version}</version>
 +      </dependency>
 +      <dependency>
 +        <groupId>org.opendaylight.yangtools</groupId>
 +        <artifactId>object-cache-guava</artifactId>
 +        <version>${yangtools.version}</version>
 +      </dependency>
        <dependency>
          <groupId>org.opendaylight.yangtools</groupId>
          <artifactId>restconf-client-api</artifactId>