Merge "Test updated according to yangtools string validation change" into stable...

[openflowjava.git] / openflow-protocol-impl / pom.xml

diff --git a/openflow-protocol-impl/pom.xml b/openflow-protocol-impl/pom.xml
index a33a649a327864eaf2a746a1a82fdb90a9e13938..45ede89dbef8e5267dc2aa7d34e8148675d39499 100644 (file)
--- a/openflow-protocol-impl/pom.xml
+++ b/openflow-protocol-impl/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.openflowjava</groupId>
         <artifactId>openflow-protocol-parent</artifactId>
-        <version>0.5-SNAPSHOT</version>
+        <version>0.5.2-SNAPSHOT</version>
     </parent>
     <artifactId>openflow-protocol-impl</artifactId>
     <packaging>bundle</packaging>
@@ -14,9 +14,9 @@
   </scm>
 
     <properties>
-        <yangtools.version>0.6.2-SNAPSHOT</yangtools.version>
-        <yangtools.generator.version>0.6.2-SNAPSHOT</yangtools.generator.version>
-        <yangtools.binding.version>0.6.2-SNAPSHOT</yangtools.binding.version>
+        <yangtools.version>0.6.4-SNAPSHOT</yangtools.version>
+        <yangtools.generator.version>0.6.4-SNAPSHOT</yangtools.generator.version>
+        <yangtools.binding.version>0.6.4-SNAPSHOT</yangtools.binding.version>
     </properties>
     
     <build>
@@ -48,7 +48,7 @@
                                     <codeGeneratorClass>
                                         org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
                                     </codeGeneratorClass>
-                                    <outputBaseDir>${project.build.directory}/generated-sources/config</outputBaseDir>
+                                    <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
                                     <additionalConfiguration>
                                         <namespaceToPackage1>
                                             urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang
@@ -59,7 +59,7 @@
                                     <codeGeneratorClass>
                                         org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
                                     </codeGeneratorClass>
-                                    <outputBaseDir>${project.build.directory}/generated-sources/sal</outputBaseDir>
+                                    <outputBaseDir>${salGeneratorPath}</outputBaseDir>
                                 </generator>
                                 <generator>
                                     <codeGeneratorClass>org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
@@ -98,6 +98,11 @@
             <artifactId>openflow-protocol-spi</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowjava</groupId>
+            <artifactId>util</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>