Code Review / netvirt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Maven cleanup and features-parent migration
[netvirt.git] / commons / parent / pom.xml
diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 57f608d0f2dd12ad67c37d9e81f141a5120b40b7..9335b95fe46882f5f7c708ced2336ffbe96c18a0 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -14,14 +14,14 @@ 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>
@@ -54,21 +54,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <!-- 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.mdsal.node.version>1.1.0-SNAPSHOT</ovsdb.utils.mdsal.node.version>
-    <ovsdb.utils.mdsal.openflow.version>1.1.0-SNAPSHOT</ovsdb.utils.mdsal.openflow.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>
+    <openstack.netvirt.version>1.2.1-SNAPSHOT</openstack.netvirt.version>
+    <openstack.netvirt.providers.version>1.2.1-SNAPSHOT</openstack.netvirt.providers.version>
+    <ovsdb.features.version>1.2.1-SNAPSHOT</ovsdb.features.version>
+    <ovsdb.library.version>1.2.1-SNAPSHOT</ovsdb.library.version>
+    <ovsdb.northbound.version>0.8.0-SNAPSHOT</ovsdb.northbound.version>
+    <ovsdb.plugin.version>1.2.1-SNAPSHOT</ovsdb.plugin.version>
+    <ovsdb.plugin.compatibility.layer.version>1.2.1-SNAPSHOT</ovsdb.plugin.compatibility.layer.version>
+    <ovsdb.ovssfc.version>0.2.0-SNAPSHOT</ovsdb.ovssfc.version>
+    <ovsdb.utils.config.version>1.2.1-SNAPSHOT</ovsdb.utils.config.version>
+    <ovsdb.utils.mdsal.node.version>1.2.1-SNAPSHOT</ovsdb.utils.mdsal.node.version>
+    <ovsdb.utils.mdsal.openflow.version>1.2.1-SNAPSHOT</ovsdb.utils.mdsal.openflow.version>
+    <ovsdb.utils.servicehelper.version>1.2.1-SNAPSHOT</ovsdb.utils.servicehelper.version>
+    <plugin.shell.version>1.2.1-SNAPSHOT</plugin.shell.version>
+    <schema.hardwarevtep.version>1.2.1-SNAPSHOT</schema.hardwarevtep.version>
+    <schema.openvswitch.version>1.2.1-SNAPSHOT</schema.openvswitch.version>
     <!-- Skip Coverage and IT by default -->
     <skip.coverage>true</skip.coverage>
     <skip.distribution>false</skip.distribution>
@@ -80,32 +80,47 @@ 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>
-    <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>
-    <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>
+    <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>
+    <commons.collection.version>3.2.1</commons.collection.version>
+    <httpcomponents.version>4.4.1</httpcomponents.version>
     <portlet.version>2.0</portlet.version>
     <powermock.version>1.5.2</powermock.version>
+    <dlux.version>0.3.0-SNAPSHOT</dlux.version>
+    <ovsdb.ui.version>0.1.0-SNAPSHOT</ovsdb.ui.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.mdsal.model</groupId>
+        <artifactId>mdsal-model-artifacts</artifactId>
+        <version>0.8.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>commons-collections</groupId>
         <artifactId>commons-collections</artifactId>
@@ -126,31 +141,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>httpcore-nio</artifactId>
         <version>${httpcomponents.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>commons.northbound</artifactId>
-        <version>${northbound.commons.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-api</artifactId>
         <version>${controller.config.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>clustering.services</artifactId>
-        <version>${clustering.services.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>containermanager</artifactId>
-        <version>${containermanager.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>forwardingrulesmanager</artifactId>
-        <version>${forwardingrulesmanager.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.neutron</groupId>
         <artifactId>neutron-spi</artifactId>
@@ -159,14 +154,9 @@ 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>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal</artifactId>
-        <version>${sal.version}</version>
-      </dependency>
 
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
@@ -197,11 +187,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <scope>import</scope>
       </dependency>
 
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>switchmanager</artifactId>
-        <version>${switchmanager.api.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.openflowplugin.model</groupId>
         <artifactId>model-flow-base</artifactId>
@@ -343,6 +328,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>
 
@@ -423,13 +413,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             </dependency>
           </dependencies>
           <configuration>
-            <configLocation>src/main/resources/ovsdb_checks.xml</configLocation>
             <failsOnError>true</failsOnError>
             <includes>**/*.java,**/*.xml,**/*.ini,**/*.sh,**/*.bat</includes>
-            <excludes>**/yang/,**/features/,**/integrationtest/,**/northbound/,
+            <excludes>**/yang/,**/features/,
               **/openstack/,**/ovs-sfc/,
-              **/ovsdb-plugin-compatibility-layer/,
-              **/plugin/,**/plugin-shell/,
               **/schema/hardwarevtep/,**/schema/openvswitch/,
               **/southbound/,**/utils/
             </excludes>
@@ -438,7 +425,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>${jacoco.version}</version>
           <configuration>
             <skip>${skip.coverage}</skip>
           </configuration>
@@ -534,7 +520,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
           </executions>
           <dependencies>
             <dependency>
-              <groupId>org.opendaylight.yangtools</groupId>
+              <groupId>org.opendaylight.mdsal</groupId>
               <artifactId>maven-sal-api-gen-plugin</artifactId>
               <version>${yangtools.version}</version>
               <type>jar</type>
NetVirt - Archived