X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=parent%2Fpom.xml;h=71b9061e88ae5667695adf398c330f07c16040e7;hb=a308cb895d8c6dd795ae7acd72d604706b13ecf5;hp=55d68f818b8a1bf8d15f87c72aa93cae3cb4d4d0;hpb=1f2f4d39bcd7b0fc141a593d0e03cc62cc0abfc8;p=openflowplugin.git

diff --git a/parent/pom.xml b/parent/pom.xml
index 55d68f818b..71b9061e88 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -12,14 +12,14 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>openflowplugin-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <scm>
@@ -31,18 +31,14 @@
 
     <properties>
         <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-        <openflowjava.version>0.8.0-SNAPSHOT</openflowjava.version>
-        <openflowplugin.version>0.3.0-SNAPSHOT</openflowplugin.version>
-        <sal.api.version>0.11.0-SNAPSHOT</sal.api.version>
-        <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
-        <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
+        <sal.api.version>0.14.0-SNAPSHOT</sal.api.version>
+        <salGeneratorPath>${project.build.directory}/generated-sources/sal</salGeneratorPath>
+        <controller.distribution.version>0.7.0-SNAPSHOT</controller.distribution.version>
+        <mdsal.version>1.7.0-SNAPSHOT</mdsal.version>
+        <mdsal.model.version>0.12.0-SNAPSHOT</mdsal.model.version>
+        <yangtools.version>1.2.0</yangtools.version>
+        <argparse4j.version>0.7.0</argparse4j.version>
         <exi.nagasena.version>0000.0002.0053.0</exi.nagasena.version>
-        <controller.distribution.version>0.4.0-SNAPSHOT</controller.distribution.version>
-
-        <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>
     </properties>
 
     <dependencyManagement>
@@ -50,11 +46,10 @@
             <dependency>
                 <groupId>org.opendaylight.openflowplugin</groupId>
                 <artifactId>openflowplugin-artifacts</artifactId>
-                <version>${openflowplugin.version}</version>
+                <version>${project.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
@@ -65,7 +60,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>2.1.0-SNAPSHOT</version>
+                <version>2.4.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -76,13 +71,6 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>config-artifacts</artifactId>
-                <version>${config.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
@@ -90,20 +78,11 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.openflowjava</groupId>
-                <artifactId>openflowjava-artifacts</artifactId>
-                <version>${openflowjava.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>liblldp</artifactId>
                 <version>${sal.api.version}</version>
             </dependency>
-
             <!-- thirdparty -->
             <dependency>
                 <groupId>openexi</groupId>
@@ -115,6 +94,11 @@
                 <artifactId>nagasena-rta</artifactId>
                 <version>${exi.nagasena.version}</version>
             </dependency>
+            <dependency>
+                <groupId>net.sourceforge.argparse4j</groupId>
+                <artifactId>argparse4j</artifactId>
+                <version>${argparse4j.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -125,19 +109,12 @@
                 <artifactId>build-helper-maven-plugin</artifactId>
             </plugin>
         </plugins>
-
         <pluginManagement>
             <plugins>
                 <plugin>
                     <artifactId>maven-clean-plugin</artifactId>
                     <configuration>
                         <filesets>
-                            <fileset>
-                                <directory>${jmxGeneratorPath}</directory>
-                                <includes>
-                                    <include>**</include>
-                                </includes>
-                            </fileset>
                             <fileset>
                                 <directory>${salGeneratorPath}</directory>
                                 <includes>
@@ -159,7 +136,6 @@
                             </goals>
                             <configuration>
                                 <sources>
-                                    <source>${jmxGeneratorPath}</source>
                                     <source>${salGeneratorPath}</source>
                                 </sources>
                             </configuration>
@@ -234,32 +210,6 @@
                                         </execute>
                                     </action>
                                 </pluginExecution>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.apache.maven.plugins</groupId>
-                                        <artifactId>maven-checkstyle-plugin</artifactId>
-                                        <versionRange>[2.0,)</versionRange>
-                                        <goals>
-                                            <goal>check</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <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>