X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=mappingservice%2Fpom.xml;h=2efe7f43ce709cb3d823fa20548283b9d055fec4;hb=e5feef731159bca508ef8a907bc0d863b17c9191;hp=8e5ce262ae8fa745b762847c0ea53b4ea0f53b0b;hpb=d13ca96f4e547462e92bfe0abf4141436512b353;p=lispflowmapping.git

diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index 8e5ce262a..2efe7f43c 100644
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -3,22 +3,29 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent</artifactId>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>mappingservice-parent</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Mapping Service Parent POM</name>
 
+  <properties>
+    <pmd.cpd.fail>true</pmd.cpd.fail>
+  </properties>
+
   <modules>
     <module>lisp-proto</module>
     <module>api</module>
     <module>inmemorydb</module>
+    <module>dsbackend</module>
+    <module>mapcache</module>
+    <module>config</module>
     <module>implementation</module>
     <module>southbound</module>
     <module>neutron</module>
@@ -30,14 +37,14 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.2.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>
+        <version>0.10.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -52,6 +59,7 @@
         <groupId>${project.groupId}</groupId>
         <artifactId>common.unittest.tools</artifactId>
         <version>${project.version}</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>junit-addons</groupId>
@@ -59,19 +67,6 @@
         <version>1.4</version>
         <scope>test</scope>
       </dependency>
-      <!--
-      <dependency>
-        <groupId>org.jmock</groupId>
-        <artifactId>jmock</artifactId>
-        <version>2.6.0</version>
-        <scope>test</scope>
-      </dependency>
-      -->
-      <dependency>
-        <groupId>org.opendaylight.neutron</groupId>
-        <artifactId>neutron-spi</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -87,34 +82,22 @@
     <pluginManagement>
       <plugins>
         <plugin>
-          <!-- Temporarily override the odlparent checkstyle configuration.
-               We want to enforce some simple rules and add more as we clean up code -->
+          <!-- Enforce odlparent checkstyle -->
+          <groupId>org.apache.maven.plugins</groupId>
           <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>
+            <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
           </configuration>
-          <dependencies>
-            <dependency>
-              <groupId>org.opendaylight.lispflowmapping</groupId>
-              <artifactId>common.build.tools</artifactId>
-              <version>${project.version}</version>
-            </dependency>
-          </dependencies>
-          <executions>
-            <execution>
-              <goals>
-                <goal>check</goal>
-              </goals>
-              <phase>process-sources</phase>
-            </execution>
-          </executions>
         </plugin>
       </plugins>
     </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+      </plugin>
+    </plugins>
   </build>
 
   <!--