Merge "Bug 6097: Add xTR-ID and Site-ID to Map-Notify"

[lispflowmapping.git] / mappingservice / pom.xml

diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index 6cf913ab4e8cc3760d60da9761d562e4195f15e0..0f481a6d2bc2ec309eed5639b210333550dfbfcb 100644 (file)
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -19,9 +19,13 @@
     <module>lisp-proto</module>
     <module>api</module>
     <module>inmemorydb</module>
+    <module>dsbackend</module>
+    <module>mapcache</module>
     <module>implementation</module>
     <module>southbound</module>
+    <!--
     <module>neutron</module>
+    -->
     <module>shell</module>
   </modules>
 
@@ -67,47 +71,23 @@
         <scope>test</scope>
       </dependency>
       -->
+      <!--
       <dependency>
         <groupId>org.opendaylight.neutron</groupId>
         <artifactId>neutron-spi</artifactId>
         <version>0.7.0-SNAPSHOT</version>
       </dependency>
+      -->
     </dependencies>
   </dependencyManagement>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <!-- Temporarily override the odlparent checkstyle configuration.
-               We want to enforce some simple rules and add more as we clean up code -->
-          <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>
-          </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>
-  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
   <!--
       Maven Site Configuration