X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=commons%2Fparent%2Fpom.xml;h=c9c7ee12e3dc1754d518b8c4b3309b2541b1dc27;hb=d4c19968c45527bde3702f4231f477627fb4d760;hp=73d8bc241a76cc791b623d4eb65ff75fb321caa3;hpb=126715993e13410afca45b0a51d3e7f77c816eb6;p=netvirt.git

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
old mode 100755
new mode 100644
index 73d8bc241a..c9c7ee12e3
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -14,39 +14,61 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
+    <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.ovsdb</groupId>
   <artifactId>commons</artifactId>
   <name>${project.artifactId}.parent</name>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
+  <description>The OVSDB Plugin integration project is a project for OpenDaylight that will implement the Open vSwitch Database RFC 7047 management protocol allowing the Southbound configuration of vSwitches and a network virtualization implementation.</description>
+  <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
+  <licenses>
+    <license>
+      <name>Eclipse Public License v1.0</name>
+      <url>http://www.eclipse.org/legal/epl-v10.html</url>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>Sam Hague</name>
+      <email>shague@gmail.com</email>
+      <url>https://github.com/shague</url>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
+  </scm>
 
   <prerequisites>
     <maven>3.1.1</maven>
   </prerequisites>
 
   <properties>
-    <checkstyle.rules.version>0.1.0-SNAPSHOT</checkstyle.rules.version>
     <lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
     <!-- Surefire/Failsafe Arguments -->
     <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
     <!-- OVSDB Component Versions -->
-    <openstack.netvirt.version>1.1.0-SNAPSHOT</openstack.netvirt.version>
-    <openstack.netvirt.providers.version>1.1.0-SNAPSHOT</openstack.netvirt.providers.version>
-    <ovsdb.features.version>1.1.0-SNAPSHOT</ovsdb.features.version>
-    <ovsdb.library.version>1.1.0-SNAPSHOT</ovsdb.library.version>
-    <ovsdb.northbound.version>0.7.0-SNAPSHOT</ovsdb.northbound.version>
-    <ovsdb.plugin.version>1.1.0-SNAPSHOT</ovsdb.plugin.version>
-    <ovsdb.plugin.compatibility.layer.version>1.1.0-SNAPSHOT</ovsdb.plugin.compatibility.layer.version>
-    <ovsdb.ovssfc.version>0.1.0-SNAPSHOT</ovsdb.ovssfc.version>
-    <ovsdb.utils.config.version>1.1.0-SNAPSHOT</ovsdb.utils.config.version>
-    <ovsdb.utils.servicehelper.version>1.1.0-SNAPSHOT</ovsdb.utils.servicehelper.version>
-    <plugin.shell.version>1.1.0-SNAPSHOT</plugin.shell.version>
-    <schema.hardwarevtep.version>1.1.0-SNAPSHOT</schema.hardwarevtep.version>
-    <schema.openvswitch.version>1.1.0-SNAPSHOT</schema.openvswitch.version>
-    <utils.mdsal.openflow.version>1.1.0-SNAPSHOT</utils.mdsal.openflow.version>
+    <openstack.netvirt.version>1.2.0-SNAPSHOT</openstack.netvirt.version>
+    <openstack.netvirt.providers.version>1.2.0-SNAPSHOT</openstack.netvirt.providers.version>
+    <ovsdb.features.version>1.2.0-SNAPSHOT</ovsdb.features.version>
+    <ovsdb.library.version>1.2.0-SNAPSHOT</ovsdb.library.version>
+    <ovsdb.northbound.version>0.8.0-SNAPSHOT</ovsdb.northbound.version>
+    <ovsdb.plugin.version>1.2.0-SNAPSHOT</ovsdb.plugin.version>
+    <ovsdb.plugin.compatibility.layer.version>1.2.0-SNAPSHOT</ovsdb.plugin.compatibility.layer.version>
+    <ovsdb.ovssfc.version>0.2.0-SNAPSHOT</ovsdb.ovssfc.version>
+    <ovsdb.utils.config.version>1.2.0-SNAPSHOT</ovsdb.utils.config.version>
+    <ovsdb.utils.mdsal.node.version>1.2.0-SNAPSHOT</ovsdb.utils.mdsal.node.version>
+    <ovsdb.utils.mdsal.openflow.version>1.2.0-SNAPSHOT</ovsdb.utils.mdsal.openflow.version>
+    <ovsdb.utils.servicehelper.version>1.2.0-SNAPSHOT</ovsdb.utils.servicehelper.version>
+    <plugin.shell.version>1.2.0-SNAPSHOT</plugin.shell.version>
+    <schema.hardwarevtep.version>1.2.0-SNAPSHOT</schema.hardwarevtep.version>
+    <schema.openvswitch.version>1.2.0-SNAPSHOT</schema.openvswitch.version>
     <!-- Skip Coverage and IT by default -->
     <skip.coverage>true</skip.coverage>
     <skip.distribution>false</skip.distribution>
@@ -58,32 +80,31 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <sonar.jacoco.itReportPath>${root.directory}/target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
     <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
     <!-- ODL Dependency Versions -->
-    <clustering.services.version>0.6.0-SNAPSHOT</clustering.services.version>
-    <containermanager.version>0.6.0-SNAPSHOT</containermanager.version>
-    <controller.config.version>0.3.0-SNAPSHOT</controller.config.version>
-    <forwardingrulesmanager.version>0.7.0-SNAPSHOT</forwardingrulesmanager.version>
-    <ietf.model.version>2010.09.24.7-SNAPSHOT</ietf.model.version>
-    <ietf.yang.types.version>2013.07.15.7-SNAPSHOT</ietf.yang.types.version>
-    <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-    <networkconfig.neutron.version>0.5.0-SNAPSHOT</networkconfig.neutron.version>
-    <northbound.commons.version>0.5.0-SNAPSHOT</northbound.commons.version>
-    <nsf.version>0.5.0-SNAPSHOT</nsf.version>
-    <odl.karaf.base.version>1.5.0-SNAPSHOT</odl.karaf.base.version>
-    <odlparent.version>1.5.0-SNAPSHOT</odlparent.version>
-    <opendaylight-l2-types.version>2013.08.27.7-SNAPSHOT</opendaylight-l2-types.version>
-    <openflowjava-nicira.version>0.1.0-SNAPSHOT</openflowjava-nicira.version>
-    <openflowjava-extension.version>0.1.0-SNAPSHOT</openflowjava-extension.version>
-    <openflowjava.version>0.6.0-SNAPSHOT</openflowjava.version>
-    <openflowplugin.version>0.1.0-SNAPSHOT</openflowplugin.version>
-    <sal.version>0.9.0-SNAPSHOT</sal.version>
-    <switchmanager.api.version>0.8.0-SNAPSHOT</switchmanager.api.version>
-    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-    <yang-ext.version>2013.09.07.7-SNAPSHOT</yang-ext.version>
+    <clustering.services.version>0.7.0-SNAPSHOT</clustering.services.version>
+    <containermanager.version>0.7.0-SNAPSHOT</containermanager.version>
+    <controller.config.version>0.4.0-SNAPSHOT</controller.config.version>
+    <forwardingrulesmanager.version>0.8.0-SNAPSHOT</forwardingrulesmanager.version>
+    <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+    <networkconfig.neutron.version>0.6.0-SNAPSHOT</networkconfig.neutron.version>
+    <northbound.commons.version>0.6.0-SNAPSHOT</northbound.commons.version>
+    <nsf.version>0.6.0-SNAPSHOT</nsf.version>
+    <odl.karaf.base.version>1.6.0-SNAPSHOT</odl.karaf.base.version>
+    <odlparent.version>1.6.0-SNAPSHOT</odlparent.version>
+    <openflowjava-nicira.version>0.2.0-SNAPSHOT</openflowjava-nicira.version>
+    <openflowjava-extension.version>0.2.0-SNAPSHOT</openflowjava-extension.version>
+    <openflowjava.version>0.7.0-SNAPSHOT</openflowjava.version>
+    <openflowplugin.version>0.2.0-SNAPSHOT</openflowplugin.version>
+    <sal.version>0.10.0-SNAPSHOT</sal.version>
+    <switchmanager.api.version>0.9.0-SNAPSHOT</switchmanager.api.version>
+    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
     <!-- 3rd Pary Dependency Versions -->
     <commons.collection.version>1.0</commons.collection.version>
     <httpcomponents.version>4.2.1</httpcomponents.version>
     <portlet.version>2.0</portlet.version>
     <powermock.version>1.5.2</powermock.version>
+    <ovsdb.ui.version>0.1.0-SNAPSHOT</ovsdb.ui.version>
+    <dlux.loader.version>0.3.0-SNAPSHOT</dlux.loader.version>
+    <dlux.core.version>0.3.0-SNAPSHOT</dlux.core.version>
   </properties>
 
   <dependencyManagement>
@@ -141,7 +162,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>opendaylight-karaf-empty</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
         <type>zip</type>
       </dependency>
       <dependency>
@@ -149,26 +170,36 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>sal</artifactId>
         <version>${sal.version}</version>
       </dependency>
+
       <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal-binding-api</artifactId>
-        <version>${mdsal.version}</version>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>${yangtools.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal-binding-config</artifactId>
-        <version>${mdsal.version}</version>
+        <artifactId>config-artifacts</artifactId>
+        <version>${controller.config.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal-common-api</artifactId>
+        <artifactId>mdsal-artifacts</artifactId>
         <version>${mdsal.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
       </dependency>
       <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal-common-util</artifactId>
-        <version>${mdsal.version}</version>
+        <groupId>org.opendaylight.openflowjava</groupId>
+        <artifactId>openflowjava-artifacts</artifactId>
+        <version>${openflowjava.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>switchmanager</artifactId>
@@ -189,77 +220,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>model-flow-statistics</artifactId>
         <version>${openflowplugin.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller.model</groupId>
-        <artifactId>model-inventory</artifactId>
-        <version>${mdsal.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>features-test</artifactId>
         <version>${odlparent.version}</version>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>concepts</artifactId>
-        <version>${yangtools.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-binding</artifactId>
-        <version>${yangtools.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-common</artifactId>
-        <version>${yangtools.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools.model</groupId>
-        <artifactId>ietf-inet-types</artifactId>
-        <version>${ietf.model.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools.model</groupId>
-        <artifactId>ietf-yang-types</artifactId>
-        <version>${ietf.model.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools.model</groupId>
-        <artifactId>ietf-yang-types-20130715</artifactId>
-        <version>${ietf.yang.types.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools.model</groupId>
-        <artifactId>opendaylight-l2-types</artifactId>
-        <version>${opendaylight-l2-types.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools.model</groupId>
-        <artifactId>yang-ext</artifactId>
-        <version>${yang-ext.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.openflowjava</groupId>
-        <artifactId>openflow-protocol-api</artifactId>
-        <version>${openflowjava.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.openflowjava</groupId>
-        <artifactId>openflow-protocol-impl</artifactId>
-        <version>${openflowjava.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.openflowjava</groupId>
-        <artifactId>openflow-protocol-spi</artifactId>
-        <version>${openflowjava.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.openflowjava</groupId>
-        <artifactId>util</artifactId>
-        <version>${openflowjava.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin</artifactId>
@@ -350,10 +316,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>utils.config</artifactId>
         <version>${ovsdb.utils.config.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.ovsdb</groupId>
+        <artifactId>utils.mdsal-node</artifactId>
+        <version>${ovsdb.utils.mdsal.node.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.ovsdb</groupId>
         <artifactId>utils.mdsal-openflow</artifactId>
-        <version>${utils.mdsal.openflow.version}</version>
+        <version>${ovsdb.utils.mdsal.openflow.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.ovsdb</groupId>
@@ -375,6 +346,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>powermock-core</artifactId>
         <version>${powermock.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.ovsdb</groupId>
+        <artifactId>ovsdb-ui</artifactId>
+        <version>${ovsdb.ui.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -427,19 +403,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                     <ignore></ignore>
                   </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></ignore>
-                  </action>
-                </pluginExecution>
                 <pluginExecution>
                   <pluginExecutionFilter>
                     <groupId>org.opendaylight.yangtools</groupId>
@@ -460,31 +423,25 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>${checkstyle.version}</version>
-          <configuration>
-            <failsOnError>true</failsOnError>
-            <configLocation>controller/checkstyle.xml</configLocation>
-            <consoleOutput>true</consoleOutput>
-            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-            <sourceDirectory>${project.basedir}</sourceDirectory>
-            <includes>**\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat</includes>
-            <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,\/</excludes>
-          </configuration>
           <dependencies>
             <dependency>
-              <groupId>org.opendaylight.controller</groupId>
+              <groupId>com.puppycrawl.tools</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>0.1.0-SNAPSHOT</version>
+              <version>6.4.1</version>
             </dependency>
           </dependencies>
-          <executions>
-            <execution>
-              <goals>
-                <goal>check</goal>
-              </goals>
-              <phase>process-sources</phase>
-            </execution>
-          </executions>
+          <configuration>
+            <configLocation>src/main/resources/ovsdb_checks.xml</configLocation>
+            <failsOnError>true</failsOnError>
+            <includes>**/*.java,**/*.xml,**/*.ini,**/*.sh,**/*.bat</includes>
+            <excludes>**/yang/,**/features/,**/integrationtest/,**/northbound/,
+              **/openstack/,**/ovs-sfc/,
+              **/ovsdb-plugin-compatibility-layer/,
+              **/plugin/,**/plugin-shell/,
+              **/schema/hardwarevtep/,**/schema/openvswitch/,
+              **/southbound/,**/utils/
+            </excludes>
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.jacoco</groupId>
@@ -614,13 +571,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </pluginManagement>
   </build>
 
-  <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
-  </scm>
-
   <profiles>
     <profile>
       <id>integrationtest</id>