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

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

diff --combined commons/parent/pom.xml
index 3dd94a9a35e45f81d30754cf0bbd216e70f44688,efc1c265028f5248e5b642af9c767404f5423b07..dea89550bb6a46f4f3d48456669cf0278f938193
--- 1/commons/parent/pom.xml
--- 2/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@@ -2,8 -2,8 +2,8 @@@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.opendaylight.lispflowmapping</groupId>
        <artifactId>lispflowmapping-commons</artifactId>
 -      <version>1.0.1-SNAPSHOT</version>
 -      <description />
 +      <version>1.1.0-SNAPSHOT</version>
 +      <description></description>
        <packaging>pom</packaging>
        <url>http://www.opendaylight.org</url>
        <scm>
@@@ -13,7 -13,7 +13,7 @@@
                <tag>HEAD</tag>
        </scm>
        <properties>
 -              <lispflowmapping.version>1.0.1-SNAPSHOT</lispflowmapping.version>
 +              <lispflowmapping.version>1.1.0-SNAPSHOT</lispflowmapping.version>
                <jacoco.version>0.5.3.201107060350</jacoco.version>
                <enforcer.version>1.3.1</enforcer.version>
                <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
@@@ -256,7 -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 --combined distribution/pom.xml
index 382dd5a7800bade8288a072858a528541fb59260,062189e8fb16ada9fcd2527c99f05c2e435bc0d8..0670a643bc21f85c32320629ccb2129c16b386cb
--- 1/distribution/pom.xml
--- 2/distribution/pom.xml
+++ b/distribution/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
    <parent>
      <groupId>org.opendaylight.lispflowmapping</groupId>
      <artifactId>lispflowmapping-commons</artifactId>
 -    <version>1.0.1-SNAPSHOT</version>
 +    <version>1.1.0-SNAPSHOT</version>
      <relativePath>../commons/parent</relativePath>
    </parent>
  
@@@ -27,6 -27,37 +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>