Refactor the poms to clean up unused tags and move to odl parent 84/11884/1
authorLorand Jakab <lojakab@cisco.com>
Fri, 10 Oct 2014 13:02:33 +0000 (16:02 +0300)
committerLorand Jakab <lojakab@cisco.com>
Fri, 10 Oct 2014 13:11:12 +0000 (16:11 +0300)
Also added other enhancements like sorting as well as cleaning up redundant properties etc.

Change-Id: I3443dcd00ceb71bb0613c8e2fdc643fd26322401
Signed-off-by: Devin Avery <devin.avery@brocade.com>
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
19 files changed:
commons/build_tools/pom.xml
commons/code-parent/pom.xml [deleted file]
commons/parent/pom.xml
commons/unittest_tools/pom.xml
distribution-karaf/pom.xml
distribution/pom.xml
features/pom.xml
mappingservice/api/pom.xml
mappingservice/clusterdao/pom.xml
mappingservice/config/pom.xml
mappingservice/implementation/pom.xml
mappingservice/integrationtest/pom.xml
mappingservice/netconf/pom.xml
mappingservice/neutron/pom.xml
mappingservice/northbound/pom.xml
mappingservice/pom.xml
mappingservice/southbound/pom.xml
mappingservice/yangmodel/pom.xml
pom.xml

index 73954bdc827954769ed6de676838dc1730bbfdfb..3fe4f40dc0090922f07839d991823aa70bd677ff 100644 (file)
@@ -1,19 +1,13 @@
 <?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.2.0-SNAPSHOT</version>
-                <relativePath>../parent</relativePath>
-       </parent>
-       <artifactId>common.build.tools</artifactId>
-        <name>Build Tools</name>
-       <packaging>jar</packaging>
-       <scm>
-               <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
-               <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
-               <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
-               <tag>HEAD</tag>
-       </scm>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.lispflowmapping</groupId>
+    <artifactId>lispflowmapping-commons</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
+  </parent>
+  <artifactId>common.build.tools</artifactId>
+  <packaging>jar</packaging>
+  <name>Build Tools</name>
 </project>
diff --git a/commons/code-parent/pom.xml b/commons/code-parent/pom.xml
deleted file mode 100644 (file)
index 2164b62..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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.2.0-SNAPSHOT</version>
-               <relativePath>../parent</relativePath>
-       </parent>
-       <artifactId>lispflowmapping-code-commons</artifactId>
-        <name>Code Parent POM</name>
-       <packaging>pom</packaging>
-       <scm>
-               <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
-               <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
-               <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
-               <tag>HEAD</tag>
-       </scm>
-       <dependencies>
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>common.unittest.tools</artifactId>
-                       <scope>test</scope>
-               </dependency>
-                       <dependency>
-                               <groupId>junit</groupId>
-                               <artifactId>junit</artifactId>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.hamcrest</groupId>
-                               <artifactId>hamcrest-core</artifactId>
-                               <scope>test</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.jmock</groupId>
-                               <artifactId>jmock-junit4</artifactId>
-                               <scope>test</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.jmock</groupId>
-                               <artifactId>jmock-legacy</artifactId>
-                               <scope>test</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>junit-addons</groupId>
-                               <artifactId>junit-addons</artifactId>
-                               <scope>test</scope>
-                       </dependency>
-       </dependencies>
-</project>
index ba2200b659d6fd5f707aa8b1c7ea16b6863593ff..e8ff450502bba4e631fae0e92ebba476772b558a 100644 (file)
-<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/maven-v4_0_0.xsd">
+<?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/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
+
+       <!-- NOTE: Tags we removed: SCM: We don't use maven to pull and push code, so
+               the SCM section does not appear to be needed. See http://maven.apache.org/scm/maven-scm-plugin/usage.html
+
+           NOTE: our ultimate goal is to remove this pom, and move everything in here
+             up to ODL parent or the root of this project, depending on
+             its relevance. Only the logical root should reference this file.
+
+             -->
+
+       <parent>
+               <!-- We want to inherit of ODL parent so we can inherit common third party
+                       versions etc instead of redefining them here. Also we get some common definitions
+                       for plugin configuration etc. -->
+               <groupId>org.opendaylight.odlparent</groupId>
+               <artifactId>odlparent</artifactId>
+               <version>1.5.0-SNAPSHOT</version>
+       </parent>
+
        <groupId>org.opendaylight.lispflowmapping</groupId>
        <artifactId>lispflowmapping-commons</artifactId>
-        <name>Parent POM</name>
        <version>1.2.0-SNAPSHOT</version>
-       <description />
        <packaging>pom</packaging>
-       <url>http://www.opendaylight.org</url>
-       <scm>
-               <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
-               <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
-               <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
-               <tag>HEAD</tag>
-       </scm>
+       <name>Parent POM</name>
+       <description></description>
+
        <properties>
-               <lispflowmapping.version>1.2.0-SNAPSHOT</lispflowmapping.version>
-               <jacoco.version>0.6.2.201302030002</jacoco.version>
-               <sal.version>0.9.0-SNAPSHOT</sal.version>
-               <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-               <nsf.version>0.5.0-SNAPSHOT</nsf.version>
+               <branding.version>1.1.0-SNAPSHOT</branding.version>
+               <build.suffix>1.0.0</build.suffix>
                <clustering.services.version>0.6.0-SNAPSHOT</clustering.services.version>
+               <config.version>0.3.0-SNAPSHOT</config.version>
                <enforcer.version>1.3.1</enforcer.version>
+               <enunciate.version>1.26.2</enunciate.version>
+               <feature.test.version>0.7.0-SNAPSHOT</feature.test.version>
+               <forwardingrulesmanager.version>0.5.0</forwardingrulesmanager.version>
+               <guava.version>14.0.1</guava.version>
+               <ietf-inet-types.version>2010.09.24.7-SNAPSHOT</ietf-inet-types.version>
+               <jacoco.version>0.6.2.201302030002</jacoco.version>
+               <java.version.source>1.7</java.version.source>
+               <java.version.target>1.7</java.version.target>
+               <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
+               <karaf.empty.version>1.5.0-SNAPSHOT</karaf.empty.version>
+               <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
+               <karaf.version>3.0.1</karaf.version>
+               <!-- TODO: Lets remove the variables which are duplicates of ODL or which
+                       are unused. -->
+               <lispflowmapping.version>1.2.0-SNAPSHOT</lispflowmapping.version>
+               <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
+               <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
                <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
+               <nsf.version>0.5.0-SNAPSHOT</nsf.version>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <projectinfo>2.6</projectinfo>
-               <enunciate.version>1.26.2</enunciate.version>
-               <guava.version>14.0.1</guava.version>
-               <build.suffix>1.0.0</build.suffix>
-               <yangtools.binding.version>0.6.1</yangtools.binding.version>
-               <yang.binding.version>0.6.1</yang.binding.version>
-               <yang.version>0.6.1</yang.version>
-               <yang.codegen.version>0.6.1</yang.codegen.version>
-               <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
+               <releaseplugin.version>2.3.2</releaseplugin.version>
+               <sal.version>0.9.0-SNAPSHOT</sal.version>
+               <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
+               <slf4j.version>1.7.2</slf4j.version>
                <sonar.branch>${user.name}-develop</sonar.branch>
+               <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
                <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
                <sonar.language>java</sonar.language>
-               <forwardingrulesmanager.version>0.5.0</forwardingrulesmanager.version>
                <statisticsmanager.version>0.5.0</statisticsmanager.version>
-               <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
-               <java.version.source>1.7</java.version.source>
-               <java.version.target>1.7</java.version.target>
-               <releaseplugin.version>2.3.2</releaseplugin.version>
-               <slf4j.version>1.7.2</slf4j.version>
-               <branding.version>1.1.0-SNAPSHOT</branding.version>
-               <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
-               <karaf.version>3.0.1</karaf.version>
-               <feature.test.version>0.7.0-SNAPSHOT</feature.test.version>
-               <karaf.empty.version>1.5.0-SNAPSHOT</karaf.empty.version>
                <surefire.version>2.16</surefire.version>
+               <xtend.dstdir>src/main/xtend-gen</xtend.dstdir>
+               <yang-jmx-generator.version>1.1.0-SNAPSHOT</yang-jmx-generator.version>
+               <yang.binding.version>0.6.1</yang.binding.version>
+               <yang.codegen.version>0.6.1</yang.codegen.version>
+               <yang.version>0.6.1</yang.version>
+               <yangtools.binding.version>0.6.1</yangtools.binding.version>
+               <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+               <yang.src.path>src/main/yang</yang.src.path>
        </properties>
-       <repositories>
-
-    <!-- OpenDayLight Repo Mirror -->
-    <repository>
-      <id>opendaylight-mirror</id>
-      <name>opendaylight-mirror</name>
-      <url>${nexusproxy}/groups/public/</url>
-      <snapshots>
-          <enabled>false</enabled>
-      </snapshots>
-      <releases>
-          <enabled>true</enabled>
-          <updatePolicy>never</updatePolicy>
-      </releases>
-    </repository>
-    <!-- OpenDayLight Snapshot artifact -->
-    <repository>
-      <id>opendaylight-snapshot</id>
-      <name>opendaylight-snapshot</name>
-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-      <snapshots>
-          <enabled>true</enabled>
-      </snapshots>
-      <releases>
-          <enabled>false</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>opendaylight-snapshot-release</id>
-      <name>opendaylight-snapshot-release</name>
-      <url>${nexusproxy}/repositories/opendaylight.release/</url>
-      <snapshots>
-          <enabled>false</enabled>
-      </snapshots>
-      <releases>
-          <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-                       <id>maven-restlet</id>
-                       <name>Public online Restlet repository</name>
-                       <url>http://maven.restlet.org</url>
-                       <snapshots>
-                               <enabled>true</enabled>
-                               <updatePolicy>never</updatePolicy>
-                       </snapshots>
-               </repository>
-  </repositories>
-  
-    <pluginRepositories>
-    <!-- OpenDayLight Repo Mirror -->
-    <pluginRepository>
-      <id>opendaylight-mirror</id>
-      <name>opendaylight-mirror</name>
-      <url>${nexusproxy}/groups/public/</url>
-      <snapshots>
-          <enabled>false</enabled>
-      </snapshots>
-      <releases>
-          <enabled>true</enabled>
-          <updatePolicy>never</updatePolicy>
-      </releases>
-    </pluginRepository>
-    <!-- OpenDayLight Snapshot artifact -->
-    <pluginRepository>
-      <id>opendaylight-snapshot</id>
-      <name>opendaylight-snapshot</name>
-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-      <snapshots>
-          <enabled>true</enabled>
-      </snapshots>
-      <releases>
-          <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-
-       <distributionManagement>
-               <!-- OpenDayLight Released artifact -->
-               <repository>
-                       <id>opendaylight-release</id>
-                       <url>${nexusproxy}/repositories/opendaylight.release/</url>
-               </repository>
-               <!-- OpenDayLight Snapshot artifact -->
-               <snapshotRepository>
-                       <id>opendaylight-snapshot</id>
-                       <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-               </snapshotRepository>
-               <!-- Site deployment -->
-       </distributionManagement>
 
        <dependencyManagement>
                <dependencies>
+                       <!-- NOTE: the "Type" jar is considered default. You only need to specify
+                               the type when it is something other than jar. -->
+                       <dependency>
+                               <groupId>com.google.guava</groupId>
+                               <artifactId>guava</artifactId>
+                               <version>${guava.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>equinoxSDK381</groupId>
+                               <artifactId>org.eclipse.osgi</artifactId>
+                               <version>3.8.1.v20120830-144521</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>junit</groupId>
+                               <artifactId>junit</artifactId>
+                               <version>4.8.1</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>junit-addons</groupId>
+                               <artifactId>junit-addons</artifactId>
+                               <version>1.4</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.apache.karaf.features</groupId>
+                               <artifactId>framework</artifactId>
+                               <version>${karaf.version}</version>
+                               <type>kar</type>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.hamcrest</groupId>
+                               <artifactId>hamcrest-core</artifactId>
+                               <version>1.3</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.jmock</groupId>
+                               <artifactId>jmock-junit4</artifactId>
+                               <version>2.6.0</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.jmock</groupId>
+                               <artifactId>jmock-legacy</artifactId>
+                               <version>2.6.0</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.opendaylight.controller</groupId>
                                <artifactId>clustering.services</artifactId>
                        </dependency>
                        <dependency>
                                <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>config-util</artifactId>
+                               <artifactId>commons.northbound</artifactId>
+                               <version>0.5.0-SNAPSHOT</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>config-api</artifactId>
                                <version>0.3.0-SNAPSHOT</version>
                        </dependency>
                        <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>threadpool-config-impl</artifactId>
-                       <version>0.3.0-SNAPSHOT</version>
-               </dependency>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>config-manager</artifactId>
+                               <version>${config.version}</version>
+                       </dependency>
                        <dependency>
-                               <groupId>org.opendaylight.yangtools</groupId>
-                               <artifactId>yang-binding</artifactId>
-                               <version>0.7.0-SNAPSHOT</version>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>config-util</artifactId>
+                               <version>0.3.0-SNAPSHOT</version>
                        </dependency>
                        <dependency>
-                               <groupId>org.opendaylight.yangtools</groupId>
-                               <artifactId>yang-common</artifactId>
-                               <version>0.7.0-SNAPSHOT</version>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>containermanager</artifactId>
+                               <version>0.6.0-SNAPSHOT</version>
                        </dependency>
                        <dependency>
-                               <groupId>org.opendaylight.yangtools</groupId>
-                               <artifactId>yang-data-api</artifactId>
-                               <version>0.7.0-SNAPSHOT</version>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>distribution.opendaylight</artifactId>
+                               <version>0.2.0-SNAPSHOT</version>
+                               <classifier>osgipackage</classifier>
+                               <type>zip</type>
+                               <!-- Make sure this isn't included on any classpath -->
                        </dependency>
                        <dependency>
-                               <groupId>org.opendaylight.yangtools</groupId>
-                               <artifactId>yang-model-api</artifactId>
-                               <version>0.7.0-SNAPSHOT</version>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>features-adsal</artifactId>
+                               <version>${sal.version}</version>
+                               <classifier>features</classifier>
+                               <type>xml</type>
                        </dependency>
                        <dependency>
-                               <groupId>org.opendaylight.yangtools</groupId>
-                               <artifactId>yang-data-util</artifactId>
-                               <version>0.7.0-SNAPSHOT</version>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>features-mdsal</artifactId>
+                               <version>${mdsal.version}</version>
+                               <classifier>features</classifier>
+                               <type>xml</type>
                        </dependency>
                        <dependency>
-                               <groupId>org.opendaylight.yangtools.model</groupId>
-                               <artifactId>ietf-inet-types</artifactId>
-                               <version>2010.09.24.7-SNAPSHOT</version>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>features-netconf-connector</artifactId>
+                               <version>${mdsal.version}</version>
+                               <classifier>features</classifier>
+                               <type>xml</type>
                        </dependency>
                        <dependency>
-                               <groupId>org.opendaylight.yangtools.model</groupId>
-                               <artifactId>ietf-yang-types</artifactId>
-                               <version>2010.09.24.7-SNAPSHOT</version>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>features-nsf</artifactId>
+                               <version>${nsf.version}</version>
+                               <classifier>features</classifier>
+                               <type>xml</type>
                        </dependency>
+
                        <dependency>
-                               <groupId>com.google.guava</groupId>
-                               <artifactId>guava</artifactId>
-                               <version>${guava.version}</version>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>karaf.branding</artifactId>
+                               <version>${branding.version}</version>
+                               <scope>compile</scope>
                        </dependency>
                        <dependency>
                                <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal</artifactId>
-                               <version>0.9.0-SNAPSHOT</version>
+                               <artifactId>netty-event-executor-config</artifactId>
+                               <version>${config.version}</version>
                        </dependency>
                        <dependency>
-                               <groupId>junit</groupId>
-                               <artifactId>junit</artifactId>
-                               <version>4.8.1</version>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>networkconfig.neutron</artifactId>
+                               <version>0.5.0-SNAPSHOT</version>
                        </dependency>
                        <dependency>
-                               <groupId>org.hamcrest</groupId>
-                               <artifactId>hamcrest-core</artifactId>
-                               <version>1.3</version>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>opendaylight-karaf-empty</artifactId>
+                               <version>${karaf.empty.version}</version>
+                               <type>zip</type>
                        </dependency>
+
                        <dependency>
-                               <groupId>org.jmock</groupId>
-                               <artifactId>jmock-junit4</artifactId>
-                               <version>2.6.0</version>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>opendaylight-karaf-resources</artifactId>
+                               <version>${karaf.resources.version}</version>
                        </dependency>
                        <dependency>
-                               <groupId>org.jmock</groupId>
-                               <artifactId>jmock-legacy</artifactId>
-                               <version>2.6.0</version>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>sal</artifactId>
+                               <version>0.9.0-SNAPSHOT</version>
                        </dependency>
                        <dependency>
-                               <groupId>junit-addons</groupId>
-                               <artifactId>junit-addons</artifactId>
-                               <version>1.4</version>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>sal-binding-api</artifactId>
+                               <version>${mdsal.version}</version>
                        </dependency>
                        <dependency>
-                               <groupId>equinoxSDK381</groupId>
-                               <artifactId>org.eclipse.osgi</artifactId>
-                               <version>3.8.1.v20120830-144521</version>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>sal-binding-broker-impl</artifactId>
+                               <version>${mdsal.version}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>sal-binding-api</artifactId>
-                                <version>${mdsal.version}</version>
+                               <artifactId>sal-binding-config</artifactId>
+                               <version>${mdsal.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>sal-broker-impl</artifactId>
+                               <version>${mdsal.version}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.opendaylight.controller</groupId>
                                <artifactId>sal-common-util</artifactId>
-                                <version>${mdsal.version}</version>
+                               <version>${mdsal.version}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>config-api</artifactId>
+                               <artifactId>sal-netconf-connector</artifactId>
+                               <version>${mdsal.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>threadpool-config-api</artifactId>
+                               <version>${config.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>threadpool-config-impl</artifactId>
                                <version>0.3.0-SNAPSHOT</version>
                        </dependency>
-            <dependency>
-              <groupId>org.opendaylight.lispflowmapping</groupId>
-              <artifactId>mappingservice.yangmodel</artifactId>
-              <version>${lispflowmapping.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.lispflowmapping</groupId>
-              <artifactId>mappingservice.api</artifactId>
-              <version>${lispflowmapping.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.lispflowmapping</groupId>
-              <artifactId>mappingservice.config</artifactId>
-              <version>${lispflowmapping.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.lispflowmapping</groupId>
-              <artifactId>mappingservice.implementation</artifactId>
-              <version>${lispflowmapping.version}</version>
-            </dependency>
-            <dependency>
-               <groupId>org.opendaylight.lispflowmapping</groupId>
-               <artifactId>mappingservice.clusterdao</artifactId>
-               <version>${lispflowmapping.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.lispflowmapping</groupId>
-              <artifactId>mappingservice.southbound</artifactId>
-              <version>${lispflowmapping.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.lispflowmapping</groupId>
-              <artifactId>mappingservice.northbound</artifactId>
-              <version>${lispflowmapping.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.lispflowmapping</groupId>
-              <artifactId>mappingservice.neutron</artifactId>
-              <version>${lispflowmapping.version}</version>
-            </dependency>            
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>common.unittest.tools</artifactId>
-                       <version>${lispflowmapping.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>common.build.tools</artifactId>
-                       <version>${lispflowmapping.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>lispflowmapping-code-commons</artifactId>
-                       <version>${lispflowmapping.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>lispflowmapping-commons</artifactId>
-                       <version>${lispflowmapping.version}</version>
-               </dependency>
-               
-               <dependency>
-              <groupId>org.opendaylight.lispflowmapping</groupId>
-              <artifactId>mappingservice.netconf</artifactId>
-              <version>${lispflowmapping.version}</version>
-            </dependency>
-               </dependencies>
-       </dependencyManagement>
+                       <dependency>
+                               <groupId>org.opendaylight.lispflowmapping</groupId>
+                               <artifactId>common.build.tools</artifactId>
+                               <version>${lispflowmapping.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.lispflowmapping</groupId>
+                               <artifactId>lispflowmapping-code-commons</artifactId>
+                               <version>${lispflowmapping.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.lispflowmapping</groupId>
+                               <artifactId>lispflowmapping-commons</artifactId>
+                               <version>${lispflowmapping.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.lispflowmapping</groupId>
+                               <artifactId>mappingservice.api</artifactId>
+                               <version>${lispflowmapping.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.lispflowmapping</groupId>
+                               <artifactId>mappingservice.clusterdao</artifactId>
+                               <version>${lispflowmapping.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.lispflowmapping</groupId>
+                               <artifactId>mappingservice.config</artifactId>
+                               <version>${lispflowmapping.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.lispflowmapping</groupId>
+                               <artifactId>mappingservice.implementation</artifactId>
+                               <version>${lispflowmapping.version}</version>
+                       </dependency>
 
-       <reporting>
-               <excludeDefaults>true</excludeDefaults>
-               <outputDirectory>${project.build.directory}/site</outputDirectory>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-project-info-reports-plugin</artifactId>
-                               <version>${projectinfo}</version>
-                               <configuration>
-                                       <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
-                                       <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-                               </configuration>
-                               <reportSets>
-                                       <reportSet>
-                                               <reports>
-                                                       <report>index</report>
-                                                       <report>project-team</report>
-                                                       <report>license</report>
-                                                       <report>mailing-list</report>
-                                                       <report>plugin-management</report>
-                                                       <report>cim</report>
-                                                       <report>issue-tracking</report>
-                                                       <report>scm</report>
-                                                       <report>summary</report>
-                                               </reports>
-                                       </reportSet>
-                               </reportSets>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jxr-plugin</artifactId>
-                               <version>2.3</version>
-                               <configuration>
-                                       <aggregate>true</aggregate>
-                                       <linkJavadoc>true</linkJavadoc>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-javadoc-plugin</artifactId>
-                               <version>2.8.1</version>
-                               <configuration>
-                                       <doclet>org.jboss.apiviz.APIviz</doclet>
-                                       <docletArtifact>
-                                               <groupId>org.jboss.apiviz</groupId>
-                                               <artifactId>apiviz</artifactId>
-                                               <version>1.3.2.GA</version>
-                                       </docletArtifact>
-                                       <finalName>${project.artifactId}-${build.suffix}</finalName>
-                                       <useStandardDocletOptions>true</useStandardDocletOptions>
-                                       <charset>UTF-8</charset>
-                                       <encoding>UTF-8</encoding>
-                                       <docencoding>UTF-8</docencoding>
-                                       <breakiterator>true</breakiterator>
-                                       <version>true</version>
-                                       <author>true</author>
-                                       <keywords>true</keywords>
-                                       <excludePackageNames>*.internal:edu.uci.*</excludePackageNames>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </reporting>
+                       <dependency>
+                               <groupId>org.opendaylight.lispflowmapping</groupId>
+                               <artifactId>mappingservice.netconf</artifactId>
+                               <version>${lispflowmapping.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.lispflowmapping</groupId>
+                               <artifactId>mappingservice.neutron</artifactId>
+                               <version>${lispflowmapping.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.lispflowmapping</groupId>
+                               <artifactId>mappingservice.northbound</artifactId>
+                               <version>${lispflowmapping.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.lispflowmapping</groupId>
+                               <artifactId>mappingservice.southbound</artifactId>
+                               <version>${lispflowmapping.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.lispflowmapping</groupId>
+                               <artifactId>mappingservice.yangmodel</artifactId>
+                               <version>${lispflowmapping.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.yangtools</groupId>
+                               <artifactId>yang-binding</artifactId>
+                               <version>0.7.0-SNAPSHOT</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.yangtools</groupId>
+                               <artifactId>yang-common</artifactId>
+                               <version>0.7.0-SNAPSHOT</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.yangtools</groupId>
+                               <artifactId>yang-data-api</artifactId>
+                               <version>0.7.0-SNAPSHOT</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.yangtools</groupId>
+                               <artifactId>yang-data-impl</artifactId>
+                               <version>${yangtools.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.yangtools</groupId>
+                               <artifactId>yang-data-util</artifactId>
+                               <version>0.7.0-SNAPSHOT</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.yangtools</groupId>
+                               <artifactId>yang-model-api</artifactId>
+                               <version>0.7.0-SNAPSHOT</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.yangtools</groupId>
+                               <artifactId>yang-parser-impl</artifactId>
+                               <version>${yangtools.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.yangtools.model</groupId>
+                               <artifactId>ietf-inet-types</artifactId>
+                               <version>2010.09.24.7-SNAPSHOT</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.yangtools.model</groupId>
+                               <artifactId>ietf-yang-types</artifactId>
+                               <version>2010.09.24.7-SNAPSHOT</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.apache.karaf.features</groupId>
+                               <artifactId>standard</artifactId>
+                               <version>${karaf.version}</version>
+                               <classifier>features</classifier>
+                               <type>xml</type>
+                               <scope>runtime</scope>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.opendaylight.lispflowmapping</groupId>
+                               <artifactId>features-lispflowmapping</artifactId>
+                               <version>${lispflowmapping.version}</version>
+                               <classifier>features</classifier>
+                               <type>xml</type>
+                               <scope>runtime</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.lispflowmapping</groupId>
+                               <artifactId>common.unittest.tools</artifactId>
+                               <version>${lispflowmapping.version}</version>
+                               <scope>test</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.yangtools</groupId>
+                               <artifactId>features-test</artifactId>
+                               <version>${feature.test.version}</version>
+                               <scope>test</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.yangtools</groupId>
+                               <artifactId>mockito-configuration</artifactId>
+                               <version>${yangtools.version}</version>
+                               <scope>test</scope>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
        <build>
                <pluginManagement>
                        <plugins>
-                       <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>${releaseplugin.version}</version>
-        </plugin>
                                <plugin>
-                                       <groupId>org.jacoco</groupId>
-                                       <artifactId>jacoco-maven-plugin</artifactId>
-                                       <version>${jacoco.version}</version>
+                                       <!-- This configures the sort pom plugin to sort properties, dependencies
+                                               etc during a build. It helps to ensure consistent poms that are easy to read.
+                                               While the configuration should exist at a root level it is still up to the
+                                               individual projects to invoke it by defining the plugin in the build->plugins
+                                               section. -->
+                                       <groupId>com.google.code.sortpom</groupId>
+                                       <artifactId>maven-sortpom-plugin</artifactId>
+                                       <version>2.2.1</version>
+                                       <configuration>
+                                               <createBackupFile>false</createBackupFile>
+                                               <encoding>${project.build.sourceEncoding}</encoding>
+                                               <keepBlankLines>true</keepBlankLines>
+                                               <lineSeparator>\n</lineSeparator>
+                                               <nrOfIndentSpace>2</nrOfIndentSpace>
+                                               <predefinedSortOrder>custom_1</predefinedSortOrder>
+                                               <sortDependencies>scope,groupId,artifactId</sortDependencies>
+                                               <sortPlugins>groupId,artifactId</sortPlugins>
+                                               <sortProperties>true</sortProperties>
+                                       </configuration>
+                                       <executions>
+                                               <execution>
+                                                       <goals>
+                                                               <goal>sort</goal>
+                                                       </goals>
+                                                       <phase>verify</phase>
+                                               </execution>
+                                       </executions>
                                </plugin>
                                <plugin>
                                        <groupId>org.apache.felix</groupId>
                                        <version>2.4</version>
                                </plugin>
                                <plugin>
+                                       <!-- TODO move up to ODL parent. -->
+                                       <!-- This is required to make sure that we delete the files which are
+                                               being generated under the src/main directory since by default only files
+                                               under target get cleaned up. Because the clean plugin is automatically invoked
+                                               you do NOT need to specify it in the build->plugin section. You would only
+                                               want to override this if you have additional folders which need to be cleaned
+                                               up. -->
+                                       <artifactId>maven-clean-plugin</artifactId>
+                                       <configuration>
+                                               <filesets>
+                                                       <fileset>
+                                                               <directory>${xtend.dstdir}</directory>
+                                                               <includes>
+                                                                       <include>**</include>
+                                                               </includes>
+                                                       </fileset>
+                                                       <fileset>
+                                                               <directory>${jmxGeneratorPath}</directory>
+                                                               <includes>
+                                                                       <include>**</include>
+                                                               </includes>
+                                                       </fileset>
+                                                       <fileset>
+                                                               <directory>${salGeneratorPath}</directory>
+                                                               <includes>
+                                                                       <include>**</include>
+                                                               </includes>
+                                                       </fileset>
+                                               </filesets>
+                                       </configuration>
+                               </plugin>
+                               <plugin>
+                                       <!-- this should really be defined in odl parent as it defines what
+                                               JRE this is targeted for. -->
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-compiler-plugin</artifactId>
                                        <version>2.3.2</version>
                                        <configuration>
-                                               <source>1.7</source>
-                                               <target>1.7</target>
+                                               <source>${java.version.source}</source>
+                                               <target>${java.version.target}</target>
                                        </configuration>
                                </plugin>
                                <plugin>
+                                       <!-- we are overriding the default version of this plugin here... not
+                                               sure why. -->
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-dependency-plugin</artifactId>
                                        <version>2.8</version>
                                </plugin>
+                               <plugin>
+                                       <!-- Configures the java doc generation. Generally you should not have
+                                               to override this unless you need to exclude other packages etc. -->
+                                       <groupId>org.apache.maven.plugins</groupId>
+                                       <artifactId>maven-javadoc-plugin</artifactId>
+                                       <version>2.8.1</version>
+                                       <configuration>
+                                               <doclet>org.jboss.apiviz.APIviz</doclet>
+                                               <docletArtifact>
+                                                       <groupId>org.jboss.apiviz</groupId>
+                                                       <artifactId>apiviz</artifactId>
+                                                       <version>1.3.2.GA</version>
+                                               </docletArtifact>
+                                               <finalName>${project.artifactId}-${project.version}</finalName>
+                                               <useStandardDocletOptions>true</useStandardDocletOptions>
+                                               <charset>UTF-8</charset>
+                                               <encoding>UTF-8</encoding>
+                                               <docencoding>UTF-8</docencoding>
+                                               <breakiterator>true</breakiterator>
+                                               <version>true</version>
+                                               <author>true</author>
+                                               <keywords>true</keywords>
+                                               <excludePackageNames>net.sf.jnetlib.*:cern.*:corejava:*.internal:edu.uci.*</excludePackageNames>
+                                               <failOnError>false</failOnError>
+                                       </configuration>
+                               </plugin>
+                               <plugin>
+                                       <groupId>org.apache.maven.plugins</groupId>
+                                       <artifactId>maven-jxr-plugin</artifactId>
+                                       <version>2.3</version>
+                                       <configuration>
+                                               <aggregate>true</aggregate>
+                                               <linkJavadoc>true</linkJavadoc>
+                                               <javadocDir>target/apidocs</javadocDir>
+                                       </configuration>
+                               </plugin>
+                               <plugin>
+                                       <groupId>org.apache.maven.plugins</groupId>
+                                       <artifactId>maven-release-plugin</artifactId>
+                                       <version>${releaseplugin.version}</version>
+                               </plugin>
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-surefire-plugin</artifactId>
                                        <version>2.14.1</version>
                                </plugin>
                                <plugin>
-                                       <groupId>org.opendaylight.yangtools</groupId>
-                                       <artifactId>yang-maven-plugin</artifactId>
-                                       <version>0.7.0-SNAPSHOT</version>
+                                       <groupId>org.codehaus.enunciate</groupId>
+                                       <artifactId>maven-enunciate-plugin</artifactId>
+                                       <version>${enunciate.version}</version>
+                                       <configuration>
+                                               <configFile>enunciate.xml</configFile>
+                                       </configuration>
                                        <executions>
                                                <execution>
                                                        <goals>
-                                                               <goal>generate-sources</goal>
+                                                               <goal>docs</goal>
                                                        </goals>
-                                                       <configuration>
-                                                               <yangFilesRootDir>src/main/yang</yangFilesRootDir>
-                                                               <codeGenerators>
-                                                                       <generator>
-                                                                               <codeGeneratorClass>
-                                                                                       org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
-                                                                               </codeGeneratorClass>
-                                                                               <outputBaseDir>
-                                                                                       target/generated-sources/sal
-                                                                               </outputBaseDir>
-                                                                       </generator>
-                                                               </codeGenerators>
-                                                               <inspectDependencies>true</inspectDependencies>
-                                                       </configuration>
                                                </execution>
                                        </executions>
-                                       <dependencies>
-                                               <dependency>
-                                                       <groupId>org.opendaylight.yangtools</groupId>
-                                                       <artifactId>maven-sal-api-gen-plugin</artifactId>
-                                                       <version>0.7.0-SNAPSHOT</version>
-                                                       <type>jar</type>
-                                               </dependency>
-                                       </dependencies>
                                </plugin>
                                <plugin>
+                                       <!-- TODO: This should be in ODL parent -->
                                        <groupId>org.codehaus.mojo</groupId>
                                        <artifactId>build-helper-maven-plugin</artifactId>
-                                       <version>1.7</version>
+                                       <version>1.8</version>
                                        <executions>
                                                <execution>
-                                                       <phase>generate-sources</phase>
+                                                       <id>add-source</id>
                                                        <goals>
                                                                <goal>add-source</goal>
                                                        </goals>
+                                                       <phase>generate-sources</phase>
                                                        <configuration>
                                                                <sources>
-                                                                       <source>target/generated-sources/sal</source>
+                                                                       <source>${yang.src.path}</source>
+                                                                       <source>${jmxGeneratorPath}</source>
+                                                                       <source>${salGeneratorPath}</source>
+                                                                       <source>${xtend.dstdir}</source>
                                                                </sources>
                                                        </configuration>
                                                </execution>
                                        </executions>
                                </plugin>
+
                                <plugin>
                                        <groupId>org.eclipse.m2e</groupId>
                                        <artifactId>lifecycle-mapping</artifactId>
                                                                                </goals>
                                                                        </pluginExecutionFilter>
                                                                        <action>
-                                                                               <ignore />
+                                                                               <ignore></ignore>
                                                                        </action>
                                                                </pluginExecution>
                                                                <pluginExecution>
                                                                                </goals>
                                                                        </pluginExecutionFilter>
                                                                        <action>
-                                                                               <ignore />
+                                                                               <ignore></ignore>
                                                                        </action>
                                                                </pluginExecution>
                                                                <pluginExecution>
                                                                                </goals>
                                                                        </pluginExecutionFilter>
                                                                        <action>
-                                                                               <ignore />
+                                                                               <ignore></ignore>
                                                                        </action>
                                                                </pluginExecution>
                                                                <pluginExecution>
                                                                                </goals>
                                                                        </pluginExecutionFilter>
                                                                        <action>
-                                                                               <ignore />
+                                                                               <ignore></ignore>
                                                                        </action>
                                                                </pluginExecution>
                                                                <pluginExecution>
                                                                                </goals>
                                                                        </pluginExecutionFilter>
                                                                        <action>
-                                                                               <ignore />
+                                                                               <ignore></ignore>
                                                                        </action>
                                                                </pluginExecution>
                                                                <pluginExecution>
                                                                                <artifactId>yang-maven-plugin</artifactId>
                                                                                <versionRange>[0.5,)</versionRange>
                                                                                <goals>
-                                                                                       <goal>generate-sources </goal>
+                                                                                       <goal>generate-sources</goal>
                                                                                </goals>
                                                                        </pluginExecutionFilter>
                                                                        <action>
-                                                                               <ignore />
+                                                                               <ignore></ignore>
                                                                        </action>
                                                                </pluginExecution>
                                                        </pluginExecutions>
                                        </configuration>
                                </plugin>
                                <plugin>
-                                       <groupId>org.codehaus.enunciate</groupId>
-                                       <artifactId>maven-enunciate-plugin</artifactId>
-                                       <version>${enunciate.version}</version>
-                                       <configuration>
-                                               <configFile>enunciate.xml</configFile>
-                                       </configuration>
+                                       <groupId>org.jacoco</groupId>
+                                       <artifactId>jacoco-maven-plugin</artifactId>
+                                       <version>${jacoco.version}</version>
+                               </plugin>
+                               <plugin>
+                                       <!-- here we are defining the default generators for yang You may need
+                                               to override this in child poms if you want to define additional generators,
+                                               such as the JMX generator etc. -->
+                                       <groupId>org.opendaylight.yangtools</groupId>
+                                       <artifactId>yang-maven-plugin</artifactId>
+                                       <version>${yangtools.version}</version>
+                                       <dependencies>
+                                               <dependency>
+                                                       <groupId>org.opendaylight.yangtools</groupId>
+                                                       <artifactId>maven-sal-api-gen-plugin</artifactId>
+                                                       <version>${yangtools.version}</version>
+                                               </dependency>
+                                       </dependencies>
                                        <executions>
                                                <execution>
                                                        <goals>
-                                                               <goal>docs</goal>
+                                                               <goal>generate-sources</goal>
                                                        </goals>
+                                                       <configuration>
+                                                               <yangFilesRootDir>${yang.src.path}</yangFilesRootDir>
+                                                               <codeGenerators>
+                                                                       <generator>
+                                                                               <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
+                                                                               <outputBaseDir>${salGeneratorPath}</outputBaseDir>
+                                                                       </generator>
+                                                               </codeGenerators>
+                                                               <inspectDependencies>true</inspectDependencies>
+                                                       </configuration>
                                                </execution>
                                        </executions>
                                </plugin>
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-javadoc-plugin</artifactId>
-                                       <version>2.8.1</version>
-                                       <configuration>
-                                               <doclet>org.jboss.apiviz.APIviz</doclet>
-                                               <docletArtifact>
-                                                       <groupId>org.jboss.apiviz</groupId>
-                                                       <artifactId>apiviz</artifactId>
-                                                       <version>1.3.2.GA</version>
-                                               </docletArtifact>
-                                               <finalName>${project.artifactId}-1.0.0</finalName>
-                                               <useStandardDocletOptions>true</useStandardDocletOptions>
-                                               <charset>UTF-8</charset>
-                                               <encoding>UTF-8</encoding>
-                                               <docencoding>UTF-8</docencoding>
-                                               <breakiterator>true</breakiterator>
-                                               <version>true</version>
-                                               <author>true</author>
-                                               <keywords>true</keywords>
-                                               <excludePackageNames>net.sf.jnetlib.*:cern.*:corejava:*.internal:edu.uci.*</excludePackageNames>
-                                               <failOnError>false</failOnError>
-                                       </configuration>
-                               </plugin>
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-jxr-plugin</artifactId>
-                                       <version>2.3</version>
-                                       <configuration>
-                                               <aggregate>true</aggregate>
-                                               <linkJavadoc>true</linkJavadoc>
-                                               <javadocDir>target/apidocs</javadocDir>
-                                       </configuration>
-                               </plugin>
                        </plugins>
                </pluginManagement>
                <plugins>
-     <plugin>
-       <groupId>org.jacoco</groupId>
-       <artifactId>jacoco-maven-plugin</artifactId>
-       <configuration>
-         <includes>
-           <include>org.opendaylight.lispflowmapping.*</include> 
-         </includes>
-       </configuration>
-       <executions>
-         <execution>
-           <id>pre-test</id>
-           <goals>
-             <goal>prepare-agent</goal>
-           </goals>
-         </execution>
-         <execution>
-           <id>post-test</id>
-           <goals>
-             <goal>report</goal>
-           </goals>
-           <phase>test</phase>
-         </execution>
-       </executions>
-     </plugin>
-   </plugins>
+
+                       <plugin>
+                               <!-- This should run on ALL projects because it makes eclipse import
+                                       the correct source folders to get rid of hte red x's. This should live in
+                                       ODLPARENT. -->
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>build-helper-maven-plugin</artifactId>
+                       </plugin>
+
+               </plugins>
        </build>
 
+       <reporting>
+               <outputDirectory>${project.build.directory}/site</outputDirectory>
+               <excludeDefaults>true</excludeDefaults>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-javadoc-plugin</artifactId>
+                               <version>2.8.1</version>
+                               <configuration>
+                                       <doclet>org.jboss.apiviz.APIviz</doclet>
+                                       <docletArtifact>
+                                               <groupId>org.jboss.apiviz</groupId>
+                                               <artifactId>apiviz</artifactId>
+                                               <version>1.3.2.GA</version>
+                                       </docletArtifact>
+                                       <finalName>${project.artifactId}-${build.suffix}</finalName>
+                                       <useStandardDocletOptions>true</useStandardDocletOptions>
+                                       <charset>UTF-8</charset>
+                                       <encoding>UTF-8</encoding>
+                                       <docencoding>UTF-8</docencoding>
+                                       <breakiterator>true</breakiterator>
+                                       <version>true</version>
+                                       <author>true</author>
+                                       <keywords>true</keywords>
+                                       <excludePackageNames>*.internal:edu.uci.*</excludePackageNames>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-jxr-plugin</artifactId>
+                               <version>2.3</version>
+                               <configuration>
+                                       <aggregate>true</aggregate>
+                                       <linkJavadoc>true</linkJavadoc>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-project-info-reports-plugin</artifactId>
+                               <version>${projectinfo}</version>
+                               <configuration>
+                                       <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+                                       <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                               </configuration>
+                               <reportSets>
+                                       <reportSet>
+                                               <reports>
+                                                       <report>index</report>
+                                                       <report>project-team</report>
+                                                       <report>license</report>
+                                                       <report>mailing-list</report>
+                                                       <report>plugin-management</report>
+                                                       <report>cim</report>
+                                                       <report>issue-tracking</report>
+                                                       <report>scm</report>
+                                                       <report>summary</report>
+                                               </reports>
+                                       </reportSet>
+                               </reportSets>
+                       </plugin>
+               </plugins>
+       </reporting>
+
+       <distributionManagement>
+               <!-- Note: We want the nexus proxy property here because want to enable
+                       devs to upload this artifact using mvn deploy to other maven repositories. -->
+               <!-- OpenDayLight Released artifact -->
+               <repository>
+                       <id>opendaylight-release</id>
+                       <url>${nexusproxy}/repositories/opendaylight.release/</url>
+               </repository>
+               <!-- OpenDayLight Snapshot artifact -->
+               <snapshotRepository>
+                       <id>opendaylight-snapshot</id>
+                       <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+               </snapshotRepository>
+               <!-- Site deployment -->
+       </distributionManagement>
+
 </project>
index 3cf6f1d7976fb4eef51129b020dc9ac5c2e9775e..90785112eb329adcef21711dc649777717c5b7a2 100644 (file)
@@ -1,52 +1,45 @@
 <?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.2.0-SNAPSHOT</version>
-               <relativePath>../parent</relativePath>
-       </parent>
-       <artifactId>common.unittest.tools</artifactId>
-        <name>Unit Test Tools</name>
-       <packaging>jar</packaging>
-       <scm>
-               <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
-               <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
-               <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
-               <tag>HEAD</tag>
-       </scm>
-       <dependencies>
-               <dependency>
-                       <groupId>equinoxSDK381</groupId>
-                       <artifactId>org.eclipse.osgi</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.hamcrest</groupId>
-                       <artifactId>hamcrest-core</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-               </dependency>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.lispflowmapping</groupId>
+    <artifactId>lispflowmapping-commons</artifactId>
+    <version>1.2.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>
+      <artifactId>org.eclipse.osgi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit-addons</groupId>
+      <artifactId>junit-addons</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-core</artifactId>
+    </dependency>
 
-               <dependency>
-                       <groupId>org.jmock</groupId>
-                       <artifactId>jmock-junit4</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.jmock</groupId>
-                       <artifactId>jmock-legacy</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>junit-addons</groupId>
-                       <artifactId>junit-addons</artifactId>
-               </dependency>
-               <dependency>
-<groupId>org.slf4j</groupId>
-<artifactId>slf4j-api</artifactId>
-<version>${slf4j.version}</version>
-</dependency>
-               
-       </dependencies>
+    <dependency>
+      <groupId>org.jmock</groupId>
+      <artifactId>jmock-junit4</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jmock</groupId>
+      <artifactId>jmock-legacy</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+
+  </dependencies>
 </project>
index 28f6f26587cf4a2fb2ed511e9338501ec301070d..c839838171e736e765c7cdd87397f17cb25e6d02 100644 (file)
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
-    <artifactId>lispflowmapping-commons</artifactId>
+    <artifactId>lispflowmapping-all</artifactId>
     <version>1.2.0-SNAPSHOT</version>
-    <relativePath>../commons/parent</relativePath>
   </parent>
   <artifactId>distribution-karaf</artifactId>
-  <name>LISP Flow Mapping Project - Karaf Distribution</name>
-  <groupId>org.opendaylight.lispflowmapping</groupId>
   <packaging>pom</packaging>
+  <name>LISP Flow Mapping Project - Karaf Distribution</name>
   <prerequisites>
     <maven>3.0</maven>
   </prerequisites>
     <dependency>
       <groupId>org.apache.karaf.features</groupId>
       <artifactId>framework</artifactId>
-      <version>${karaf.version}</version>
       <type>kar</type>
     </dependency>
-    <dependency>
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>standard</artifactId>
-      <version>${karaf.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
 
     <!-- ODL Branding -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>karaf.branding</artifactId>
-      <version>${branding.version}</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>opendaylight-karaf-resources</artifactId>
-      <version>${karaf.resources.version}</version>
     </dependency>
-
-    <!-- Project local feautures -->
-    <!--
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
+      <groupId>org.apache.karaf.features</groupId>
+      <artifactId>standard</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
-    -->
+
+    <!-- Project local feautures -->
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
       <artifactId>features-lispflowmapping</artifactId>
-      <version>${lispflowmapping.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <phase>prepare-package</phase>
+            <configuration>
+              <tasks>
+                <chmod perm="755">
+                  <fileset dir="${project.build.directory}/assembly/bin">
+                    <include name="karaf"></include>
+                    <include name="instance"></include>
+                    <include name="start"></include>
+                    <include name="stop"></include>
+                    <include name="status"></include>
+                    <include name="client"></include>
+                    <include name="shell"></include>
+                  </fileset>
+                </chmod>
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.6</version>
         <executions>
           <execution>
             <id>copy</id>
             </goals>
             <phase>prepare-package</phase>
             <configuration>
-             <outputDirectory>${project.build.directory}/assembly</outputDirectory>
-             <groupId>org.opendaylight.controller</groupId>
-             <includeArtifactIds>opendaylight-karaf-resources</includeArtifactIds>
-             <excludes>META-INF\/**</excludes>
-             <excludeTransitive>true</excludeTransitive>
-             <ignorePermissions>false</ignorePermissions>
+              <outputDirectory>${project.build.directory}/assembly</outputDirectory>
+              <groupId>org.opendaylight.controller</groupId>
+              <includeArtifactIds>opendaylight-karaf-resources</includeArtifactIds>
+              <excludes>META-INF\/**</excludes>
+              <excludeTransitive>true</excludeTransitive>
+              <ignorePermissions>false</ignorePermissions>
             </configuration>
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-            <execution>
-                <phase>prepare-package</phase>
-                <goals>
-                    <goal>run</goal>
-                </goals>
-                <configuration>
-                  <tasks>
-                    <chmod perm="755">
-                        <fileset dir="${project.build.directory}/assembly/bin">
-                          <include name="karaf" />
-                          <include name="instance" />
-                          <include name="start" />
-                          <include name="stop" />
-                          <include name="status" />
-                          <include name="client" />
-                          <include name="shell" />
-                        </fileset>
-                    </chmod>
-                  </tasks>
-                </configuration>
-            </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
-  <scm>
-    <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://git.opendaylight.org/gerrit/gitweb?p=lispflowmapping.git;a=summary</url>
-  </scm>
 </project>
index 18aa31c3bd33584a84a658dd89d71b5e95392790..54492c7949be0f12200f62d83903700aab53a012 100644 (file)
@@ -1,77 +1,70 @@
+<?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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>lispflowmapping-commons</artifactId>
-    <relativePath>../commons/parent</relativePath>
     <version>1.2.0-SNAPSHOT</version>
+    <relativePath>../commons/parent</relativePath>
   </parent>
 
   <artifactId>lispflowmapping-distribution</artifactId>
   <packaging>pom</packaging>
   <name>LISP Flow Mapping Distribution</name>
-
-  <scm>
-    <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
-    <tag>HEAD</tag>
-  </scm>
   <dependencies>
+
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.clusterdao</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.netconf</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.neutron</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.northbound</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.southbound</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.yangmodel</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>distribution.opendaylight</artifactId>
-      <version>0.2.0-SNAPSHOT</version>
-      <type>zip</type>
       <classifier>osgipackage</classifier>
+      <type>zip</type>
       <!-- 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.clusterdao</artifactId>
-               </dependency>
-               
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>mappingservice.southbound</artifactId>
-               </dependency>
-               
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>mappingservice.northbound</artifactId>
-               </dependency>
-               
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>mappingservice.neutron</artifactId>
-               </dependency>
-               
-               <dependency>
-            <groupId>org.opendaylight.lispflowmapping</groupId>
-            <artifactId>mappingservice.netconf</artifactId>
-        </dependency>
-               
   </dependencies>
 
   <build>
         <directory>${basedir}/src/main/resources</directory>
       </resource>
       <resource>
-        <directory>${project.build.directory}/generated-resources</directory>
         <filtering>true</filtering>
+        <directory>${project.build.directory}/generated-resources</directory>
       </resource>
     </resources>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
+        <artifactId>maven-assembly-plugin</artifactId>
         <executions>
           <execution>
-            <id>unpack-shared-resources</id>
+            <id>distro-assembly</id>
             <goals>
-              <goal>unpack-dependencies</goal>
+              <goal>single</goal>
             </goals>
-            <phase>generate-resources</phase>
+            <phase>package</phase>
             <configuration>
-             <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
-             <includeArtifacIds>distribution.opendaylight</includeArtifacIds>
-             <includeGroupIds>org.opendaylight.controller</includeGroupIds>
-             <excludeTransitive>true</excludeTransitive>
+              <descriptors>
+                <descriptor>src/assemble/bin.xml</descriptor>
+              </descriptors>
             </configuration>
           </execution>
         </executions>
       </plugin>
       <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
-            <id>distro-assembly</id>
-            <phase>package</phase>
+            <id>unpack-shared-resources</id>
             <goals>
-              <goal>single</goal>
+              <goal>unpack-dependencies</goal>
             </goals>
+            <phase>generate-resources</phase>
             <configuration>
-              <descriptors>
-                <descriptor>src/assemble/bin.xml</descriptor>
-              </descriptors>
+              <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
+              <includeArtifacIds>distribution.opendaylight</includeArtifacIds>
+              <includeGroupIds>org.opendaylight.controller</includeGroupIds>
+              <excludeTransitive>true</excludeTransitive>
             </configuration>
           </execution>
         </executions>
index 171a56b544f00f42a5ffd5fc025dd547b2dfa08d..16c3e0667c10e4de03fadccecf1aa020bc445e3e 100644 (file)
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
-    <artifactId>lispflowmapping-commons</artifactId>
+    <artifactId>lispflowmapping-all</artifactId>
     <version>1.2.0-SNAPSHOT</version>
-    <relativePath>../commons/parent</relativePath>
   </parent>
   <artifactId>features-lispflowmapping</artifactId>
-  <name>LISP Flow Mapping Project - Karaf Features</name>
   <packaging>jar</packaging>
+  <name>LISP Flow Mapping Project - Karaf Features</name>
   <properties>
     <features.file>features.xml</features.file>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <version>${mdsal.version}</version>
+      <artifactId>features-adsal</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-adsal</artifactId>
-      <version>${sal.version}</version>
+      <artifactId>features-mdsal</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-nsf</artifactId>
-      <version>${nsf.version}</version>
+      <artifactId>features-netconf-connector</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-netconf-connector</artifactId>
-      <version>${mdsal.version}</version>
+      <artifactId>features-nsf</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <!-- test to validate features.xml -->
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-test</artifactId>
-      <version>${feature.test.version}</version>
-      <scope>test</scope>
-    </dependency>
     <!-- dependency for opendaylight-karaf-empty for use by testing -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>opendaylight-karaf-empty</artifactId>
-      <version>${karaf.empty.version}</version>
       <type>zip</type>
     </dependency>
+
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
-      <artifactId>mappingservice.yangmodel</artifactId>
+      <artifactId>mappingservice.api</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
-      <artifactId>mappingservice.api</artifactId>
+      <artifactId>mappingservice.clusterdao</artifactId>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
       <artifactId>mappingservice.implementation</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
-      <artifactId>mappingservice.clusterdao</artifactId>
+      <artifactId>mappingservice.netconf</artifactId>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
-      <artifactId>mappingservice.southbound</artifactId>
+      <artifactId>mappingservice.neutron</artifactId>
     </dependency>
 
     <dependency>
 
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
-      <artifactId>mappingservice.netconf</artifactId>
+      <artifactId>mappingservice.southbound</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
-      <artifactId>mappingservice.neutron</artifactId>
+      <artifactId>mappingservice.yangmodel</artifactId>
     </dependency>
     <!-- error : java.lang.NoSuchMethodError: org.slf4j.helpers.MessageFormatter.format(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Lorg/slf4j/helpers/FormattingTuple; -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.7.2</version>
+    </dependency>
+    <!-- test to validate features.xml -->
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>features-test</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
   <build>
     <resources>
       <resource>
-        <directory>src/main/resources</directory>
         <filtering>true</filtering>
+        <directory>src/main/resources</directory>
       </resource>
     </resources>
     <plugins>
-       <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <executions>
-             <execution>
-                <id>filter</id>
-                <phase>generate-resources</phase>
-                <goals>
-                   <goal>resources</goal>
-                </goals>
-             </execution>
-          </executions>
-       </plugin>
-       <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>build-helper-maven-plugin</artifactId>
-          <executions>
-             <execution>
-                <id>attach-artifacts</id>
-                <phase>package</phase>
-                <goals>
-                   <goal>attach-artifact</goal>
-                </goals>
-                <configuration>
-                   <artifacts>
-                      <artifact>
-                         <file>${project.build.directory}/classes/${features.file}</file>
-                         <type>xml</type>
-                         <classifier>features</classifier>
-                      </artifact>
-                   </artifacts>
-                </configuration>
-             </execution>
-          </executions>
-       </plugin>
-       <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>${surefire.version}</version>
-          <configuration>
-            <systemPropertyVariables>
-              <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
-              <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-              <karaf.distro.version>${karaf.empty.version}</karaf.distro.version>
-            </systemPropertyVariables>
-            <dependenciesToScan>
-             <dependency>org.opendaylight.yangtools:features-test</dependency>
-            </dependenciesToScan>
-          </configuration>
-        </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>filter</id>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+            <phase>generate-resources</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
+            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
+            <karaf.distro.version>${karaf.empty.version}</karaf.distro.version>
+          </systemPropertyVariables>
+          <dependenciesToScan>
+            <dependency>org.opendaylight.yangtools:features-test</dependency>
+          </dependenciesToScan>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-artifacts</id>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>${project.build.directory}/classes/${features.file}</file>
+                  <type>xml</type>
+                  <classifier>features</classifier>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
-  <scm>
-    <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
-   </scm>
 </project>
index cde400595062f6e741169bce70c0981fe063916c..5ab6f81af0b572c0bd0363570204aa4b8840bafa 100644 (file)
@@ -1,40 +1,47 @@
 <?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.2.0-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>mappingservice.api</artifactId>
-        <name>LISP Flow Mapping Public APIs</name>
-       <packaging>bundle</packaging>
-       <scm>
-               <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
-               <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
-               <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
-               <tag>HEAD</tag>
-       </scm>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <!--version>2.3.6</version -->
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package>
-                                                       org.opendaylight.lispflowmapping.interfaces.dao,
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.lispflowmapping</groupId>
+    <artifactId>mappingservice-parent</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>mappingservice.api</artifactId>
+  <packaging>bundle</packaging>
+  <name>LISP Flow Mapping 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>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-common-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.yangmodel</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>org.opendaylight.lispflowmapping.interfaces.dao,
                                                        org.opendaylight.lispflowmapping.interfaces.lisp,
                                                        org.opendaylight.lispflowmapping.type,
                                                        org.opendaylight.lispflowmapping.type.lisp,
                                                        org.opendaylight.lispflowmapping.type.lisp.address,
-                                                       org.opendaylight.lispflowmapping.type.sbplugin
-                                               </Export-Package>
-                                               <Import-Package>
-                                                       org.opendaylight.yang.gen.v1.lispflowmapping.rev131031,
+                                                       org.opendaylight.lispflowmapping.type.sbplugin</Export-Package>
+            <Import-Package>org.opendaylight.yang.gen.v1.lispflowmapping.rev131031,
                                                        org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress,
                                                        org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress.lispaddresscontainer,
                                                        org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.locatorrecords,
                                                        javax.xml.bind.annotation,
                                                        org.slf4j,
                                                        org.opendaylight.yangtools.yang.common,
-                                                       com.google.common.collect
-                                               </Import-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>build-helper-maven-plugin</artifactId>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal-binding-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal-common-util</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>mappingservice.yangmodel</artifactId>
-               </dependency>
-       </dependencies>
+                                                       com.google.common.collect</Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
index 08ed86b0646adcc3e19db0d66c92d523b8b8268a..0c8576ab497764485c8113adb0b166b575fef25e 100644 (file)
@@ -1,60 +1,46 @@
 <?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.2.0-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>mappingservice.clusterdao</artifactId>
-        <name>LISP Flow Mapping Cluster DAO</name>
-       <packaging>bundle</packaging>
-       <scm>
-               <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
-               <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
-               <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
-               <tag>HEAD</tag>
-       </scm>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package>
-                                                       org.opendaylight.lispflowmapping.clusterdao
-                                               </Export-Package>
-                                               <Import-Package>
-                                                       org.apache.felix.dm,
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.lispflowmapping</groupId>
+    <artifactId>mappingservice-parent</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>mappingservice.clusterdao</artifactId>
+  <packaging>bundle</packaging>
+  <name>LISP Flow Mapping Cluster DAO</name>
+  <dependencies>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>clustering.services</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.api</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>org.opendaylight.lispflowmapping.clusterdao</Export-Package>
+            <Import-Package>org.apache.felix.dm,
                                                        org.opendaylight.controller.clustering.services,
                                                        org.opendaylight.controller.sal.core,
-                                                       org.opendaylight.lispflowmapping.interfaces.dao, org.slf4j
-                                               </Import-Package>
-                                               <Bundle-Activator>
-                                                       org.opendaylight.lispflowmapping.clusterdao.Activator
-                                               </Bundle-Activator>
-                                               <Service-Component>
-                                               </Service-Component>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>clustering.services</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>mappingservice.api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>equinoxSDK381</groupId>
-                       <artifactId>org.eclipse.osgi</artifactId>
-               </dependency>
-       </dependencies>
+                                                       org.opendaylight.lispflowmapping.interfaces.dao, org.slf4j</Import-Package>
+            <Bundle-Activator>org.opendaylight.lispflowmapping.clusterdao.Activator</Bundle-Activator>
+            <Service-Component></Service-Component>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
index 95a536ed0703a2a3be3c5ae8a9a8311809491e9c..578f1657138ce3f37572ae9542ad7fd3b75c1abd 100644 (file)
@@ -1,92 +1,97 @@
-<?xml version="1.0"?>
-<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>
-               <artifactId>lispflowmapping-commons</artifactId>
-               <groupId>org.opendaylight.lispflowmapping</groupId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath>../../commons/parent</relativePath>
-       </parent>
-       <artifactId>mappingservice.config</artifactId>
-       <name>LISP Flow Mapping Config Subsystem</name>
-       <packaging>bundle</packaging>
-       <scm>
-               <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
-               <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
-               <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
-               <tag>HEAD</tag>
-       </scm>
-       <prerequisites>
-               <maven>3.0.4</maven>
-       </prerequisites>
-       <properties>
-               <jmxGeneratorPath>${project.build.directory}/generated-sources/config</jmxGeneratorPath>
-       </properties>
-       <build>
-               <pluginManagement>
-                       <plugins>
-                               <plugin>
-                                       <groupId>org.opendaylight.yangtools</groupId>
-                                       <artifactId>yang-maven-plugin</artifactId>
-                                       <version>0.7.0-SNAPSHOT</version>
-                                       <executions>
-                                               <execution>
-                                                       <goals>
-                                                               <goal>generate-sources</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <codeGenerators>
-                                                                       <generator>
-                                                                               <codeGeneratorClass>
-                                                                                       org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-                                                                               </codeGeneratorClass>
-                                                                               <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
-                                                                               <additionalConfiguration>
-                                                                                       <namespaceToPackage1>
-                                                                                               lispconfig==org.opendaylight.lispflowmapping.config.yang
-                                                                                       </namespaceToPackage1>
-                                                                               </additionalConfiguration>
-                                                                       </generator>
-                                                                       <generator>
-                                                                               <codeGeneratorClass>
-                                                                                       org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
-                                                                               </codeGeneratorClass>
-                                                                               <outputBaseDir>
-                                                                                       target/generated-sources/sal
-                                                                               </outputBaseDir>
-                                                                       </generator>
-                                                               </codeGenerators>
-                                                               <inspectDependencies>true</inspectDependencies>
-                                                       </configuration>
-                                               </execution>
-                                       </executions>
-                                       <dependencies>
-                                               <dependency>
-                                                       <groupId>org.opendaylight.controller</groupId>
-                                                       <artifactId>yang-jmx-generator-plugin</artifactId>
-                                                       <version>0.3.0-SNAPSHOT</version>
-                                               </dependency>
-                                               <dependency>
-                                                       <groupId>org.opendaylight.yangtools</groupId>
-                                                       <artifactId>maven-sal-api-gen-plugin</artifactId>
-                                                       <version>0.7.0-SNAPSHOT</version>
-                                                       <type>jar</type>
-                                               </dependency>
-                                       </dependencies>
-                               </plugin>
-                       </plugins>
-               </pluginManagement>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <configuration>
-                                       <instructions>
-                                               <Private-Package>
-                                               </Private-Package>
-                                               <Import-Package>
-                                                       ch.qos.logback.classic,
+<?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.2.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>mappingservice.config</artifactId>
+  <packaging>bundle</packaging>
+  <name>LISP Flow Mapping Config Subsystem</name>
+  <prerequisites>
+    <maven>3.0.4</maven>
+  </prerequisites>
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>config-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-binding</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools.model</groupId>
+      <artifactId>ietf-inet-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools.model</groupId>
+      <artifactId>ietf-yang-types</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.opendaylight.yangtools</groupId>
+          <artifactId>yang-maven-plugin</artifactId>
+          <version>0.7.0-SNAPSHOT</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.opendaylight.controller</groupId>
+              <artifactId>yang-jmx-generator-plugin</artifactId>
+              <version>0.3.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+              <groupId>org.opendaylight.yangtools</groupId>
+              <artifactId>maven-sal-api-gen-plugin</artifactId>
+              <version>0.7.0-SNAPSHOT</version>
+              <type>jar</type>
+            </dependency>
+          </dependencies>
+          <executions>
+            <execution>
+              <goals>
+                <goal>generate-sources</goal>
+              </goals>
+              <configuration>
+                <codeGenerators>
+                  <generator>
+                    <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>
+                    <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
+                    <additionalConfiguration>
+                      <namespaceToPackage1>lispconfig==org.opendaylight.lispflowmapping.config.yang</namespaceToPackage1>
+                    </additionalConfiguration>
+                  </generator>
+                  <generator>
+                    <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
+                    <outputBaseDir>${salGeneratorPath}</outputBaseDir>
+                  </generator>
+                </codeGenerators>
+                <inspectDependencies>true</inspectDependencies>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Private-Package></Private-Package>
+            <Import-Package>ch.qos.logback.classic,
                                                        ch.qos.logback.classic.encoder,
                                                        ch.qos.logback.classic.filter,
                                                        ch.qos.logback.classic.spi,
                                                        org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.rev130405,
                                                        org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.rev130405.modules.module,
                                                        org.opendaylight.yangtools.yang.binding,
-                                                       org.opendaylight.yangtools.yang.common
-                                               </Import-Package>
-                                               <Export-Package>
-                                                       org.opendaylight.lispflowmapping.config.yang,
-                                                       org.opendaylight.yang.gen.v1.lispconfig.rev131107.*
-                                               </Export-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.opendaylight.yangtools</groupId>
-                               <artifactId>yang-maven-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>build-helper-maven-plugin</artifactId>
-                               <version>1.8</version>
-                               <executions>
-                                       <execution>
-                                               <id>add-source</id>
-                                               <phase>generate-sources</phase>
-                                               <goals>
-                                                       <goal>add-source</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <sources>
-                                                               <source>${project.build.directory}/generated-sources/config</source>
-                                                       </sources>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.opendaylight.yangtools.model</groupId>
-                       <artifactId>ietf-inet-types</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.yangtools.model</groupId>
-                       <artifactId>ietf-yang-types</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>mappingservice.api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.yangtools</groupId>
-                       <artifactId>yang-binding</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.yangtools</groupId>
-                       <artifactId>yang-common</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>config-api</artifactId>
-               </dependency>
-       </dependencies>
+                                                       org.opendaylight.yangtools.yang.common</Import-Package>
+            <Export-Package>org.opendaylight.lispflowmapping.config.yang,
+                                                       org.opendaylight.yang.gen.v1.lispconfig.rev131107.*</Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yang-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
index 5d94736a3f04d44961aa6654da6b12b31ed753e7..e6f2894a25e3847670f36f743f4788350ef51b8e 100644 (file)
@@ -1,37 +1,65 @@
 <?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.2.0-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>mappingservice.implementation</artifactId>
-        <name>LISP Flow Mapping Implementation</name>
-       <packaging>bundle</packaging>
-       <scm>
-               <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
-               <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
-               <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
-               <tag>HEAD</tag>
-       </scm>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package>
-                                                       org.opendaylight.lispflowmapping.implementation,
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.lispflowmapping</groupId>
+    <artifactId>mappingservice-parent</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>mappingservice.implementation</artifactId>
+  <packaging>bundle</packaging>
+  <name>LISP Flow Mapping Implementation</name>
+  <dependencies>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-common-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.yangmodel</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools.model</groupId>
+      <artifactId>ietf-inet-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools.model</groupId>
+      <artifactId>ietf-yang-types</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>org.opendaylight.lispflowmapping.implementation,
                                                        org.opendaylight.lispflowmapping.implementation.dao,
                                                        org.opendaylight.lispflowmapping.implementation.serializer,
-                                                       org.opendaylight.lispflowmapping.implementation.util
-                                               </Export-Package>
-                                               <Import-Package>
-                                                       javax.xml.bind,
+                                                       org.opendaylight.lispflowmapping.implementation.util</Export-Package>
+            <Import-Package>javax.xml.bind,
                                                        javax.xml.bind.annotation,
                                                        org.opendaylight.yang.gen.v1.lispflowmapping.rev131031,
                                                        org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.eidrecords,
                                                        javax.crypto.spec,
                                                        org.opendaylight.controller.sal.binding.api,
                                                        org.opendaylight.yangtools.yang.binding,
-                                                       org.opendaylight.yangtools.concepts
-                                               </Import-Package>
-                                               <Bundle-Activator>
-                                                       org.opendaylight.lispflowmapping.implementation.Activator
-                                               </Bundle-Activator>
-                                               <Service-Component>
-                                               </Service-Component>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-       <dependency>
-                       <groupId>org.opendaylight.yangtools.model</groupId>
-                       <artifactId>ietf-inet-types</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.yangtools.model</groupId>
-                       <artifactId>ietf-yang-types</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal-binding-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal-common-util</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.hamcrest</groupId>
-                       <artifactId>hamcrest-core</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal</artifactId>
-               </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>equinoxSDK381</groupId>
-                       <artifactId>org.eclipse.osgi</artifactId>
-               </dependency>
-       </dependencies>
+                                                       org.opendaylight.yangtools.concepts</Import-Package>
+            <Bundle-Activator>org.opendaylight.lispflowmapping.implementation.Activator</Bundle-Activator>
+            <Service-Component></Service-Component>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
index baeb12a86153b894fc1c3a5d8fdfdf62a5c3f39d..c49985a84e569fc2ef166581e788ef6a7a90aece 100644 (file)
       </plugin>
     </plugins>
   </build>
-  <scm>
-    <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
-  </scm>
 
   <repositories>
     <!-- OpenDayLight Released artifact -->
index 3510dc7067141f35f3dd122ebe65a966c79addae..cb4a8e44f4d4c0740074ffd131e48d84632c9042 100644 (file)
-<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.2.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-    <artifactId>mappingservice.netconf</artifactId>
-    <name>LISP Flow Mapping Netconf Connector</name>
-    <packaging>bundle</packaging>
-    <scm>
-        <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
-        <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
-        <tag>HEAD</tag>
-    </scm>
+<?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.2.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>mappingservice.netconf</artifactId>
+  <packaging>bundle</packaging>
+  <name>LISP Flow Mapping Netconf Connector</name>
 
-    <properties>
-        <ietf-inet-types.version>2010.09.24.7-SNAPSHOT</ietf-inet-types.version>
-        <yang-jmx-generator.version>1.1.0-SNAPSHOT</yang-jmx-generator.version>
-        <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-        <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-        <config.version>0.3.0-SNAPSHOT</config.version>
-        <osgi.core.version>5.0.0</osgi.core.version>
-        <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
-        <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
-    </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>config-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>config-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>config-manager</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>config-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>netty-event-executor-config</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-broker-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-config</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-broker-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-common-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-netconf-connector</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>threadpool-config-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>threadpool-config-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-binding</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-data-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-parser-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools.model</groupId>
+      <artifactId>ietf-inet-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+    </dependency>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-netconf-connector</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-broker-impl</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-event-executor-config</artifactId>
-            <version>${config.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>threadpool-config-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>threadpool-config-api</artifactId>
-            <version>${config.version}</version>
-        </dependency>
-        <dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>mockito-configuration</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Private-Package>org.opendaylight.lispflowmapping.netconf.impl,
+                            org.opendaylight.lispflowmapping.config.yang.netconf.impl,</Private-Package>
+            <Export-Package>org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lispflowmapping.netconf.rev140706.*,
+                            org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lispflowmapping.netconf.impl.rev140706.*,</Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yang-maven-plugin</artifactId>
+        <dependencies>
+          <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
+            <artifactId>yang-jmx-generator-plugin</artifactId>
             <version>${config.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>ietf-inet-types</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</artifactId>
-        </dependency>
-        <dependency>
+          </dependency>
+          <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-binding</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-util</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-data-impl</artifactId>
-            <version>${yangtools.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-parser-impl</artifactId>
+            <artifactId>maven-sal-api-gen-plugin</artifactId>
             <version>${yangtools.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
+            <type>jar</type>
+          </dependency>
+          <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <version>${osgi.core.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
-            <version>${yangtools.version}</version>
-        </dependency>
-
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Private-Package>
-                            org.opendaylight.lispflowmapping.netconf.impl,
-                            org.opendaylight.lispflowmapping.config.yang.netconf.impl,
-                        </Private-Package>
-                        <Export-Package>
-                            org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lispflowmapping.netconf.rev140706.*,
-                            org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lispflowmapping.netconf.impl.rev140706.*,
-                        </Export-Package>
-                    </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>
-                            <goal>generate-sources</goal>
-                        </goals>
-                        <configuration>
-                            <yangFilesRootDir>src/main/yang</yangFilesRootDir>
-                            <codeGenerators>
-                                <generator>
-                                    <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
-                                    <outputBaseDir>${salGeneratorPath}</outputBaseDir>
-                                </generator>
-                                <generator>
-                                    <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>
-                                    <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
-                                    <additionalConfiguration>
-                                        <namespaceToPackage1>urn:opendaylight:params:xml:ns:yang:lispflowmapping==org.opendaylight.lispflowmapping.config.yang</namespaceToPackage1>
-                                        <namespaceToPackage2>urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang</namespaceToPackage2>
-                                    </additionalConfiguration>
-                                </generator>
-                            </codeGenerators>
-                            <inspectDependencies>true</inspectDependencies>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+          </dependency>
+        </dependencies>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate-sources</goal>
+            </goals>
+            <configuration>
+              <yangFilesRootDir>src/main/yang</yangFilesRootDir>
+              <codeGenerators>
+                <generator>
+                  <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
+                  <outputBaseDir>${salGeneratorPath}</outputBaseDir>
+                </generator>
+                <generator>
+                  <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>
+                  <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
+                  <additionalConfiguration>
+                    <namespaceToPackage1>urn:opendaylight:params:xml:ns:yang:lispflowmapping==org.opendaylight.lispflowmapping.config.yang</namespaceToPackage1>
+                    <namespaceToPackage2>urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang</namespaceToPackage2>
+                  </additionalConfiguration>
+                </generator>
+              </codeGenerators>
+              <inspectDependencies>true</inspectDependencies>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
-
-
index a6464ca1fb6f29de1be84d69d8d56fd21939f795..adcefb02c4fac0567ef03d7118f104390b0466c7 100644 (file)
@@ -1,33 +1,58 @@
 <?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.2.0-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>mappingservice.neutron</artifactId>
-        <name>LISP Flow Mapping Neutron APIs</name>
-       <packaging>bundle</packaging>
-       <scm>
-               <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
-               <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
-               <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
-               <tag>HEAD</tag>
-       </scm>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package>
-                                               </Export-Package>
-                                               <Import-Package>
-                                                       org.opendaylight.controller.sal.core,
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.lispflowmapping</groupId>
+    <artifactId>mappingservice-parent</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>mappingservice.neutron</artifactId>
+  <packaging>bundle</packaging>
+  <name>LISP Flow Mapping Neutron APIs</name>
+  <dependencies>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>commons.northbound</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>containermanager</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>networkconfig.neutron</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.yangmodel</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools.model</groupId>
+      <artifactId>ietf-inet-types</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package></Export-Package>
+            <Import-Package>org.opendaylight.controller.sal.core,
                                                        org.opendaylight.controller.sal.utils,
                                                        org.opendaylight.controller.containermanager,
                                                        org.opendaylight.controller.switchmanager,
                                                        org.apache.commons.lang3.builder,
                                                        org.osgi.service.component,
                                                        org.eclipse.osgi.framework.console,
-                                                       org.osgi.framework,
-                                               </Import-Package>
-                                               <Bundle-Activator>
-                                                       org.opendaylight.lispflowmapping.neutron.Activator
-                                               </Bundle-Activator>
+                                                       org.osgi.framework,</Import-Package>
+            <Bundle-Activator>org.opendaylight.lispflowmapping.neutron.Activator</Bundle-Activator>
 
-                                               <Export-Package>
-                                               </Export-Package>
-                                       </instructions>
-                                       <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>  
-               <dependency>
-                       <groupId>equinoxSDK381</groupId>
-                       <artifactId>org.eclipse.osgi</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>mappingservice.api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>containermanager</artifactId>
-                       <version>0.6.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>commons.northbound</artifactId>
-                       <version>0.5.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>networkconfig.neutron</artifactId>
-                       <version>0.5.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>mappingservice.yangmodel</artifactId>
-               </dependency>           
-               <dependency>
-                       <groupId>org.opendaylight.yangtools.model</groupId>
-                       <artifactId>ietf-inet-types</artifactId>
-               </dependency>
-       </dependencies>         
+            <Export-Package></Export-Package>
+          </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
index ffe5aeb20fe10ceae2e127f40ef85f1e5b06dfea..4b912bf3ebdcca382d4125e3dc9f5532cf428bd2 100644 (file)
@@ -1,47 +1,59 @@
 <?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.2.0-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>mappingservice.northbound</artifactId>
-        <name>LISP Flow Mapping Northbound APIs</name>
-       <packaging>bundle</packaging>
-       <scm>
-               <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
-               <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
-               <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
-               <tag>HEAD</tag>
-       </scm>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.codehaus.enunciate</groupId>
-                               <artifactId>maven-enunciate-plugin</artifactId>
-                               <version>${enunciate.version}</version>
-                               <!-- <dependencies> <dependency> <groupId>org.opendaylight.controller</groupId> 
-                                       <artifactId>sal</artifactId> <version>0.5.0</version> </dependency> 
-                                       <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>clustering.services</artifactId> 
-                                       <version>0.4.0</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> 
-                                       <artifactId>configuration</artifactId> <version>0.4.0</version> 
-                                       </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> 
-                                       <artifactId>switchmanager</artifactId> <version>0.7.0</version> 
-                                       </dependency> </dependencies> -->
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>2.4.0</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package>
-                                               </Export-Package>
-                                               <Import-Package>
-                                                       org.opendaylight.controller.sal.core,
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.lispflowmapping</groupId>
+    <artifactId>mappingservice-parent</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>mappingservice.northbound</artifactId>
+  <packaging>bundle</packaging>
+  <name>LISP Flow Mapping Northbound APIs</name>
+  <dependencies>
+
+    <dependency>
+      <groupId>org.codehaus.enunciate</groupId>
+      <artifactId>enunciate-core-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>commons.northbound</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>containermanager</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.controller.thirdparty</groupId>
+      <artifactId>com.sun.jersey.jersey-servlet</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.yangmodel</artifactId>
+    </dependency>
+
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package></Export-Package>
+            <Import-Package>org.opendaylight.controller.sal.core,
                                                        org.opendaylight.controller.sal.utils,
                                                        org.opendaylight.controller.containermanager,
                                                        org.opendaylight.controller.switchmanager,
                                                        org.apache.commons.lang3.builder,
                                                        org.osgi.service.component,
                                                        org.eclipse.osgi.framework.console,
-                                                       org.osgi.framework
-                                               </Import-Package>
-                                               <Bundle-Activator>
-                                                       org.opendaylight.lispflowmapping.northbound.Activator
-                                               </Bundle-Activator>
-
-                                               <Export-Package>
-                                               </Export-Package>
-                                               <Web-ContextPath>/lispflowmapping/nb/v2</Web-ContextPath>
-                                               <Jaxrs-Resources>,${classes;ANNOTATION;javax.ws.rs.Path}</Jaxrs-Resources>
-                                       </instructions>
-                                       <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-
-               <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.controller</groupId>
-                       <artifactId>sal</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>containermanager</artifactId>
-                       <version>0.6.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>commons.northbound</artifactId>
-                       <version>0.5.0-SNAPSHOT</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.opendaylight.controller.thirdparty</groupId>
-                       <artifactId>com.sun.jersey.jersey-servlet</artifactId>
-                       <version>1.17</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.codehaus.enunciate</groupId>
-                       <artifactId>enunciate-core-annotations</artifactId>
-                       <version>${enunciate.version}</version>
-               </dependency>
+                                                       org.osgi.framework</Import-Package>
+            <Bundle-Activator>org.opendaylight.lispflowmapping.northbound.Activator</Bundle-Activator>
 
-       </dependencies>
+            <Export-Package></Export-Package>
+            <Web-ContextPath>/lispflowmapping/nb/v2</Web-ContextPath>
+            <Jaxrs-Resources>,${classes;ANNOTATION;javax.ws.rs.Path}</Jaxrs-Resources>
+          </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.enunciate</groupId>
+        <artifactId>maven-enunciate-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
index 036d4a7711f6b66212d5aea1c61d6b01fb40c778..5eb7bad6e238730e8bfd5168a38371f5bb531c2a 100644 (file)
@@ -1,61 +1,55 @@
 <?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-code-commons</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath>../commons/code-parent</relativePath>
-       </parent>
-       <artifactId>mappingservice-parent</artifactId>
-        <name>LISP Flow Mapping Parent POM</name>
-       <packaging>pom</packaging>
-       <scm>
-               <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
-               <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
-               <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
-               <tag>HEAD</tag>
-       </scm>
-        <modules>
-               <module>yangmodel</module>
-                <module>api</module>
-                <module>config</module>
-                <module>clusterdao</module>
-                <module>implementation</module>
-                <module>southbound</module>
-                <module>northbound</module>
-                <module>neutron</module>
-                <module>netconf</module>
-                <module>integrationtest</module>
-        </modules>
-       <dependencies>
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>common.unittest.tools</artifactId>
-               </dependency>
-                       <dependency>
-                               <groupId>junit</groupId>
-                               <artifactId>junit</artifactId>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.hamcrest</groupId>
-                               <artifactId>hamcrest-core</artifactId>
-                               <scope>test</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.jmock</groupId>
-                               <artifactId>jmock-junit4</artifactId>
-                               <scope>test</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.jmock</groupId>
-                               <artifactId>jmock-legacy</artifactId>
-                               <scope>test</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>junit-addons</groupId>
-                               <artifactId>junit-addons</artifactId>
-                               <scope>test</scope>
-                       </dependency>
-       </dependencies>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.lispflowmapping</groupId>
+    <artifactId>lispflowmapping-all</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+    <!-- <relativePath>../commons/parent</relativePath> -->
+  </parent>
+  <artifactId>mappingservice-parent</artifactId>
+  <packaging>pom</packaging>
+  <name>LISP Flow Mapping Parent POM</name>
+  <modules>
+    <module>yangmodel</module>
+    <module>api</module>
+    <module>config</module>
+    <module>clusterdao</module>
+    <module>implementation</module>
+    <module>southbound</module>
+    <module>northbound</module>
+    <module>neutron</module>
+    <module>netconf</module>
+    <module>integrationtest</module>
+  </modules>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>common.unittest.tools</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit-addons</groupId>
+      <artifactId>junit-addons</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jmock</groupId>
+      <artifactId>jmock-junit4</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jmock</groupId>
+      <artifactId>jmock-legacy</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
index 240b68c9ca4e0038dd9a84ff3c1f66fb36a53a9c..f0cf90eb34309c478527cbfdf6c349c208b24181 100644 (file)
@@ -1,33 +1,42 @@
 <?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.2.0-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>mappingservice.southbound</artifactId>
-        <name>LISP Flow Mapping Southbound Plugin</name>
-       <packaging>bundle</packaging>
-       <scm>
-               <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
-               <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
-               <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
-               <tag>HEAD</tag>
-       </scm>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package>
-                                               </Export-Package>
-                                               <Import-Package>
-                                                       org.opendaylight.yang.gen.v1.lispflowmapping.rev131031,
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.lispflowmapping</groupId>
+    <artifactId>mappingservice-parent</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>mappingservice.southbound</artifactId>
+  <packaging>bundle</packaging>
+  <name>LISP Flow Mapping Southbound Plugin</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-common-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.implementation</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package></Export-Package>
+            <Import-Package>org.opendaylight.yang.gen.v1.lispflowmapping.rev131031,
                                                        org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.maprequest,
                                                        org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress,
                                                        org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress.lispaddresscontainer,
                                                        org.opendaylight.lispflowmapping.implementation.util,
                                                        org.opendaylight.controller.sal.binding.api,
                                                        org.opendaylight.yangtools.yang.binding,
-                                                       org.opendaylight.yangtools.yang.common
-                                               </Import-Package>
-                                               <Bundle-Activator>
-                                                       org.opendaylight.lispflowmapping.southbound.LispSouthboundPlugin
-                                               </Bundle-Activator>
-                                               <Service-Component>
-                                               </Service-Component>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal-binding-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal-common-util</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>mappingservice.api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                       <artifactId>mappingservice.implementation</artifactId>
-               </dependency>
-       </dependencies>
+                                                       org.opendaylight.yangtools.yang.common</Import-Package>
+            <Bundle-Activator>org.opendaylight.lispflowmapping.southbound.LispSouthboundPlugin</Bundle-Activator>
+            <Service-Component></Service-Component>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
index 6ad86a4ac6f478243d77117cc876ce3f1575062f..47ff6182e1c354fdffabc63e40903855afa9ff00 100755 (executable)
@@ -1,31 +1,46 @@
+<?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>
-               <artifactId>mappingservice-parent</artifactId>
-               <groupId>org.opendaylight.lispflowmapping</groupId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>mappingservice.yangmodel</artifactId>
-        <name>LISP Flow Mapping YANG Model</name>
-       <packaging>bundle</packaging>
-       <scm>
-               <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
-               <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
-               <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
-               <tag>HEAD</tag>
-       </scm>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <!--version>2.3.6</version -->
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package>
-                                                       org.opendaylight.yang.gen.v1.lispflowmapping.rev131031,
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.lispflowmapping</groupId>
+    <artifactId>mappingservice-parent</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>mappingservice.yangmodel</artifactId>
+  <packaging>bundle</packaging>
+  <name>LISP Flow Mapping YANG Model</name>
+  <dependencies>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-binding</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools.model</groupId>
+      <artifactId>ietf-inet-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools.model</groupId>
+      <artifactId>ietf-yang-types</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <!--version>2.3.6</version -->
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>org.opendaylight.yang.gen.v1.lispflowmapping.rev131031,
                                                        org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.eidrecords,
                                                        org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.eidtolocatorrecords,
                                                        org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lcafapplicationdataaddress,
                                                        org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.maprequestmessage,
                                                        org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.maprequestnotification,
                                                        org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.reencaphop,
-                                                       org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.transportaddress
-                                               </Export-Package>
-                                               <Import-Package>
-                                                       com.google.common.collect,
+                                                       org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.transportaddress</Export-Package>
+            <Import-Package>com.google.common.collect,
                                                        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924,
                                                        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924,
                                                        org.opendaylight.yangtools.yang.binding,
-                                                       org.opendaylight.yangtools.yang.common
-                                               </Import-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.opendaylight.yangtools</groupId>
-                               <artifactId>yang-maven-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>build-helper-maven-plugin</artifactId>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>com.google.guava</groupId>
-                       <artifactId>guava</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.yangtools</groupId>
-                       <artifactId>yang-binding</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.yangtools</groupId>
-                       <artifactId>yang-common</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.yangtools.model</groupId>
-                       <artifactId>ietf-inet-types</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.yangtools.model</groupId>
-                       <artifactId>ietf-yang-types</artifactId>
-               </dependency>
-       </dependencies>
+                                                       org.opendaylight.yangtools.yang.common</Import-Package>
+          </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>
+              <goal>generate-sources</goal>
+            </goals>
+            <configuration>
+              <yangFilesRootDir>src/main/yang</yangFilesRootDir>
+              <codeGenerators>
+                <generator>
+                  <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
+                  <outputBaseDir>${salGeneratorPath}</outputBaseDir>
+                </generator>
+                <generator>
+                  <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>
+                  <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
+                  <additionalConfiguration>
+                    <namespaceToPackage1>lispflowmapping==org.opendaylight.lispflowmapping.config.yang</namespaceToPackage1>
+                  </additionalConfiguration>
+                </generator>
+              </codeGenerators>
+              <inspectDependencies>true</inspectDependencies>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/pom.xml b/pom.xml
index 28c0c673793e778a42cb42423ebb222aab246f72..f3d09991e6719d50675849581ebc8c4978c330ee 100644 (file)
--- a/pom.xml
+++ b/pom.xml
   <packaging>pom</packaging>
   <name>LISP Flow Mapping All modules</name>
 
-  <scm>
-    <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
-    <tag>HEAD</tag>
-  </scm>
-
   <modules>
     <module>commons/parent</module>
     <module>commons/build_tools</module>
-    <module>commons/code-parent</module>
     <module>commons/unittest_tools</module>
     <module>mappingservice</module>
     <module>distribution</module>
   </modules>
 
   <build>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-      </resource>
-      <resource>
-        <directory>${project.build.directory}/generated-resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <!-- we are overriding the default version of this plugin here... not
+                                               sure why. -->
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>2.8</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-shared-resources</id>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <phase>generate-resources</phase>
-            <configuration>
-             <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
-             <excludeTransitive>true</excludeTransitive>
-            </configuration>
-          </execution>
-        </executions>
+        <!-- In this project we want to automatically sort all poms, thus we
+                                       add the invocation of this plugin to the root parent. Configuration is in
+                                       the ODL parent. -->
+        <groupId>com.google.code.sortpom</groupId>
+        <artifactId>maven-sortpom-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
+
+  <repositories>
+    <!-- NOTE: The repositories and plugin repositories sections need fully
+                       qualified URLs to the nexus because it has to download the parent. There
+                       seems to be a bug where you need to parent before any properties can be substituted
+                       in. You can override this URL by using the "mirror" section of your settings.xml
+                       configuration file. See http://maven.apache.org/guides/mini/guide-mirror-settings.html -->
+    <!-- OpenDayLight Repo Mirror -->
+    <repository>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>opendaylight-mirror</id>
+      <name>opendaylight-mirror</name>
+      <url>http://nexus.opendaylight.org/content/groups/public/</url>
+    </repository>
+    <!-- OpenDayLight Snapshot artifact -->
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>opendaylight-snapshot</id>
+      <name>opendaylight-snapshot</name>
+      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+    </repository>
+    <repository>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>opendaylight-snapshot-release</id>
+      <name>opendaylight-snapshot-release</name>
+      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.release/</url>
+    </repository>
+    <repository>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </snapshots>
+      <id>maven-restlet</id>
+      <name>Public online Restlet repository</name>
+      <url>http://maven.restlet.org</url>
+    </repository>
+  </repositories>
+
+  <pluginRepositories>
+    <!-- see above note about mirrors and hard coded URLs. -->
+    <!-- OpenDayLight Repo Mirror -->
+    <pluginRepository>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>opendaylight-mirror</id>
+      <name>opendaylight-mirror</name>
+      <url>http://nexus.opendaylight.org/content/groups/public/</url>
+    </pluginRepository>
+    <!-- OpenDayLight Snapshot artifact -->
+    <pluginRepository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>opendaylight-snapshot</id>
+      <name>opendaylight-snapshot</name>
+      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+    </pluginRepository>
+  </pluginRepositories>
+
 </project>