Merge "JUnit test - LispAddressUtil - asKeyValue methods."

[lispflowmapping.git] / mappingservice / pom.xml

diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index 16fd957e78313d9ddbc8bcdfd9b119085779892a..297bb7673670643c563b36707214ecb651a3a1d6 100644 (file)
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -5,20 +5,19 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.5.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>mappingservice-parent</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Mapping Service Parent POM</name>
 
   <modules>
     <module>lisp-proto</module>
     <module>api</module>
-    <module>config</module>
     <module>inmemorydb</module>
     <module>implementation</module>
     <module>southbound</module>
@@ -28,6 +27,20 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>2.1.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.mdsal.model</groupId>
+        <artifactId>mdsal-model-artifacts</artifactId>
+        <version>0.9.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>lispflowmapping-artifacts</artifactId>
@@ -57,12 +70,7 @@
       <dependency>
         <groupId>org.opendaylight.neutron</groupId>
         <artifactId>neutron-spi</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal</artifactId>
-        <version>0.10.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -76,6 +84,7 @@
           <artifactId>maven-checkstyle-plugin</artifactId>
           <configuration>
             <configLocation>checkstyle/java_rules.xml</configLocation>
+            <includeTestSourceDirectory>true</includeTestSourceDirectory>
             <excludes>org/opendaylight/yang/gen/**,**/config/yang/**</excludes>
             <failsOnError>true</failsOnError>
             <consoleOutput>true</consoleOutput>
@@ -98,32 +107,5 @@
         </plugin>
       </plugins>
     </pluginManagement>
-
-    <plugins>
-      <plugin>
-       <groupId>org.jacoco</groupId>
-       <artifactId>jacoco-maven-plugin</artifactId>
-       <configuration>
-         <includes>
-           <include>org.opendaylight.lispflowmapping.*</include>
-         </includes>
-       </configuration>
-       <executions>
-         <execution>
-           <id>pre-test</id>
-           <goals>
-             <goal>prepare-agent</goal>
-           </goals>
-         </execution>
-         <execution>
-           <id>post-test</id>
-           <goals>
-             <goal>report</goal>
-           </goals>
-           <phase>test</phase>
-         </execution>
-       </executions>
-     </plugin>
-    </plugins>
   </build>
 </project>