Merge remote branch 'origin/release-1.0.X' into develop

Change-Id: I4ddd7e3ca9b57565254ab45f231eb112469a9bbd
Signed-off-by: David Goldberg <david.goldberg@contextream.com>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 3dd94a9a35e45f81d30754cf0bbd216e70f44688..dea89550bb6a46f4f3d48456669cf0278f938193 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -256,7 +256,7 @@
             </dependency>
             <dependency>
               <groupId>org.opendaylight.lispflowmapping</groupId>
-              <artifactId>mappingservice.notrhbound</artifactId>
+              <artifactId>mappingservice.northbound</artifactId>
               <version>${lispflowmapping.version}</version>
             </dependency>
                <dependency>

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 382dd5a7800bade8288a072858a528541fb59260..0670a643bc21f85c32320629ccb2129c16b386cb 100644 (file)
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -27,6 +27,37 @@
       <!-- Make sure this isn't included on any classpath-->
       <scope>provided</scope>
     </dependency>
+
+               <dependency>
+                       <groupId>org.opendaylight.lispflowmapping</groupId>
+                       <artifactId>mappingservice.yangmodel</artifactId>
+               </dependency>
+               
+               <dependency>
+                       <groupId>org.opendaylight.lispflowmapping</groupId>
+                       <artifactId>mappingservice.api</artifactId>
+               </dependency>
+               
+               <dependency>
+                       <groupId>org.opendaylight.lispflowmapping</groupId>
+                       <artifactId>mappingservice.config</artifactId>
+               </dependency>
+               
+               <dependency>
+                       <groupId>org.opendaylight.lispflowmapping</groupId>
+                       <artifactId>mappingservice.implementation</artifactId>
+               </dependency>
+               
+               <dependency>
+                       <groupId>org.opendaylight.lispflowmapping</groupId>
+                       <artifactId>mappingservice.southbound</artifactId>
+               </dependency>
+               
+               <dependency>
+                       <groupId>org.opendaylight.lispflowmapping</groupId>
+                       <artifactId>mappingservice.northbound</artifactId>
+               </dependency>
+               
   </dependencies>
 
   <build>