Merge branch 'master' into topic/ietf_yang

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

diff --combined features/pom.xml
index 289ae5f8a9cdca0327d1ab4fa8ab3e8fd431b5a0,00b91d5b5b5b7fba3748bb89dbb3308abe82e123..dfaa8230dd6ad32de2c4d9e5a35c2a1ce0b78169
--- 1/features/pom.xml
--- 2/features/pom.xml
+++ b/features/pom.xml
@@@ -35,8 -35,6 +35,8 @@@ and is available at http://www.eclipse.
      <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
      <neutron.version>0.6.0-SNAPSHOT</neutron.version>
      <restconf.version>1.3.0-SNAPSHOT</restconf.version>
 +    <!-- Temporary -->
 +    <skipTests>true</skipTests>
    </properties>
  
    <dependencyManagement>
@@@ -68,13 -66,6 +68,6 @@@
        <classifier>features</classifier>
        <type>xml</type>
      </dependency>
-     <dependency>
-       <groupId>org.opendaylight.controller</groupId>
-       <artifactId>features-base</artifactId>
-       <version>${commons.opendaylight.version}</version>
-       <classifier>features</classifier>
-       <type>xml</type>
-     </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>features-mdsal</artifactId>
@@@ -98,7 -89,6 +91,7 @@@
        <type>xml</type>
        <scope>runtime</scope>
      </dependency>
 +    <!--
      <dependency>
        <groupId>${project.groupId}</groupId>
        <artifactId>mappingservice.implementation</artifactId>
@@@ -123,13 -113,11 +116,13 @@@
        <classifier>config</classifier>
        <type>xml</type>
      </dependency>
 +    -->
      <dependency>
        <groupId>${project.groupId}</groupId>
        <artifactId>mappingservice.api</artifactId>
        <version>${project.version}</version>
      </dependency>
 +    <!--
      <dependency>
        <groupId>${project.groupId}</groupId>
        <artifactId>mappingservice.inmemorydb</artifactId>
@@@ -152,13 -140,11 +145,13 @@@
        <artifactId>mappingservice.shell</artifactId>
        <version>${project.version}</version>
      </dependency>
 +    -->
      <dependency>
        <groupId>${project.groupId}</groupId>
        <artifactId>mappingservice.lisp-proto</artifactId>
        <version>${project.version}</version>
      </dependency>
 +    <!--
      <dependency>
        <groupId>${project.groupId}</groupId>
        <artifactId>lispflowmapping-ui-bundle</artifactId>
@@@ -171,6 -157,5 +164,6 @@@
        <classifier>features</classifier>
        <type>xml</type>
      </dependency>
 +    -->
    </dependencies>
  </project>

diff --combined features/src/main/features/features.xml
index 14c622482d81591110983d52d3336dfe6999ada5,b0dd72832fc6a59df93fae6e6330bcee1166540b..40c1169877e4e7e173f7b2c704572b445f1fafaf
--- 1/features/src/main/features/features.xml
--- 2/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@@ -18,12 -18,9 +18,10 @@@
      <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
      <!-- Needed for odl-config-api -->
      <repository>mvn:org.opendaylight.controller/features-config/${config.version}/xml/features</repository>
-     <!-- TODO features-base should be removed when we get rid of Activators, hopefully soon -->
-     <repository>mvn:org.opendaylight.controller/features-base/${commons.opendaylight.version}/xml/features</repository>
      <repository>mvn:org.opendaylight.neutron/features-neutron/${neutron.version}/xml/features</repository>
      <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.core.version}/xml/features</repository>
  
 +    <!--
      <feature name="odl-lispflowmapping-msmr" description="OpenDaylight :: LISP Flow Mapping :: Map-Server/Map-Resolver" version='${project.version}'>
          <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
          <feature version="${project.version}">odl-lispflowmapping-southbound</feature>
@@@ -61,8 -58,6 +59,6 @@@
      </feature>
  
      <feature name="odl-lispflowmapping-neutron" description="OpenDaylight :: LISP Flow Mapping :: Neutron Integration" version='${project.version}'>
-          TODO felix-dm should be removed when we get rid of Activators, hopefully soon
-         <feature>odl-base-felix-dm</feature>
          <feature version="${neutron.version}">odl-neutron-service</feature>
          <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
          <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.neutron/${project.version}</bundle>
@@@ -73,13 -68,10 +69,13 @@@
          <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
          <bundle>mvn:org.opendaylight.lispflowmapping/lispflowmapping-ui-bundle/${project.version}</bundle>
      </feature>
 +    -->
  
      <feature name="odl-lispflowmapping-models" description="OpenDaylight :: LISP Flow Mapping :: Models" version='${project.version}'>
          <feature version='${config.version}'>odl-config-api</feature>
          <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
 +        <!-- Temporary: add APIDOCS so we don't have to load manually while testing IETF LISP address models -->
 +        <feature version='${mdsal.version}'>odl-mdsal-apidocs</feature>
          <bundle>mvn:org.apache.commons/commons-lang3/${commons.lang3.version}</bundle>
          <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.lisp-proto/${project.version}</bundle>
          <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.api/${project.version}</bundle>

diff --combined mappingservice/lisp-proto/pom.xml
index 081ee5f47fd5668c7ecb4e84bc2f96b55ddba701,38c79568d8dfed5aaab19f5f679543971e175559..bc3d208afaa582b9da6ab2146257ac33962bf019
--- 1/mappingservice/lisp-proto/pom.xml
--- 2/mappingservice/lisp-proto/pom.xml
+++ b/mappingservice/lisp-proto/pom.xml
@@@ -48,36 -48,37 +48,68 @@@ and is available at http://www.eclipse.
      </dependency>
    </dependencies>
  
 +  <!-- Temporarily disable compiling non-generated code, like serializers, which won't build for now -->
    <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>
++
 +    <plugins>
 +      <plugin>
 +        <artifactId>maven-compiler-plugin</artifactId>
 +        <executions>
 +          <execution>
 +            <id>default-compile</id>
 +            <phase>compile</phase>
 +            <goals>
 +              <goal>compile</goal>
 +            </goals>
 +            <configuration>
 +              <excludes>
 +                <exclude>org/opendaylight/lispflowmapping/**</exclude>
 +              </excludes>
 +            </configuration>
 +          </execution>
 +          <execution>
 +            <id>default-testCompile</id>
 +            <phase>test-compile</phase>
 +            <goals>
 +              <goal>testCompile</goal>
 +            </goals>
 +            <configuration>
 +              <skip>true</skip>
 +            </configuration>
 +          </execution>
 +        </executions>
 +      </plugin>
 +    </plugins>
    </build>
  </project>

diff --combined mappingservice/pom.xml
index 993d835858175874938f9670ce889f774a2b3b60,413f85c2476a4704cecb18eb78708d66d68290fa..aaee63b1593ad34645e77abb8b7ed04b316e92f3
--- 1/mappingservice/pom.xml
--- 2/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@@ -18,13 -18,11 +18,13 @@@
    <modules>
      <module>lisp-proto</module>
      <module>api</module>
 +    <!--
      <module>inmemorydb</module>
      <module>implementation</module>
      <module>southbound</module>
      <module>neutron</module>
      <module>shell</module>
 +    -->
    </modules>
  
    <dependencyManagement>
@@@ -91,6 -89,7 +91,7 @@@
            <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>