X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=9b33ad39ee813a6748643386bd224573afdb2833;hb=b6772b7645e64588ec230cb73832750271fb02ea;hp=43ae379ac73e4c678d0b0cc3e273ad52ff8bbb7f;hpb=fca679be4aad4ad8903a6dc92ea541cc6866046f;p=openflowjava.git

diff --git a/pom.xml b/pom.xml
index 43ae379a..9b33ad39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
     <groupId>org.opendaylight.openflowjava</groupId>
     <artifactId>openflow-protocol-parent</artifactId>
-    <version>0.5-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
+    <name>openflowjava</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
+
     <modules>
+        <module>openflowjava-config</module>
         <module>openflow-protocol-api</module>
         <module>openflow-protocol-spi</module>
         <module>util</module>
@@ -13,8 +23,6 @@
         <module>openflow-protocol-it</module>
         <module>features</module>
         <module>simple-client</module>
-        <module>openflow-nx-resubmit-action</module>
-        <module>openflow-extension-nicira</module>
     </modules>
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/openflowjava.git</connection>
@@ -36,22 +44,23 @@
         <url.version>1.5.0</url.version>
         <enunciate.version>1.26.2</enunciate.version>
         <jmxGeneratorPath>${project.build.directory}/yang-gen-config</jmxGeneratorPath>
-        <karaf.distro.empty.version>1.4.2-SNAPSHOT</karaf.distro.empty.version>
+        <karaf.distro.empty.version>1.5.0-SNAPSHOT</karaf.distro.empty.version>
         <salGeneratorPath>${project.build.directory}/yang-gen-sal</salGeneratorPath>
         <sonar.branch>${user.name}-private-view</sonar.branch>
         <sonar.skippedModules>org.openflow.openflowj,net.sf.jung2</sonar.skippedModules>
         <logback.version>1.0.9</logback.version>
         <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>
+        <yang.prototype.version>1.2.0-SNAPSHOT</yang.prototype.version>
+        <ietf.model.version>2010.09.24.7-SNAPSHOT</ietf.model.version>
+        <yang.ext.version>2013.09.07.7-SNAPSHOT</yang.ext.version>
         <maven.bundle.version>2.4.0</maven.bundle.version>
-        <guava.version>14.0.1</guava.version> 
-        <netty.version>4.0.19.Final</netty.version>
+        <guava.version>14.0.1</guava.version>
+        <netty.version>4.0.23.Final</netty.version>
         <releaseplugin.version>2.3.2</releaseplugin.version>
-        <yangtools.version>0.6.2-SNAPSHOT</yangtools.version>
-        <yangtools.generator.version>0.6.2-SNAPSHOT</yangtools.generator.version>
-	<config.version>0.2.5-SNAPSHOT</config.version>
+        <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+        <yangtools.generator.version>0.7.0-SNAPSHOT</yangtools.generator.version>
+        <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
+	<config.version>0.3.0-SNAPSHOT</config.version>
 
         <!-- Sonar config -->
         <sonar-jacoco-listeners.version>2.4</sonar-jacoco-listeners.version>
@@ -208,12 +217,12 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>config-api</artifactId>
-                <version>0.2.5-SNAPSHOT</version>
+                <version>0.3.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.10</version>
+                <version>${junit.version}</version>
                 <scope>test</scope>
                 <optional>true</optional>
             </dependency>
@@ -246,7 +255,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler.version}</version>
                 <inherited>true</inherited>
                 <configuration>
                     <source>1.7</source>
@@ -261,7 +269,7 @@
                         <phase>deploy</phase>
                         <goals>
                             <goal>jar-no-fork</goal>
-                        </goals> 
+                        </goals>
                     </execution>
                 </executions>
             </plugin>
@@ -278,7 +286,7 @@
             </plugin>
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-checkstyle-plugin</artifactId>
+	      <artifactId>maven-checkstyle-plugin</artifactId>
               <version>2.12</version>
               <configuration>
                 <failOnViolation>false</failOnViolation>
@@ -436,7 +444,7 @@
                             </goals>
                           </pluginExecutionFilter>
                           <action>
-                            <ignore></ignore>
+                            <ignore/>
                           </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -449,7 +457,7 @@
                             </goals>
                           </pluginExecutionFilter>
                           <action>
-                            <ignore></ignore>
+                            <ignore/>
                           </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -464,7 +472,7 @@
                             </goals>
                           </pluginExecutionFilter>
                           <action>
-                            <ignore></ignore>
+                            <ignore/>
                           </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -492,7 +500,7 @@
                             </goals>
                           </pluginExecutionFilter>
                           <action>
-                            <ignore></ignore>
+                            <ignore/>
                           </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -505,7 +513,7 @@
                             </goals>
                           </pluginExecutionFilter>
                           <action>
-                            <execute></execute>
+                            <execute/>
                           </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -518,7 +526,7 @@
                             </goals>
                           </pluginExecutionFilter>
                           <action>
-                            <ignore></ignore>
+                            <ignore/>
                           </action>
                         </pluginExecution>
                         <pluginExecution>
@@ -531,7 +539,7 @@
                             </goals>
                           </pluginExecutionFilter>
                           <action>
-                            <ignore></ignore>
+                            <ignore/>
                           </action>
                         </pluginExecution>
                       </pluginExecutions>