From: Ed Warnicke <eaw@cisco.com>
Date: Tue, 11 Feb 2014 01:31:00 +0000 (+0000)
Subject: Merge "Changed model versions to dependencies"
X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~486
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=c31af714994cbaed40299758460916b2c7101158;hp=-c

Merge "Changed model versions to dependencies"
---

c31af714994cbaed40299758460916b2c7101158
diff --combined opendaylight/commons/opendaylight/pom.xml
index 84fe758e22,6baacc696d..63392571d4
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@@ -4,6 -4,7 +4,6 @@@
    <prerequisites>
      <maven>3.0</maven>
    </prerequisites>
 -  <groupId>org.opendaylight.controller</groupId>
    <artifactId>commons.opendaylight</artifactId>
    <version>1.4.2-SNAPSHOT</version>
    <packaging>pom</packaging>
@@@ -56,11 -57,11 +56,11 @@@
      <testvm.argLine>-Xmx1024m -XX:MaxPermSize=256m</testvm.argLine>
      <guava.version>14.0.1</guava.version>
      <osgi.core.version>5.0.0</osgi.core.version>
-     <ietf-inet-types.version>2010.09.24.3</ietf-inet-types.version>
-     <ietf-yang-types.version>2010.09.24.3</ietf-yang-types.version>
-     <ietf-topology.version>2013.10.21.1</ietf-topology.version>
-     <opendaylight-l2-types.version>2013.08.27.3</opendaylight-l2-types.version>
-     <yang-ext.version>2013.09.07.3</yang-ext.version>
+     <ietf-inet-types.version>2010.09.24.4-SNAPSHOT</ietf-inet-types.version>
+     <ietf-yang-types.version>2010.09.24.4-SNAPSHOT</ietf-yang-types.version>
+     <ietf-topology.version>2013.10.21.2-SNAPSHOT</ietf-topology.version>
+     <opendaylight-l2-types.version>2013.08.27.4-SNAPSHOT</opendaylight-l2-types.version>
+     <yang-ext.version>2013.09.07.4-SNAPSHOT</yang-ext.version>
      <javassist.version>3.17.1-GA</javassist.version>
      <releaseplugin.version>2.3.2</releaseplugin.version>
      <commons.lang.version>3.1</commons.lang.version>
@@@ -758,12 -759,6 +758,12 @@@
         <artifactId>yang-model-api</artifactId>
         <version>${yangtools.version}</version>
        </dependency>
 +      <dependency>
 +        <groupId>org.opendaylight.yangtools</groupId>
 +        <artifactId>yang-model-util</artifactId>
 +        <version>${yangtools.version}</version>
 +      </dependency>
 +
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>hosttracker</artifactId>