X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=parent%2Fpom.xml;h=20a352de4efbc02935fd0da0058bdb87d125cd9b;hb=44ccae2d0961847db7676cb50c88a546e0e43f52;hp=f46992457d1e49aef62b14ef3ae1db6b8de1546e;hpb=c2e3a0d22602b63a1664baa49f466a64396e0583;p=openflowjava.git

diff --git a/parent/pom.xml b/parent/pom.xml
index f4699245..20a352de 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.openflowjava</groupId>
     <artifactId>openflowjava-parent</artifactId>
-    <version>0.8.0-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>openflowjava</name> <!-- Used by Sonar to set project name -->
     <description>
@@ -49,15 +49,16 @@
     </developers>
 
     <properties>
-        <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jmxGeneratorPath>${project.build.directory}/yang-gen-config</jmxGeneratorPath>
-        <karaf.distro.empty.version>1.7.0-SNAPSHOT</karaf.distro.empty.version>
+        <karaf.distro.empty.version>1.9.0-SNAPSHOT</karaf.distro.empty.version>
         <salGeneratorPath>${project.build.directory}/yang-gen-sal</salGeneratorPath>
 
-        <config.version>0.5.0-SNAPSHOT</config.version>
-        <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
-        <yangtools.version>0.9.0-SNAPSHOT</yangtools.version>
+        <config.version>0.7.0-SNAPSHOT</config.version>
+        <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
+        <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
+        <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
+        <argparse4j.version>0.7.0</argparse4j.version>
     </properties>
 
     <dependencyManagement>
@@ -86,10 +87,15 @@
             <dependency>
               <groupId>org.opendaylight.controller</groupId>
               <artifactId>mdsal-artifacts</artifactId>
-              <version>${mdsal.version}</version>
+              <version>${controller.mdsal.version}</version>
               <scope>import</scope>
               <type>pom</type>
             </dependency>
+            <dependency>
+                <groupId>net.sourceforge.argparse4j</groupId>
+                <artifactId>argparse4j</artifactId>
+                <version>${argparse4j.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -98,11 +104,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <inherited>true</inherited>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-source-plugin</artifactId>
@@ -250,19 +251,6 @@
                             <ignore/>
                           </action>
                         </pluginExecution>
-                        <pluginExecution>
-                          <pluginExecutionFilter>
-                            <groupId>org.opendaylight.yangtools</groupId>
-                            <artifactId>yang-maven-plugin</artifactId>
-                            <versionRange>[0.5,)</versionRange>
-                            <goals>
-                              <goal>generate-sources</goal>
-                            </goals>
-                          </pluginExecutionFilter>
-                          <action>
-                            <execute/>
-                          </action>
-                        </pluginExecution>
                         <pluginExecution>
                           <pluginExecutionFilter>
                             <groupId>org.codehaus.groovy.maven</groupId>