X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=parent%2Fpom.xml;h=498b201504e048ca048b41ea8d2d6b3f9efddfd5;hb=fc0db2dc1c63dfcd47eb2fde70ba6f21ab9c5f6a;hp=103a32fbba04955880bee5bc2e5f275dc812134d;hpb=3e1330bea0561a66984710a4e941c297b4c3d1e8;p=openflowjava.git

diff --git a/parent/pom.xml b/parent/pom.xml
index 103a32fb..498b2015 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4,15 +4,17 @@
     <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 -->
+    <!-- <name> formatting is used by autorelease to parse and notify projects on
+         build failure. Please do not modify this unless you have a good reason. -->
+    <name>ODL :: openflowjava :: ${project.artifactId}</name>
     <description>
         Openflow protocol library - serializes and deserializes openflow messages + handles connections with openflow devices.
     </description>
@@ -49,16 +51,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>
-        <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
-        <yangtools.version>1.0.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>
@@ -87,10 +89,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>
 
@@ -99,11 +106,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>
@@ -130,7 +132,7 @@
             </plugin>
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
-	          <artifactId>maven-checkstyle-plugin</artifactId>
+              <artifactId>maven-checkstyle-plugin</artifactId>
               <version>${checkstyle.version}</version>
               <configuration>
                 <failOnViolation>false</failOnViolation>
@@ -159,6 +161,21 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                  <execution>
+                    <id>add-yang-sources</id>
+                    <phase>generate-sources</phase>
+                    <goals>
+                      <goal>add-source</goal>
+                    </goals>
+                    <configuration>
+                      <sources>
+                        <source>${jmxGeneratorPath}</source>
+                        <source>${salGeneratorPath}</source>
+                      </sources>
+                    </configuration>
+                  </execution>
+                </executions>
             </plugin>
         </plugins>
         <pluginManagement>
@@ -251,19 +268,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>