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 bd48626709d0c5da854a46df48a0e19774b5e2bd..9335b95fe46882f5f7c708ced2336ffbe96c18a0 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -80,7 +80,6 @@ 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.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>
@@ -98,17 +97,30 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <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>
-    <dlux.loader.version>0.3.0-SNAPSHOT</dlux.loader.version>
-    <dlux.core.version>0.3.0-SNAPSHOT</dlux.core.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>
@@ -129,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>
@@ -165,11 +157,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <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>
@@ -200,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>
@@ -431,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>
@@ -541,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>