Bug 1048 - Removed dependency on model-flow-service

Change-Id: Ie2065b47e02b7cd203227213b66050957f0760a9
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>

diff --git a/openflow-protocol-api/pom.xml b/openflow-protocol-api/pom.xml
index 9670e71e05feb3d63a88f92b67fe985efc85f169..bb85ec5627d62017798394bcdb6adae12ef85665 100644 (file)
--- a/openflow-protocol-api/pom.xml
+++ b/openflow-protocol-api/pom.xml
@@ -135,8 +135,8 @@
             <artifactId>ietf-yang-types</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-flow-service</artifactId>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>yang-ext</artifactId>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>

diff --git a/pom.xml b/pom.xml
index 7e78ede8c471e3672c6d6a438328d3ef26e64230..4c1a5e6bdb3af74bdfdf44871188bf6dfb35d14a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,7 @@
         <slf4j.version>1.7.2</slf4j.version>
         <yang.prototype.version>1.1-SNAPSHOT</yang.prototype.version>
         <ietf.model.version>2010.09.24.4-SNAPSHOT</ietf.model.version>
+        <yang.ext.version>2013.09.07.4-SNAPSHOT</yang.ext.version>
         <maven.bundle.version>2.4.0</maven.bundle.version>
         <guava.version>14.0.1</guava.version> 
         <netty.version>4.0.17.Final</netty.version>
@@ -138,16 +139,16 @@
                 <artifactId>ietf-yang-types</artifactId>
                 <version>${ietf.model.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools.model</groupId>
+                <artifactId>yang-ext</artifactId>
+                <version>${yang.ext.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.core</artifactId>
                 <version>5.0.0</version>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller.model</groupId>
-                <artifactId>model-flow-service</artifactId>
-                <version>1.1-SNAPSHOT</version>
-            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>