Move config-parent to aggregator POM

More then one project in the mappingservice/ directory is hanging off
config-parent.  This commit defines it as a parent in the aggregator POM
mappingservice/pom.xml, so that common configration for all projects,
like checkstyle and coverage can live in a single place.

Change-Id: I9e04b707ca0dbdac756bdd212ebc55bc869ee802
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 799d0df65de8e97512056ca3c1597a3cc6c568ef..12b76c9bf87e2501748c89f656ec5907ed4edd17 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -7,12 +7,13 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
   <modelVersion>4.0.0</modelVersion>
+
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>lispflowmapping-artifacts</artifactId>
   <version>1.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
+  <name>LISP Flow Mapping Artifacts</name>
 
   <dependencyManagement>
     <dependencies>

diff --git a/commons/build_tools/pom.xml b/commons/build_tools/pom.xml
index e916da8524ba9f05ef9ff4f9854b6b09642f4fd5..4e4273dd7ae7c2eceac37600c8eb6d6c602595a4 100644 (file)
--- a/commons/build_tools/pom.xml
+++ b/commons/build_tools/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>lispflowmapping-commons</artifactId>
     <version>1.3.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
+
   <artifactId>common.build.tools</artifactId>
   <packaging>jar</packaging>
   <name>Build Tools</name>
+
 </project>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 83442fdd6db70c0c41914caf528d15a096777ca9..fb5bc61222ba670a5a207fdedd8e4269d8694c25 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -24,7 +24,6 @@
   <version>1.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Parent POM</name>
-  <description></description>
 
   <properties>
     <branding.version>1.2.0-SNAPSHOT</branding.version>
@@ -83,11 +82,6 @@
         <artifactId>jmock-legacy</artifactId>
         <version>2.6.0</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>clustering.services</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-api</artifactId>
@@ -103,13 +97,6 @@
         <artifactId>config-util</artifactId>
         <version>0.4.0-SNAPSHOT</version>
       </dependency>
-      <!--
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>containermanager</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
-      </dependency>
-      -->
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>features-mdsal</artifactId>
@@ -157,11 +144,6 @@
         <artifactId>netty-event-executor-config</artifactId>
         <version>${config.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.neutron</groupId>
-        <artifactId>neutron-spi</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>opendaylight-karaf-empty</artifactId>
@@ -174,11 +156,6 @@
         <artifactId>opendaylight-karaf-resources</artifactId>
         <version>${karaf.resources.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal</artifactId>
-        <version>0.10.0-SNAPSHOT</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-binding-api</artifactId>

diff --git a/commons/unittest_tools/pom.xml b/commons/unittest_tools/pom.xml
index d89d9e2de5973456ea8abb93f3ce8ef669b498aa..c7cf9f3f99a57fc19fa3a596c0e70cca86ba31af 100644 (file)
--- a/commons/unittest_tools/pom.xml
+++ b/commons/unittest_tools/pom.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>lispflowmapping-commons</artifactId>
     <version>1.3.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
+
   <artifactId>common.unittest.tools</artifactId>
-  <packaging>jar</packaging>
   <name>Unit Test Tools</name>
+
   <dependencies>
     <dependency>
       <groupId>equinoxSDK381</groupId>
@@ -27,7 +29,6 @@
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-core</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.jmock</groupId>
       <artifactId>jmock-junit4</artifactId>
@@ -40,6 +41,5 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-
   </dependencies>
 </project>

diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml
index f94085f7d97734753937fb8292dc427bcb0fabae..9f30d7d2acf590379f797c4911158e7ceb37480d 100644 (file)
--- a/mappingservice/api/pom.xml
+++ b/mappingservice/api/pom.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
+
+  <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>mappingservice.api</artifactId>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
-  <name>LISP Flow Mapping Public APIs</name>
+  <name>Mapping Service Public APIs</name>
+
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
@@ -27,6 +28,7 @@
       <artifactId>mappingservice.yangmodel</artifactId>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>

diff --git a/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/dao/ILispDAO.java b/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/dao/ILispDAO.java
index 82a38da8338b7600750b0c94bdeceefdc141f414..1bc7d1541d23fd7f466385a5e4d02d046ba7a717 100644 (file)
--- a/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/dao/ILispDAO.java
+++ b/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/dao/ILispDAO.java
@@ -46,11 +46,15 @@ public interface ILispDAO {
      * Enumerate all the entries from the DAO
      *
      * @param visitor
+     *            The visitor object.
      */
     public void getAll(IRowVisitor visitor);
 
     /**
      * Remove an entry from the DAO
+     *
+     * @param key
+     *            The key of the entry to delete
      */
     public void remove(Object key);
 

diff --git a/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/lisp/IGeneralMapServer.java b/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/lisp/IGeneralMapServer.java
index 3941b31e640ab8cd788540a6ea630c3f42f31a8b..13ccdeefc9d67de9678fede0e20ed6f4ec135652 100644 (file)
--- a/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/lisp/IGeneralMapServer.java
+++ b/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/lisp/IGeneralMapServer.java
@@ -32,8 +32,8 @@ public interface IGeneralMapServer {
     /**
      * This method returns the authentication key of the address.
      *
-     * @param address
-     * @param maskLen
+     * @param address EID to look up
+     * @param maskLen EID mask length
      * @return The correct key.
      */
     String getAuthenticationKey(LispAddressContainer address, int maskLen);
@@ -47,19 +47,17 @@ public interface IGeneralMapServer {
     /**
      * This method removes the given authentication key from the map server.
      *
-     * @param address
-     * @param maskLen
-     * @return
+     * @param address EID to remove
+     * @param maskLen EID mask length
      */
     void removeAuthenticationKey(LispAddressContainer address, int maskLen);
 
     /**
      * This method adds an authentication key to the address.
      *
-     * @param address
-     * @param maskLen
-     * @param key
-     * @return
+     * @param address EID to add
+     * @param maskLen EID mask length
+     * @param key Value of the key for the EID
      */
     void addAuthenticationKey(LispAddressContainer address, int maskLen, String key);
 }

diff --git a/mappingservice/clusterdao/pom.xml b/mappingservice/clusterdao/pom.xml
index 7772c9e97b83930534d00efcfde8f473d0892cad..be5b9b42ae17e9ef039afc4aa98b3e8f6840ec17 100644 (file)
--- a/mappingservice/clusterdao/pom.xml
+++ b/mappingservice/clusterdao/pom.xml
@@ -1,15 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
+
+  <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>mappingservice.clusterdao</artifactId>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
-  <name>LISP Flow Mapping Cluster DAO</name>
+  <name>Mapping Service Cluster DAO</name>
+
   <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mappingservice.api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.dependencymanager</artifactId>
+    </dependency>
     <dependency>
       <groupId>equinoxSDK381</groupId>
       <artifactId>org.eclipse.osgi</artifactId>
@@ -17,12 +30,10 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>clustering.services</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.lispflowmapping</groupId>
-      <artifactId>mappingservice.api</artifactId>
+      <version>0.7.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>

diff --git a/mappingservice/config/pom.xml b/mappingservice/config/pom.xml
index 77f929e3dbf98f94fb68adf57cfe69f6962de811..23b90cedac64115539224e50d5b754061c6c3e71 100644 (file)
--- a/mappingservice/config/pom.xml
+++ b/mappingservice/config/pom.xml
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
+
+  <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>mappingservice.config</artifactId>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
-  <name>LISP Flow Mapping Config Subsystem</name>
+  <name>Mapping Service Config Subsystem</name>
+
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -41,20 +46,6 @@
         <plugin>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>yang-maven-plugin</artifactId>
-          <version>0.8.0-SNAPSHOT</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.opendaylight.controller</groupId>
-              <artifactId>yang-jmx-generator-plugin</artifactId>
-              <version>0.4.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.yangtools</groupId>
-              <artifactId>maven-sal-api-gen-plugin</artifactId>
-              <version>0.8.0-SNAPSHOT</version>
-              <type>jar</type>
-            </dependency>
-          </dependencies>
           <executions>
             <execution>
               <goals>
@@ -117,10 +108,6 @@
           </instructions>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-maven-plugin</artifactId>
-      </plugin>
     </plugins>
   </build>
 </project>

diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml
index dc943b0bf78d36c2dd1d84daa4a2d52878a519d4..e95989541a12d70430edec7c763ce5bf6acd8781 100644 (file)
--- a/mappingservice/implementation/pom.xml
+++ b/mappingservice/implementation/pom.xml
@@ -3,24 +3,18 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
-    <relativePath/>
+    <groupId>org.opendaylight.lispflowmapping</groupId>
+    <artifactId>mappingservice-parent</artifactId>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>mappingservice.implementation</artifactId>
   <groupId>org.opendaylight.lispflowmapping</groupId>
+  <artifactId>mappingservice.implementation</artifactId>
   <version>1.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
-  <name>LISP Flow Mapping Implementation</name>
+  <name>Mapping Service Implementation</name>
 
   <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>common.unittest.tools</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.api</artifactId>
@@ -32,43 +26,16 @@
       <version>${project.version}</version>
     </dependency>
 
-    <!-- needed for osgi console -->
+    <!-- needed for activator -->
     <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>org.eclipse.osgi</artifactId>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.dependencymanager</artifactId>
     </dependency>
 
-    <!-- testing dependencies -->
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit-addons</groupId>
-      <artifactId>junit-addons</artifactId>
-      <version>1.4</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jmock</groupId>
-      <artifactId>jmock-junit4</artifactId>
-      <version>2.6.0</version>
-      <scope>test</scope>
-    </dependency>
+    <!-- needed for osgi console -->
     <dependency>
-      <groupId>org.jmock</groupId>
-      <artifactId>jmock-legacy</artifactId>
-      <version>2.6.0</version>
-      <scope>test</scope>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispAFIConvertor.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispAFIConvertor.java
index 4c9b607e22f4f24244f6cc45734e904acd68463f..07feb3dc36f53ad03b3aef22871cb35cff96ac65 100644 (file)
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispAFIConvertor.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispAFIConvertor.java
@@ -10,24 +10,18 @@ package org.opendaylight.lispflowmapping.implementation.util;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
-import java.util.List;
 
 import org.opendaylight.lispflowmapping.type.AddressFamilyNumberEnum;
 import org.opendaylight.lispflowmapping.type.LispCanonicalAddressFormatEnum;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.LispAFIAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lcafkeyvalueaddress.KeyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lcafkeyvalueaddress.ValueBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lcaflistaddress.Addresses;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lcaftrafficengineeringaddress.Hops;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lispaddress.LispAddressContainer;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lispaddress.LispAddressContainerBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lispaddress.lispaddresscontainer.Address;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lispaddress.lispaddresscontainer.address.ipv6.Ipv6AddressBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lispaddress.lispaddresscontainer.address.lcafapplicationdata.LcafApplicationDataAddr;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lispaddress.lispaddresscontainer.address.lcafkeyvalue.LcafKeyValueAddressAddr;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lispaddress.lispaddresscontainer.address.lcafkeyvalue.LcafKeyValueAddressAddrBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lispaddress.lispaddresscontainer.address.lcafsourcedest.LcafSourceDestAddr;
-//import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lispaddress.lispaddresscontainer.address.distinguishedname.DistinguishedName;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lispsimpleaddress.PrimitiveAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lispsimpleaddress.primitiveaddress.DistinguishedNameBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lispsimpleaddress.primitiveaddress.Ipv4Builder;

diff --git a/mappingservice/integrationtest/pom.xml b/mappingservice/integrationtest/pom.xml
index 49cc781d6f8539e437348c0416a206b99a6eef81..8312886a5d757f74553574a7bcbe548a0e8eae4a 100644 (file)
--- a/mappingservice/integrationtest/pom.xml
+++ b/mappingservice/integrationtest/pom.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.integrationtest</artifactId>
     <version>0.7.0-SNAPSHOT</version>
-    <relativePath></relativePath>
+    <relativePath/>
   </parent>
+
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>mappingservice.integrationtest</artifactId>
-  <name>LISP Flow Mapping Integration Tests</name>
   <version>1.3.0-SNAPSHOT</version>
+  <name>Mapping Service Integration Tests</name>
+
   <properties>
     <exam.version>3.0.0</exam.version>
     <sonar.jacoco.itReportPath>target/jacoco-it.exec</sonar.jacoco.itReportPath>
@@ -21,6 +24,7 @@
     <lispflowmapping.version>1.3.0-SNAPSHOT</lispflowmapping.version>
     <url.version>1.5.0</url.version>
   </properties>
+
   <dependencies>
     <dependency>
       <groupId>ch.qos.logback</groupId>
@@ -30,27 +34,22 @@
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-core</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-base</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-json-provider</artifactId>
@@ -271,12 +270,10 @@
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.fileinstall</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.codehaus.enunciate</groupId>
       <artifactId>enunciate-core-annotations</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.codehaus.jettison</groupId>
       <artifactId>jettison</artifactId>
@@ -293,7 +290,6 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>bundlescanner</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>bundlescanner.implementation</artifactId>
@@ -411,7 +407,6 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>netconf-util</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>protocol-framework</artifactId>
@@ -424,7 +419,6 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
@@ -453,7 +447,6 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-common-api</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-common-util</artifactId>
@@ -553,7 +546,6 @@
       <artifactId>mappingservice.yangmodel</artifactId>
       <version>${lispflowmapping.version}</version>
     </dependency>
-
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>mockito-configuration</artifactId>
@@ -716,10 +708,10 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
   <build>
     <pluginManagement>
       <plugins>
-
         <plugin>
           <groupId>org.eclipse.m2e</groupId>
           <artifactId>lifecycle-mapping</artifactId>

diff --git a/mappingservice/netconf/pom.xml b/mappingservice/netconf/pom.xml
index a71e2324ecf5ef90918693a04c2dd0424a2e562a..8067237da943d33ba41b73fff9982c6fac01b2c4 100644 (file)
--- a/mappingservice/netconf/pom.xml
+++ b/mappingservice/netconf/pom.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
+
+  <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>mappingservice.netconf</artifactId>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
-  <name>LISP Flow Mapping Netconf Connector</name>
+  <name>Mapping Service NETCONF Connector</name>
 
   <dependencies>
     <dependency>
@@ -83,14 +87,13 @@
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>mockito-configuration</artifactId>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
+
   <build>
     <plugins>
       <plugin>
@@ -105,28 +108,9 @@
           </instructions>
         </configuration>
       </plugin>
-
       <plugin>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yang-maven-plugin</artifactId>
-        <dependencies>
-          <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>yang-jmx-generator-plugin</artifactId>
-            <version>${config.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>maven-sal-api-gen-plugin</artifactId>
-            <version>${yangtools.version}</version>
-            <type>jar</type>
-          </dependency>
-          <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>${osgi.core.version}</version>
-          </dependency>
-        </dependencies>
         <executions>
           <execution>
             <goals>

diff --git a/mappingservice/neutron/pom.xml b/mappingservice/neutron/pom.xml
index 721f2fa0b6df1dd491a5a4f8416b23b91b2c41d7..7d53a0872cfe8df25178338675d8fef36a125b6b 100644 (file)
--- a/mappingservice/neutron/pom.xml
+++ b/mappingservice/neutron/pom.xml
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
+
+  <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>mappingservice.neutron</artifactId>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
-  <name>LISP Flow Mapping Neutron APIs</name>
+  <name>Mapping Service Neutron APIs</name>
+
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
@@ -31,6 +36,7 @@
       <artifactId>ietf-inet-types</artifactId>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>

diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index 2cafe5f0a352b67bd949729bcb1114392aa46d40..e47bb373548be6fe8bd4f95da8d9f96340cee451 100644 (file)
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -3,14 +3,17 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.lispflowmapping</groupId>
-    <artifactId>lispflowmapping-all</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>config-parent</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <relativePath/>
   </parent>
 
+  <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>mappingservice-parent</artifactId>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <name>LISP Flow Mapping Parent POM</name>
+  <name>Mapping Service Parent POM</name>
 
   <modules>
     <module>yangmodel</module>
@@ -25,10 +28,34 @@
     <!-- <module>integrationtest</module> -->
   </modules>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>lispflowmapping-artifacts</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <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>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <!-- common testing dependencies -->
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>common.unittest.tools</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -37,6 +64,7 @@
     <dependency>
       <groupId>junit-addons</groupId>
       <artifactId>junit-addons</artifactId>
+      <version>1.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -47,11 +75,13 @@
     <dependency>
       <groupId>org.jmock</groupId>
       <artifactId>jmock-junit4</artifactId>
+      <version>2.6.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jmock</groupId>
       <artifactId>jmock-legacy</artifactId>
+      <version>2.6.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/mappingservice/shell/pom.xml b/mappingservice/shell/pom.xml
index 23aabe7b84f05a7907f38dee98a4184daf487d46..e78661bb9ed3dedebdabddde91672f2ed17eda50 100644 (file)
--- a/mappingservice/shell/pom.xml
+++ b/mappingservice/shell/pom.xml
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
+
+  <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>mappingservice.shell</artifactId>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
-  <name>LISP Flow Mapping Karaf Shell Commands</name>
+  <name>Mapping Service Karaf Shell Commands</name>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.karaf.shell</groupId>
@@ -20,6 +25,7 @@
       <artifactId>mappingservice.api</artifactId>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>

diff --git a/mappingservice/southbound/pom.xml b/mappingservice/southbound/pom.xml
index 05e5866c8958fbdf6884cdf4189db6cc9f7a13f3..fc4ea7bbd768b324b613ab5e00d07087cde4a6ea 100644 (file)
--- a/mappingservice/southbound/pom.xml
+++ b/mappingservice/southbound/pom.xml
@@ -3,17 +3,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
-    <relativePath/>
+    <groupId>org.opendaylight.lispflowmapping</groupId>
+    <artifactId>mappingservice-parent</artifactId>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>mappingservice.southbound</artifactId>
   <groupId>org.opendaylight.lispflowmapping</groupId>
+  <artifactId>mappingservice.southbound</artifactId>
   <version>1.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
-  <name>LISP Flow Mapping Southbound Plugin</name>
+  <name>Mapping Service Southbound Plugin</name>
 
   <dependencies>
     <dependency>

diff --git a/mappingservice/yangmodel/pom.xml b/mappingservice/yangmodel/pom.xml
index 1868289bfd94bd94bc3f97cb0dea7f38e1b574a5..b4e62d4e4c1cb71dfe17146d2b31ecff3cef00f3 100644 (file)
--- a/mappingservice/yangmodel/pom.xml
+++ b/mappingservice/yangmodel/pom.xml
@@ -7,6 +7,8 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>binding-parent</artifactId>
@@ -14,16 +16,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <relativePath/>
   </parent>
 
-  <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>mappingservice.yangmodel</artifactId>
   <version>1.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
-  <name>LISP Flow Mapping YANG Model</name>
-
-  <properties>
-    <checkstyle.excludes>org/opendaylight/yang/gen/**</checkstyle.excludes>
-  </properties>
+  <name>Mapping Service YANG Model</name>
 
   <dependencies>
     <dependency>

diff --git a/pom.xml b/pom.xml
index 3e350566f548d73f71ec220d19bf631a66cc7132..3f2afe4eb2eaf929c0872736d8021f6ae9c0c81f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -22,9 +22,9 @@
     <module>commons/parent</module>
     <module>commons/build_tools</module>
     <module>commons/unittest_tools</module>
+    <module>artifacts</module>
     <module>mappingservice</module>
     <module>features</module>
-    <module>artifacts</module>
     <module>distribution-karaf</module>
   </modules>
 
@@ -44,4 +44,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>