From 50aec6ca36fe34e47972ba65aa67073ee4f078be Mon Sep 17 00:00:00 2001 From: Lorand Jakab Date: Fri, 10 Oct 2014 16:02:33 +0300 Subject: [PATCH] Refactor the poms to clean up unused tags and move to odl parent Also added other enhancements like sorting as well as cleaning up redundant properties etc. Change-Id: I3443dcd00ceb71bb0613c8e2fdc643fd26322401 Signed-off-by: Devin Avery Signed-off-by: Lorand Jakab --- commons/build_tools/pom.xml | 26 +- commons/code-parent/pom.xml | 50 -- commons/parent/pom.xml | 999 ++++++++++++++----------- commons/unittest_tools/pom.xml | 89 +-- distribution-karaf/pom.xml | 101 +-- distribution/pom.xml | 135 ++-- features/pom.xml | 155 ++-- mappingservice/api/pom.xml | 104 ++- mappingservice/clusterdao/pom.xml | 96 +-- mappingservice/config/pom.xml | 255 +++---- mappingservice/implementation/pom.xml | 146 ++-- mappingservice/integrationtest/pom.xml | 6 - mappingservice/netconf/pom.xml | 340 ++++----- mappingservice/neutron/pom.xml | 140 ++-- mappingservice/northbound/pom.xml | 166 ++-- mappingservice/pom.xml | 110 ++- mappingservice/southbound/pom.xml | 103 ++- mappingservice/yangmodel/pom.xml | 164 ++-- pom.xml | 131 +++- 19 files changed, 1635 insertions(+), 1681 deletions(-) delete mode 100644 commons/code-parent/pom.xml diff --git a/commons/build_tools/pom.xml b/commons/build_tools/pom.xml index 73954bdc8..3fe4f40dc 100644 --- a/commons/build_tools/pom.xml +++ b/commons/build_tools/pom.xml @@ -1,19 +1,13 @@ - 4.0.0 - - org.opendaylight.lispflowmapping - lispflowmapping-commons - 1.2.0-SNAPSHOT - ../parent - - common.build.tools - Build Tools - jar - - scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git - scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git - https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main - HEAD - + 4.0.0 + + org.opendaylight.lispflowmapping + lispflowmapping-commons + 1.2.0-SNAPSHOT + ../parent + + common.build.tools + jar + Build Tools diff --git a/commons/code-parent/pom.xml b/commons/code-parent/pom.xml deleted file mode 100644 index 2164b6297..000000000 --- a/commons/code-parent/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - 4.0.0 - - org.opendaylight.lispflowmapping - lispflowmapping-commons - 1.2.0-SNAPSHOT - ../parent - - lispflowmapping-code-commons - Code Parent POM - pom - - scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git - scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git - https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main - HEAD - - - - org.opendaylight.lispflowmapping - common.unittest.tools - test - - - junit - junit - - - org.hamcrest - hamcrest-core - test - - - org.jmock - jmock-junit4 - test - - - org.jmock - jmock-legacy - test - - - junit-addons - junit-addons - test - - - diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index ba2200b65..e8ff45050 100644 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -1,147 +1,125 @@ - + + 4.0.0 + + + + + + org.opendaylight.odlparent + odlparent + 1.5.0-SNAPSHOT + + org.opendaylight.lispflowmapping lispflowmapping-commons - Parent POM 1.2.0-SNAPSHOT - pom - http://www.opendaylight.org - - scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git - scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git - https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main - HEAD - + Parent POM + + - 1.2.0-SNAPSHOT - 0.6.2.201302030002 - 0.9.0-SNAPSHOT - 1.2.0-SNAPSHOT - 0.5.0-SNAPSHOT + 1.1.0-SNAPSHOT + 1.0.0 0.6.0-SNAPSHOT + 0.3.0-SNAPSHOT 1.3.1 + 1.26.2 + 0.7.0-SNAPSHOT + 0.5.0 + 14.0.1 + 2010.09.24.7-SNAPSHOT + 0.6.2.201302030002 + 1.7 + 1.7 + src/main/yang-gen-config + 1.5.0-SNAPSHOT + 1.5.0-SNAPSHOT + 3.0.1 + + 1.2.0-SNAPSHOT + 2.5.1 + 1.2.0-SNAPSHOT http://nexus.opendaylight.org/content + 0.5.0-SNAPSHOT UTF-8 2.6 - 1.26.2 - 14.0.1 - 1.0.0 - 0.6.1 - 0.6.1 - 0.6.1 - 0.6.1 - https://sonar.opendaylight.org/ + 2.3.2 + 0.9.0-SNAPSHOT + src/main/yang-gen-sal + 1.7.2 ${user.name}-develop + https://sonar.opendaylight.org/ jacoco java - 0.5.0 0.5.0 - 2.5.1 - 1.7 - 1.7 - 2.3.2 - 1.7.2 - 1.1.0-SNAPSHOT - 1.5.0-SNAPSHOT - 3.0.1 - 0.7.0-SNAPSHOT - 1.5.0-SNAPSHOT 2.16 + src/main/xtend-gen + 1.1.0-SNAPSHOT + 0.6.1 + 0.6.1 + 0.6.1 + 0.6.1 + 0.7.0-SNAPSHOT + src/main/yang - - - - - opendaylight-mirror - opendaylight-mirror - ${nexusproxy}/groups/public/ - - false - - - true - never - - - - - opendaylight-snapshot - opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ - - true - - - false - - - - opendaylight-snapshot-release - opendaylight-snapshot-release - ${nexusproxy}/repositories/opendaylight.release/ - - false - - - true - - - - maven-restlet - Public online Restlet repository - http://maven.restlet.org - - true - never - - - - - - - - opendaylight-mirror - opendaylight-mirror - ${nexusproxy}/groups/public/ - - false - - - true - never - - - - - opendaylight-snapshot - opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ - - true - - - false - - - - - - - - opendaylight-release - ${nexusproxy}/repositories/opendaylight.release/ - - - - opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ - - - + + + com.google.guava + guava + ${guava.version} + + + equinoxSDK381 + org.eclipse.osgi + 3.8.1.v20120830-144521 + + + junit + junit + 4.8.1 + + + junit-addons + junit-addons + 1.4 + + + org.apache.karaf.features + framework + ${karaf.version} + kar + + + org.hamcrest + hamcrest-core + 1.3 + + + org.jmock + jmock-junit4 + 2.6.0 + + + org.jmock + jmock-legacy + 2.6.0 + org.opendaylight.controller clustering.services @@ -149,248 +127,313 @@ org.opendaylight.controller - config-util + commons.northbound + 0.5.0-SNAPSHOT + + + org.opendaylight.controller + config-api 0.3.0-SNAPSHOT - org.opendaylight.controller - threadpool-config-impl - 0.3.0-SNAPSHOT - + org.opendaylight.controller + config-manager + ${config.version} + - org.opendaylight.yangtools - yang-binding - 0.7.0-SNAPSHOT + org.opendaylight.controller + config-util + 0.3.0-SNAPSHOT - org.opendaylight.yangtools - yang-common - 0.7.0-SNAPSHOT + org.opendaylight.controller + containermanager + 0.6.0-SNAPSHOT - org.opendaylight.yangtools - yang-data-api - 0.7.0-SNAPSHOT + org.opendaylight.controller + distribution.opendaylight + 0.2.0-SNAPSHOT + osgipackage + zip + - org.opendaylight.yangtools - yang-model-api - 0.7.0-SNAPSHOT + org.opendaylight.controller + features-adsal + ${sal.version} + features + xml - org.opendaylight.yangtools - yang-data-util - 0.7.0-SNAPSHOT + org.opendaylight.controller + features-mdsal + ${mdsal.version} + features + xml - org.opendaylight.yangtools.model - ietf-inet-types - 2010.09.24.7-SNAPSHOT + org.opendaylight.controller + features-netconf-connector + ${mdsal.version} + features + xml - org.opendaylight.yangtools.model - ietf-yang-types - 2010.09.24.7-SNAPSHOT + org.opendaylight.controller + features-nsf + ${nsf.version} + features + xml + - com.google.guava - guava - ${guava.version} + org.opendaylight.controller + karaf.branding + ${branding.version} + compile org.opendaylight.controller - sal - 0.9.0-SNAPSHOT + netty-event-executor-config + ${config.version} - junit - junit - 4.8.1 + org.opendaylight.controller + networkconfig.neutron + 0.5.0-SNAPSHOT - org.hamcrest - hamcrest-core - 1.3 + org.opendaylight.controller + opendaylight-karaf-empty + ${karaf.empty.version} + zip + - org.jmock - jmock-junit4 - 2.6.0 + org.opendaylight.controller + opendaylight-karaf-resources + ${karaf.resources.version} - org.jmock - jmock-legacy - 2.6.0 + org.opendaylight.controller + sal + 0.9.0-SNAPSHOT - junit-addons - junit-addons - 1.4 + org.opendaylight.controller + sal-binding-api + ${mdsal.version} - equinoxSDK381 - org.eclipse.osgi - 3.8.1.v20120830-144521 + org.opendaylight.controller + sal-binding-broker-impl + ${mdsal.version} org.opendaylight.controller - sal-binding-api - ${mdsal.version} + sal-binding-config + ${mdsal.version} + + + org.opendaylight.controller + sal-broker-impl + ${mdsal.version} org.opendaylight.controller sal-common-util - ${mdsal.version} + ${mdsal.version} org.opendaylight.controller - config-api + sal-netconf-connector + ${mdsal.version} + + + org.opendaylight.controller + threadpool-config-api + ${config.version} + + + org.opendaylight.controller + threadpool-config-impl 0.3.0-SNAPSHOT - - org.opendaylight.lispflowmapping - mappingservice.yangmodel - ${lispflowmapping.version} - - - org.opendaylight.lispflowmapping - mappingservice.api - ${lispflowmapping.version} - - - org.opendaylight.lispflowmapping - mappingservice.config - ${lispflowmapping.version} - - - org.opendaylight.lispflowmapping - mappingservice.implementation - ${lispflowmapping.version} - - - org.opendaylight.lispflowmapping - mappingservice.clusterdao - ${lispflowmapping.version} - - - org.opendaylight.lispflowmapping - mappingservice.southbound - ${lispflowmapping.version} - - - org.opendaylight.lispflowmapping - mappingservice.northbound - ${lispflowmapping.version} - - - org.opendaylight.lispflowmapping - mappingservice.neutron - ${lispflowmapping.version} - - - org.opendaylight.lispflowmapping - common.unittest.tools - ${lispflowmapping.version} - test - - - org.opendaylight.lispflowmapping - common.build.tools - ${lispflowmapping.version} - - - org.opendaylight.lispflowmapping - lispflowmapping-code-commons - ${lispflowmapping.version} - - - org.opendaylight.lispflowmapping - lispflowmapping-commons - ${lispflowmapping.version} - - - - org.opendaylight.lispflowmapping - mappingservice.netconf - ${lispflowmapping.version} - - - + + org.opendaylight.lispflowmapping + common.build.tools + ${lispflowmapping.version} + + + org.opendaylight.lispflowmapping + lispflowmapping-code-commons + ${lispflowmapping.version} + + + org.opendaylight.lispflowmapping + lispflowmapping-commons + ${lispflowmapping.version} + + + org.opendaylight.lispflowmapping + mappingservice.api + ${lispflowmapping.version} + + + org.opendaylight.lispflowmapping + mappingservice.clusterdao + ${lispflowmapping.version} + + + org.opendaylight.lispflowmapping + mappingservice.config + ${lispflowmapping.version} + + + org.opendaylight.lispflowmapping + mappingservice.implementation + ${lispflowmapping.version} + - - true - ${project.build.directory}/site - - - org.apache.maven.plugins - maven-project-info-reports-plugin - ${projectinfo} - - false - false - - - - - index - project-team - license - mailing-list - plugin-management - cim - issue-tracking - scm - summary - - - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.3 - - true - true - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8.1 - - org.jboss.apiviz.APIviz - - org.jboss.apiviz - apiviz - 1.3.2.GA - - ${project.artifactId}-${build.suffix} - true - UTF-8 - UTF-8 - UTF-8 - true - true - true - true - *.internal:edu.uci.* - - - - + + org.opendaylight.lispflowmapping + mappingservice.netconf + ${lispflowmapping.version} + + + org.opendaylight.lispflowmapping + mappingservice.neutron + ${lispflowmapping.version} + + + org.opendaylight.lispflowmapping + mappingservice.northbound + ${lispflowmapping.version} + + + org.opendaylight.lispflowmapping + mappingservice.southbound + ${lispflowmapping.version} + + + org.opendaylight.lispflowmapping + mappingservice.yangmodel + ${lispflowmapping.version} + + + org.opendaylight.yangtools + yang-binding + 0.7.0-SNAPSHOT + + + org.opendaylight.yangtools + yang-common + 0.7.0-SNAPSHOT + + + org.opendaylight.yangtools + yang-data-api + 0.7.0-SNAPSHOT + + + org.opendaylight.yangtools + yang-data-impl + ${yangtools.version} + + + org.opendaylight.yangtools + yang-data-util + 0.7.0-SNAPSHOT + + + org.opendaylight.yangtools + yang-model-api + 0.7.0-SNAPSHOT + + + org.opendaylight.yangtools + yang-parser-impl + ${yangtools.version} + + + org.opendaylight.yangtools.model + ietf-inet-types + 2010.09.24.7-SNAPSHOT + + + org.opendaylight.yangtools.model + ietf-yang-types + 2010.09.24.7-SNAPSHOT + + + org.apache.karaf.features + standard + ${karaf.version} + features + xml + runtime + + + + org.opendaylight.lispflowmapping + features-lispflowmapping + ${lispflowmapping.version} + features + xml + runtime + + + org.opendaylight.lispflowmapping + common.unittest.tools + ${lispflowmapping.version} + test + + + org.opendaylight.yangtools + features-test + ${feature.test.version} + test + + + org.opendaylight.yangtools + mockito-configuration + ${yangtools.version} + test + + + - - org.apache.maven.plugins - maven-release-plugin - ${releaseplugin.version} - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} + + com.google.code.sortpom + maven-sortpom-plugin + 2.2.1 + + false + ${project.build.sourceEncoding} + true + \n + 2 + custom_1 + scope,groupId,artifactId + groupId,artifactId + true + + + + + sort + + verify + + org.apache.felix @@ -407,76 +450,140 @@ 2.4 + + + maven-clean-plugin + + + + ${xtend.dstdir} + + ** + + + + ${jmxGeneratorPath} + + ** + + + + ${salGeneratorPath} + + ** + + + + + + + org.apache.maven.plugins maven-compiler-plugin 2.3.2 - 1.7 - 1.7 + ${java.version.source} + ${java.version.target} + org.apache.maven.plugins maven-dependency-plugin 2.8 + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8.1 + + org.jboss.apiviz.APIviz + + org.jboss.apiviz + apiviz + 1.3.2.GA + + ${project.artifactId}-${project.version} + true + UTF-8 + UTF-8 + UTF-8 + true + true + true + true + net.sf.jnetlib.*:cern.*:corejava:*.internal:edu.uci.* + false + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.3 + + true + true + target/apidocs + + + + org.apache.maven.plugins + maven-release-plugin + ${releaseplugin.version} + org.apache.maven.plugins maven-surefire-plugin 2.14.1 - org.opendaylight.yangtools - yang-maven-plugin - 0.7.0-SNAPSHOT + org.codehaus.enunciate + maven-enunciate-plugin + ${enunciate.version} + + enunciate.xml + - generate-sources + docs - - src/main/yang - - - - org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl - - - target/generated-sources/sal - - - - true - - - - org.opendaylight.yangtools - maven-sal-api-gen-plugin - 0.7.0-SNAPSHOT - jar - - + org.codehaus.mojo build-helper-maven-plugin - 1.7 + 1.8 - generate-sources + add-source add-source + generate-sources - target/generated-sources/sal + ${yang.src.path} + ${jmxGeneratorPath} + ${salGeneratorPath} + ${xtend.dstdir} + org.eclipse.m2e lifecycle-mapping @@ -494,7 +601,7 @@ - + @@ -507,7 +614,7 @@ - + @@ -522,7 +629,7 @@ - + @@ -535,7 +642,7 @@ - + @@ -548,7 +655,7 @@ - + @@ -557,11 +664,11 @@ yang-maven-plugin [0.5,) - generate-sources + generate-sources - + @@ -569,82 +676,134 @@ - org.codehaus.enunciate - maven-enunciate-plugin - ${enunciate.version} - - enunciate.xml - + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + + org.opendaylight.yangtools + yang-maven-plugin + ${yangtools.version} + + + org.opendaylight.yangtools + maven-sal-api-gen-plugin + ${yangtools.version} + + - docs + generate-sources + + ${yang.src.path} + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + + + true + - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8.1 - - org.jboss.apiviz.APIviz - - org.jboss.apiviz - apiviz - 1.3.2.GA - - ${project.artifactId}-1.0.0 - true - UTF-8 - UTF-8 - UTF-8 - true - true - true - true - net.sf.jnetlib.*:cern.*:corejava:*.internal:edu.uci.* - false - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.3 - - true - true - target/apidocs - - - - org.jacoco - jacoco-maven-plugin - - - org.opendaylight.lispflowmapping.* - - - - - pre-test - - prepare-agent - - - - post-test - - report - - test - - - - + + + + org.codehaus.mojo + build-helper-maven-plugin + + + + + ${project.build.directory}/site + true + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8.1 + + org.jboss.apiviz.APIviz + + org.jboss.apiviz + apiviz + 1.3.2.GA + + ${project.artifactId}-${build.suffix} + true + UTF-8 + UTF-8 + UTF-8 + true + true + true + true + *.internal:edu.uci.* + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.3 + + true + true + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + ${projectinfo} + + false + false + + + + + index + project-team + license + mailing-list + plugin-management + cim + issue-tracking + scm + summary + + + + + + + + + + + + opendaylight-release + ${nexusproxy}/repositories/opendaylight.release/ + + + + opendaylight-snapshot + ${nexusproxy}/repositories/opendaylight.snapshot/ + + + + diff --git a/commons/unittest_tools/pom.xml b/commons/unittest_tools/pom.xml index 3cf6f1d79..90785112e 100644 --- a/commons/unittest_tools/pom.xml +++ b/commons/unittest_tools/pom.xml @@ -1,52 +1,45 @@ - 4.0.0 - - org.opendaylight.lispflowmapping - lispflowmapping-commons - 1.2.0-SNAPSHOT - ../parent - - common.unittest.tools - Unit Test Tools - jar - - scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git - scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git - https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main - HEAD - - - - equinoxSDK381 - org.eclipse.osgi - - - org.hamcrest - hamcrest-core - - - junit - junit - + 4.0.0 + + org.opendaylight.lispflowmapping + lispflowmapping-commons + 1.2.0-SNAPSHOT + ../parent + + common.unittest.tools + jar + Unit Test Tools + + + equinoxSDK381 + org.eclipse.osgi + + + junit + junit + + + junit-addons + junit-addons + + + org.hamcrest + hamcrest-core + - - org.jmock - jmock-junit4 - - - org.jmock - jmock-legacy - - - junit-addons - junit-addons - - -org.slf4j -slf4j-api -${slf4j.version} - - - + + org.jmock + jmock-junit4 + + + org.jmock + jmock-legacy + + + org.slf4j + slf4j-api + + + diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml index 28f6f2658..c83983817 100644 --- a/distribution-karaf/pom.xml +++ b/distribution-karaf/pom.xml @@ -10,14 +10,12 @@ 4.0.0 org.opendaylight.lispflowmapping - lispflowmapping-commons + lispflowmapping-all 1.2.0-SNAPSHOT - ../commons/parent distribution-karaf - LISP Flow Mapping Project - Karaf Distribution - org.opendaylight.lispflowmapping pom + LISP Flow Mapping Project - Karaf Distribution 3.0 @@ -27,23 +25,13 @@ org.apache.karaf.features framework - ${karaf.version} kar - - org.apache.karaf.features - standard - ${karaf.version} - features - xml - runtime - org.opendaylight.controller karaf.branding - ${branding.version} compile @@ -51,23 +39,19 @@ org.opendaylight.controller opendaylight-karaf-resources - ${karaf.resources.version} - - - + + org.opendaylight.lispflowmapping features-lispflowmapping - ${lispflowmapping.version} features xml runtime @@ -185,10 +169,36 @@ + + org.apache.maven.plugins + maven-antrun-plugin + + + + run + + prepare-package + + + + + + + + + + + + + + + + + + org.apache.maven.plugins maven-dependency-plugin - 2.6 copy @@ -215,49 +225,16 @@ prepare-package - ${project.build.directory}/assembly - org.opendaylight.controller - opendaylight-karaf-resources - META-INF\/** - true - false + ${project.build.directory}/assembly + org.opendaylight.controller + opendaylight-karaf-resources + META-INF\/** + true + false - - org.apache.maven.plugins - maven-antrun-plugin - - - prepare-package - - run - - - - - - - - - - - - - - - - - - - - - scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git - scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git - HEAD - https://git.opendaylight.org/gerrit/gitweb?p=lispflowmapping.git;a=summary - diff --git a/distribution/pom.xml b/distribution/pom.xml index 18aa31c3b..54492c794 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -1,77 +1,70 @@ + 4.0.0 org.opendaylight.lispflowmapping lispflowmapping-commons - ../commons/parent 1.2.0-SNAPSHOT + ../commons/parent lispflowmapping-distribution pom LISP Flow Mapping Distribution - - - scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git - scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git - https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main - HEAD - + + + org.opendaylight.lispflowmapping + mappingservice.api + + + org.opendaylight.lispflowmapping + mappingservice.clusterdao + + + + org.opendaylight.lispflowmapping + mappingservice.config + + + + org.opendaylight.lispflowmapping + mappingservice.implementation + + + + org.opendaylight.lispflowmapping + mappingservice.netconf + + + + org.opendaylight.lispflowmapping + mappingservice.neutron + + + + org.opendaylight.lispflowmapping + mappingservice.northbound + + + + org.opendaylight.lispflowmapping + mappingservice.southbound + + + + org.opendaylight.lispflowmapping + mappingservice.yangmodel + org.opendaylight.controller distribution.opendaylight - 0.2.0-SNAPSHOT - zip osgipackage + zip provided - - org.opendaylight.lispflowmapping - mappingservice.yangmodel - - - - org.opendaylight.lispflowmapping - mappingservice.api - - - - org.opendaylight.lispflowmapping - mappingservice.config - - - - org.opendaylight.lispflowmapping - mappingservice.implementation - - - org.opendaylight.lispflowmapping - mappingservice.clusterdao - - - - org.opendaylight.lispflowmapping - mappingservice.southbound - - - - org.opendaylight.lispflowmapping - mappingservice.northbound - - - - org.opendaylight.lispflowmapping - mappingservice.neutron - - - - org.opendaylight.lispflowmapping - mappingservice.netconf - - @@ -80,43 +73,43 @@ ${basedir}/src/main/resources - ${project.build.directory}/generated-resources true + ${project.build.directory}/generated-resources - org.apache.maven.plugins - maven-dependency-plugin + maven-assembly-plugin - unpack-shared-resources + distro-assembly - unpack-dependencies + single - generate-resources + package - ${project.build.directory}/generated-resources - distribution.opendaylight - org.opendaylight.controller - true + + src/assemble/bin.xml + - maven-assembly-plugin + org.apache.maven.plugins + maven-dependency-plugin - distro-assembly - package + unpack-shared-resources - single + unpack-dependencies + generate-resources - - src/assemble/bin.xml - + ${project.build.directory}/generated-resources + distribution.opendaylight + org.opendaylight.controller + true diff --git a/features/pom.xml b/features/pom.xml index 171a56b54..16c3e0667 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -10,13 +10,12 @@ 4.0.0 org.opendaylight.lispflowmapping - lispflowmapping-commons + lispflowmapping-all 1.2.0-SNAPSHOT - ../commons/parent features-lispflowmapping - LISP Flow Mapping Project - Karaf Features jar + LISP Flow Mapping Project - Karaf Features features.xml @@ -24,54 +23,42 @@ org.opendaylight.controller - features-mdsal - ${mdsal.version} + features-adsal features xml org.opendaylight.controller - features-adsal - ${sal.version} + features-mdsal features xml org.opendaylight.controller - features-nsf - ${nsf.version} + features-netconf-connector features xml org.opendaylight.controller - features-netconf-connector - ${mdsal.version} + features-nsf features xml - - - org.opendaylight.yangtools - features-test - ${feature.test.version} - test - org.opendaylight.controller opendaylight-karaf-empty - ${karaf.empty.version} zip + org.opendaylight.lispflowmapping - mappingservice.yangmodel + mappingservice.api - org.opendaylight.lispflowmapping - mappingservice.api + mappingservice.clusterdao @@ -83,14 +70,15 @@ org.opendaylight.lispflowmapping mappingservice.implementation + org.opendaylight.lispflowmapping - mappingservice.clusterdao + mappingservice.netconf org.opendaylight.lispflowmapping - mappingservice.southbound + mappingservice.neutron @@ -100,85 +88,82 @@ org.opendaylight.lispflowmapping - mappingservice.netconf + mappingservice.southbound - org.opendaylight.lispflowmapping - mappingservice.neutron + mappingservice.yangmodel org.slf4j slf4j-simple - 1.7.2 + + + + org.opendaylight.yangtools + features-test + test - src/main/resources true + src/main/resources - - org.apache.maven.plugins - maven-resources-plugin - - - filter - generate-resources - - resources - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - package - - attach-artifact - - - - - ${project.build.directory}/classes/${features.file} - xml - features - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire.version} - - - org.opendaylight.controller - opendaylight-karaf-empty - ${karaf.empty.version} - - - org.opendaylight.yangtools:features-test - - - + + org.apache.maven.plugins + maven-resources-plugin + + + filter + + resources + + generate-resources + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.opendaylight.controller + opendaylight-karaf-empty + ${karaf.empty.version} + + + org.opendaylight.yangtools:features-test + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + + attach-artifact + + package + + + + ${project.build.directory}/classes/${features.file} + xml + features + + + + + + - - scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git - scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git - HEAD - https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main - diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml index cde400595..5ab6f81af 100644 --- a/mappingservice/api/pom.xml +++ b/mappingservice/api/pom.xml @@ -1,40 +1,47 @@ - 4.0.0 - - org.opendaylight.lispflowmapping - mappingservice-parent - 1.2.0-SNAPSHOT - .. - - mappingservice.api - LISP Flow Mapping Public APIs - bundle - - scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git - scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git - https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main - HEAD - - - - - org.apache.felix - maven-bundle-plugin - - true - - - - org.opendaylight.lispflowmapping.interfaces.dao, + 4.0.0 + + org.opendaylight.lispflowmapping + mappingservice-parent + 1.2.0-SNAPSHOT + + mappingservice.api + bundle + LISP Flow Mapping Public APIs + + + org.opendaylight.controller + sal + + + org.opendaylight.controller + sal-binding-api + + + org.opendaylight.controller + sal-common-util + + + org.opendaylight.lispflowmapping + mappingservice.yangmodel + + + + + + org.apache.felix + maven-bundle-plugin + true + + + 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 - - - org.opendaylight.yang.gen.v1.lispflowmapping.rev131031, + org.opendaylight.lispflowmapping.type.sbplugin + 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, @@ -51,33 +58,10 @@ javax.xml.bind.annotation, org.slf4j, org.opendaylight.yangtools.yang.common, - com.google.common.collect - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - - - - org.opendaylight.controller - sal-binding-api - - - org.opendaylight.controller - sal-common-util - - - org.opendaylight.controller - sal - - - org.opendaylight.lispflowmapping - mappingservice.yangmodel - - + com.google.common.collect + + + + + diff --git a/mappingservice/clusterdao/pom.xml b/mappingservice/clusterdao/pom.xml index 08ed86b06..0c8576ab4 100644 --- a/mappingservice/clusterdao/pom.xml +++ b/mappingservice/clusterdao/pom.xml @@ -1,60 +1,46 @@ - 4.0.0 - - org.opendaylight.lispflowmapping - mappingservice-parent - 1.2.0-SNAPSHOT - .. - - mappingservice.clusterdao - LISP Flow Mapping Cluster DAO - bundle - - scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git - scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git - https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main - HEAD - - - - - org.apache.felix - maven-bundle-plugin - true - - - - org.opendaylight.lispflowmapping.clusterdao - - - org.apache.felix.dm, + 4.0.0 + + org.opendaylight.lispflowmapping + mappingservice-parent + 1.2.0-SNAPSHOT + + mappingservice.clusterdao + bundle + LISP Flow Mapping Cluster DAO + + + equinoxSDK381 + org.eclipse.osgi + + + org.opendaylight.controller + clustering.services + + + org.opendaylight.lispflowmapping + mappingservice.api + + + + + + org.apache.felix + maven-bundle-plugin + true + + + org.opendaylight.lispflowmapping.clusterdao + org.apache.felix.dm, org.opendaylight.controller.clustering.services, org.opendaylight.controller.sal.core, - org.opendaylight.lispflowmapping.interfaces.dao, org.slf4j - - - org.opendaylight.lispflowmapping.clusterdao.Activator - - - - - - - - - - - org.opendaylight.controller - clustering.services - - - org.opendaylight.lispflowmapping - mappingservice.api - - - equinoxSDK381 - org.eclipse.osgi - - + org.opendaylight.lispflowmapping.interfaces.dao, org.slf4j + org.opendaylight.lispflowmapping.clusterdao.Activator + + + + + + diff --git a/mappingservice/config/pom.xml b/mappingservice/config/pom.xml index 95a536ed0..578f16571 100644 --- a/mappingservice/config/pom.xml +++ b/mappingservice/config/pom.xml @@ -1,92 +1,97 @@ - - - 4.0.0 - - lispflowmapping-commons - org.opendaylight.lispflowmapping - 1.2.0-SNAPSHOT - ../../commons/parent - - mappingservice.config - LISP Flow Mapping Config Subsystem - bundle - - scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git - scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git - https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main - HEAD - - - 3.0.4 - - - ${project.build.directory}/generated-sources/config - - - - - - org.opendaylight.yangtools - yang-maven-plugin - 0.7.0-SNAPSHOT - - - - generate-sources - - - - - - org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator - - ${jmxGeneratorPath} - - - lispconfig==org.opendaylight.lispflowmapping.config.yang - - - - - - org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl - - - target/generated-sources/sal - - - - true - - - - - - org.opendaylight.controller - yang-jmx-generator-plugin - 0.3.0-SNAPSHOT - - - org.opendaylight.yangtools - maven-sal-api-gen-plugin - 0.7.0-SNAPSHOT - jar - - - - - - - - org.apache.felix - maven-bundle-plugin - - - - - - ch.qos.logback.classic, + + + 4.0.0 + + org.opendaylight.lispflowmapping + mappingservice-parent + 1.2.0-SNAPSHOT + + mappingservice.config + bundle + LISP Flow Mapping Config Subsystem + + 3.0.4 + + + + org.opendaylight.controller + config-api + + + org.opendaylight.lispflowmapping + mappingservice.api + + + org.opendaylight.yangtools + yang-binding + + + org.opendaylight.yangtools + yang-common + + + org.opendaylight.yangtools.model + ietf-inet-types + + + org.opendaylight.yangtools.model + ietf-yang-types + + + + + + + org.opendaylight.yangtools + yang-maven-plugin + 0.7.0-SNAPSHOT + + + org.opendaylight.controller + yang-jmx-generator-plugin + 0.3.0-SNAPSHOT + + + org.opendaylight.yangtools + maven-sal-api-gen-plugin + 0.7.0-SNAPSHOT + jar + + + + + + generate-sources + + + + + org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator + ${jmxGeneratorPath} + + lispconfig==org.opendaylight.lispflowmapping.config.yang + + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + + + true + + + + + + + + + org.apache.felix + maven-bundle-plugin + + + + ch.qos.logback.classic, ch.qos.logback.classic.encoder, ch.qos.logback.classic.filter, ch.qos.logback.classic.spi, @@ -109,64 +114,16 @@ 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 - - - org.opendaylight.lispflowmapping.config.yang, - org.opendaylight.yang.gen.v1.lispconfig.rev131107.* - - - - - - org.opendaylight.yangtools - yang-maven-plugin - - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - add-source - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/config - - - - - - - - - - org.opendaylight.yangtools.model - ietf-inet-types - - - org.opendaylight.yangtools.model - ietf-yang-types - - - org.opendaylight.lispflowmapping - mappingservice.api - - - org.opendaylight.yangtools - yang-binding - - - org.opendaylight.yangtools - yang-common - - - org.opendaylight.controller - config-api - - + org.opendaylight.yangtools.yang.common + org.opendaylight.lispflowmapping.config.yang, + org.opendaylight.yang.gen.v1.lispconfig.rev131107.* + + + + + org.opendaylight.yangtools + yang-maven-plugin + + + diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml index 5d94736a3..e6f2894a2 100644 --- a/mappingservice/implementation/pom.xml +++ b/mappingservice/implementation/pom.xml @@ -1,37 +1,65 @@ - 4.0.0 - - org.opendaylight.lispflowmapping - mappingservice-parent - 1.2.0-SNAPSHOT - .. - - mappingservice.implementation - LISP Flow Mapping Implementation - bundle - - scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git - scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git - https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main - HEAD - - - - - org.apache.felix - maven-bundle-plugin - true - - - - org.opendaylight.lispflowmapping.implementation, + 4.0.0 + + org.opendaylight.lispflowmapping + mappingservice-parent + 1.2.0-SNAPSHOT + + mappingservice.implementation + bundle + LISP Flow Mapping Implementation + + + equinoxSDK381 + org.eclipse.osgi + + + org.hamcrest + hamcrest-core + + + org.opendaylight.controller + sal + + + org.opendaylight.controller + sal-binding-api + + + org.opendaylight.controller + sal-common-util + + + org.opendaylight.lispflowmapping + mappingservice.api + + + org.opendaylight.lispflowmapping + mappingservice.yangmodel + + + org.opendaylight.yangtools.model + ietf-inet-types + + + org.opendaylight.yangtools.model + ietf-yang-types + + + + + + org.apache.felix + maven-bundle-plugin + true + + + org.opendaylight.lispflowmapping.implementation, org.opendaylight.lispflowmapping.implementation.dao, org.opendaylight.lispflowmapping.implementation.serializer, - org.opendaylight.lispflowmapping.implementation.util - - - javax.xml.bind, + org.opendaylight.lispflowmapping.implementation.util + javax.xml.bind, javax.xml.bind.annotation, org.opendaylight.yang.gen.v1.lispflowmapping.rev131031, org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.eidrecords, @@ -79,54 +107,12 @@ javax.crypto.spec, org.opendaylight.controller.sal.binding.api, org.opendaylight.yangtools.yang.binding, - org.opendaylight.yangtools.concepts - - - org.opendaylight.lispflowmapping.implementation.Activator - - - - - - - - - - - org.opendaylight.yangtools.model - ietf-inet-types - - - org.opendaylight.yangtools.model - ietf-yang-types - - - org.opendaylight.controller - sal-binding-api - - - org.opendaylight.controller - sal-common-util - - - org.hamcrest - hamcrest-core - - - org.opendaylight.controller - sal - - - org.opendaylight.lispflowmapping - mappingservice.yangmodel - - - org.opendaylight.lispflowmapping - mappingservice.api - - - equinoxSDK381 - org.eclipse.osgi - - + org.opendaylight.yangtools.concepts + org.opendaylight.lispflowmapping.implementation.Activator + + + + + + diff --git a/mappingservice/integrationtest/pom.xml b/mappingservice/integrationtest/pom.xml index baeb12a86..c49985a84 100644 --- a/mappingservice/integrationtest/pom.xml +++ b/mappingservice/integrationtest/pom.xml @@ -809,12 +809,6 @@ - - scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git - scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git - HEAD - https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main - diff --git a/mappingservice/netconf/pom.xml b/mappingservice/netconf/pom.xml index 3510dc706..cb4a8e44f 100644 --- a/mappingservice/netconf/pom.xml +++ b/mappingservice/netconf/pom.xml @@ -1,198 +1,162 @@ - - 4.0.0 - - org.opendaylight.lispflowmapping - mappingservice-parent - 1.2.0-SNAPSHOT - .. - - mappingservice.netconf - LISP Flow Mapping Netconf Connector - bundle - - scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git - scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git - https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main - HEAD - + + + 4.0.0 + + org.opendaylight.lispflowmapping + mappingservice-parent + 1.2.0-SNAPSHOT + + mappingservice.netconf + bundle + LISP Flow Mapping Netconf Connector - - 2010.09.24.7-SNAPSHOT - 1.1.0-SNAPSHOT - 0.7.0-SNAPSHOT - 1.2.0-SNAPSHOT - 0.3.0-SNAPSHOT - 5.0.0 - src/main/yang-gen-sal - src/main/yang-gen-config - + + + org.opendaylight.controller + config-api + + + org.opendaylight.controller + config-api + + + org.opendaylight.controller + config-manager + + + org.opendaylight.controller + config-util + + + org.opendaylight.controller + netty-event-executor-config + + + org.opendaylight.controller + sal-binding-api + + + org.opendaylight.controller + sal-binding-broker-impl + + + org.opendaylight.controller + sal-binding-config + + + org.opendaylight.controller + sal-broker-impl + + + org.opendaylight.controller + sal-common-util + + + org.opendaylight.controller + sal-netconf-connector + + + org.opendaylight.controller + threadpool-config-api + + + org.opendaylight.controller + threadpool-config-impl + + + org.opendaylight.yangtools + yang-binding + + + org.opendaylight.yangtools + yang-common + + + org.opendaylight.yangtools + yang-data-impl + + + org.opendaylight.yangtools + yang-parser-impl + + + org.opendaylight.yangtools.model + ietf-inet-types + + + org.osgi + org.osgi.core + - - - org.opendaylight.controller - config-api - - - org.opendaylight.controller - config-util - - - org.opendaylight.controller - sal-netconf-connector - ${mdsal.version} - - - org.opendaylight.controller - sal-broker-impl - ${mdsal.version} - - - org.opendaylight.controller - sal-binding-broker-impl - ${mdsal.version} - - - org.opendaylight.controller - netty-event-executor-config - ${config.version} - - - org.opendaylight.controller - threadpool-config-impl - - - org.opendaylight.controller - threadpool-config-api - ${config.version} - - + + org.opendaylight.yangtools + mockito-configuration + test + + + + + + + org.apache.felix + maven-bundle-plugin + + + org.opendaylight.lispflowmapping.netconf.impl, + org.opendaylight.lispflowmapping.config.yang.netconf.impl, + 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.*, + + + + + + org.opendaylight.yangtools + yang-maven-plugin + + org.opendaylight.controller - config-manager + yang-jmx-generator-plugin ${config.version} - jar - - - org.opendaylight.yangtools.model - ietf-inet-types - - - org.opendaylight.controller - sal-binding-api - - + + org.opendaylight.yangtools - yang-binding - - - org.opendaylight.controller - sal-common-util - - - org.opendaylight.yangtools - yang-common - - - org.opendaylight.yangtools - yang-data-impl - ${yangtools.version} - - - org.opendaylight.yangtools - yang-parser-impl + maven-sal-api-gen-plugin ${yangtools.version} - - - org.opendaylight.controller - config-api - - - org.opendaylight.controller - sal-binding-config - ${mdsal.version} - - + jar + + org.osgi org.osgi.core ${osgi.core.version} - - - - org.opendaylight.yangtools - mockito-configuration - test - ${yangtools.version} - - - - - - - org.apache.felix - maven-bundle-plugin - - - - org.opendaylight.lispflowmapping.netconf.impl, - org.opendaylight.lispflowmapping.config.yang.netconf.impl, - - - 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.*, - - - - - - - org.opendaylight.yangtools - yang-maven-plugin - - - org.opendaylight.controller - yang-jmx-generator-plugin - ${config.version} - - - org.opendaylight.yangtools - maven-sal-api-gen-plugin - ${yangtools.version} - jar - - - org.osgi - org.osgi.core - ${osgi.core.version} - - - - - - generate-sources - - - src/main/yang - - - org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl - ${salGeneratorPath} - - - org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator - ${jmxGeneratorPath} - - urn:opendaylight:params:xml:ns:yang:lispflowmapping==org.opendaylight.lispflowmapping.config.yang - urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang - - - - true - - - - - - + + + + + + generate-sources + + + src/main/yang + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + + + org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator + ${jmxGeneratorPath} + + urn:opendaylight:params:xml:ns:yang:lispflowmapping==org.opendaylight.lispflowmapping.config.yang + urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang + + + + true + + + + + + - - diff --git a/mappingservice/neutron/pom.xml b/mappingservice/neutron/pom.xml index a6464ca1f..adcefb02c 100644 --- a/mappingservice/neutron/pom.xml +++ b/mappingservice/neutron/pom.xml @@ -1,33 +1,58 @@ - 4.0.0 - - org.opendaylight.lispflowmapping - mappingservice-parent - 1.2.0-SNAPSHOT - .. - - mappingservice.neutron - LISP Flow Mapping Neutron APIs - bundle - - scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git - scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git - https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main - HEAD - - - - - org.apache.felix - maven-bundle-plugin - true - - - - - - org.opendaylight.controller.sal.core, + 4.0.0 + + org.opendaylight.lispflowmapping + mappingservice-parent + 1.2.0-SNAPSHOT + + mappingservice.neutron + bundle + LISP Flow Mapping Neutron APIs + + + equinoxSDK381 + org.eclipse.osgi + + + org.opendaylight.controller + commons.northbound + + + org.opendaylight.controller + containermanager + + + org.opendaylight.controller + networkconfig.neutron + + + org.opendaylight.controller + sal + + + org.opendaylight.lispflowmapping + mappingservice.api + + + org.opendaylight.lispflowmapping + mappingservice.yangmodel + + + org.opendaylight.yangtools.model + ietf-inet-types + + + + + + org.apache.felix + maven-bundle-plugin + true + + + + org.opendaylight.controller.sal.core, org.opendaylight.controller.sal.utils, org.opendaylight.controller.containermanager, org.opendaylight.controller.switchmanager, @@ -54,55 +79,14 @@ org.apache.commons.lang3.builder, org.osgi.service.component, org.eclipse.osgi.framework.console, - org.osgi.framework, - - - org.opendaylight.lispflowmapping.neutron.Activator - + org.osgi.framework, + org.opendaylight.lispflowmapping.neutron.Activator - - - - ${project.basedir}/src/main/resources/META-INF - - - - - - - equinoxSDK381 - org.eclipse.osgi - - - org.opendaylight.lispflowmapping - mappingservice.api - - - org.opendaylight.controller - sal - - - org.opendaylight.controller - containermanager - 0.6.0-SNAPSHOT - - - org.opendaylight.controller - commons.northbound - 0.5.0-SNAPSHOT - - - org.opendaylight.controller - networkconfig.neutron - 0.5.0-SNAPSHOT - - - org.opendaylight.lispflowmapping - mappingservice.yangmodel - - - org.opendaylight.yangtools.model - ietf-inet-types - - + + + ${project.basedir}/src/main/resources/META-INF + + + + diff --git a/mappingservice/northbound/pom.xml b/mappingservice/northbound/pom.xml index ffe5aeb20..4b912bf3e 100644 --- a/mappingservice/northbound/pom.xml +++ b/mappingservice/northbound/pom.xml @@ -1,47 +1,59 @@ - 4.0.0 - - org.opendaylight.lispflowmapping - mappingservice-parent - 1.2.0-SNAPSHOT - .. - - mappingservice.northbound - LISP Flow Mapping Northbound APIs - bundle - - scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git - scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git - https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main - HEAD - - - - - org.codehaus.enunciate - maven-enunciate-plugin - ${enunciate.version} - - - - org.apache.felix - maven-bundle-plugin - 2.4.0 - true - - - - - - org.opendaylight.controller.sal.core, + 4.0.0 + + org.opendaylight.lispflowmapping + mappingservice-parent + 1.2.0-SNAPSHOT + + mappingservice.northbound + bundle + LISP Flow Mapping Northbound APIs + + + + org.codehaus.enunciate + enunciate-core-annotations + + + org.opendaylight.controller + commons.northbound + + + org.opendaylight.controller + containermanager + + + org.opendaylight.controller + sal + + + + org.opendaylight.controller.thirdparty + com.sun.jersey.jersey-servlet + + + + org.opendaylight.lispflowmapping + mappingservice.api + + + + org.opendaylight.lispflowmapping + mappingservice.yangmodel + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + + org.opendaylight.controller.sal.core, org.opendaylight.controller.sal.utils, org.opendaylight.controller.containermanager, org.opendaylight.controller.switchmanager, @@ -86,60 +98,20 @@ org.apache.commons.lang3.builder, org.osgi.service.component, org.eclipse.osgi.framework.console, - org.osgi.framework - - - org.opendaylight.lispflowmapping.northbound.Activator - - - - - /lispflowmapping/nb/v2 - ,${classes;ANNOTATION;javax.ws.rs.Path} - - ${project.basedir}/src/main/resources/META-INF - - - - - - - - org.opendaylight.lispflowmapping - mappingservice.yangmodel - - - - org.opendaylight.lispflowmapping - mappingservice.api - - - - org.opendaylight.controller - sal - - - org.opendaylight.controller - containermanager - 0.6.0-SNAPSHOT - - - org.opendaylight.controller - commons.northbound - 0.5.0-SNAPSHOT - - - - org.opendaylight.controller.thirdparty - com.sun.jersey.jersey-servlet - 1.17 - - - - org.codehaus.enunciate - enunciate-core-annotations - ${enunciate.version} - + org.osgi.framework + org.opendaylight.lispflowmapping.northbound.Activator - + + /lispflowmapping/nb/v2 + ,${classes;ANNOTATION;javax.ws.rs.Path} + + ${project.basedir}/src/main/resources/META-INF + + + + org.codehaus.enunciate + maven-enunciate-plugin + + + diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml index 036d4a771..5eb7bad6e 100644 --- a/mappingservice/pom.xml +++ b/mappingservice/pom.xml @@ -1,61 +1,55 @@ - 4.0.0 - - org.opendaylight.lispflowmapping - lispflowmapping-code-commons - 1.2.0-SNAPSHOT - ../commons/code-parent - - mappingservice-parent - LISP Flow Mapping Parent POM - pom - - scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git - scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git - https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main - HEAD - - - yangmodel - api - config - clusterdao - implementation - southbound - northbound - neutron - netconf - integrationtest - - - - org.opendaylight.lispflowmapping - common.unittest.tools - - - junit - junit - - - org.hamcrest - hamcrest-core - test - - - org.jmock - jmock-junit4 - test - - - org.jmock - jmock-legacy - test - - - junit-addons - junit-addons - test - - + 4.0.0 + + org.opendaylight.lispflowmapping + lispflowmapping-all + 1.2.0-SNAPSHOT + + + mappingservice-parent + pom + LISP Flow Mapping Parent POM + + yangmodel + api + config + clusterdao + implementation + southbound + northbound + neutron + netconf + integrationtest + + + + junit + junit + + + org.opendaylight.lispflowmapping + common.unittest.tools + + + junit-addons + junit-addons + test + + + org.hamcrest + hamcrest-core + test + + + org.jmock + jmock-junit4 + test + + + org.jmock + jmock-legacy + test + + diff --git a/mappingservice/southbound/pom.xml b/mappingservice/southbound/pom.xml index 240b68c9c..f0cf90eb3 100644 --- a/mappingservice/southbound/pom.xml +++ b/mappingservice/southbound/pom.xml @@ -1,33 +1,42 @@ - 4.0.0 - - org.opendaylight.lispflowmapping - mappingservice-parent - 1.2.0-SNAPSHOT - .. - - mappingservice.southbound - LISP Flow Mapping Southbound Plugin - bundle - - scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git - scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git - https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main - HEAD - - - - - org.apache.felix - maven-bundle-plugin - true - - - - - - org.opendaylight.yang.gen.v1.lispflowmapping.rev131031, + 4.0.0 + + org.opendaylight.lispflowmapping + mappingservice-parent + 1.2.0-SNAPSHOT + + mappingservice.southbound + bundle + LISP Flow Mapping Southbound Plugin + + + org.opendaylight.controller + sal-binding-api + + + org.opendaylight.controller + sal-common-util + + + org.opendaylight.lispflowmapping + mappingservice.api + + + org.opendaylight.lispflowmapping + mappingservice.implementation + + + + + + org.apache.felix + maven-bundle-plugin + true + + + + 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, @@ -56,34 +65,12 @@ org.opendaylight.lispflowmapping.implementation.util, org.opendaylight.controller.sal.binding.api, org.opendaylight.yangtools.yang.binding, - org.opendaylight.yangtools.yang.common - - - org.opendaylight.lispflowmapping.southbound.LispSouthboundPlugin - - - - - - - - - - - org.opendaylight.controller - sal-binding-api - - - org.opendaylight.controller - sal-common-util - - - org.opendaylight.lispflowmapping - mappingservice.api - - - org.opendaylight.lispflowmapping - mappingservice.implementation - - + org.opendaylight.yangtools.yang.common + org.opendaylight.lispflowmapping.southbound.LispSouthboundPlugin + + + + + + diff --git a/mappingservice/yangmodel/pom.xml b/mappingservice/yangmodel/pom.xml index 6ad86a4ac..47ff6182e 100755 --- a/mappingservice/yangmodel/pom.xml +++ b/mappingservice/yangmodel/pom.xml @@ -1,31 +1,46 @@ + - 4.0.0 - - mappingservice-parent - org.opendaylight.lispflowmapping - 1.2.0-SNAPSHOT - .. - - mappingservice.yangmodel - LISP Flow Mapping YANG Model - bundle - - scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git - scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git - https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main - HEAD - - - - - org.apache.felix - maven-bundle-plugin - - true - - - - org.opendaylight.yang.gen.v1.lispflowmapping.rev131031, + 4.0.0 + + org.opendaylight.lispflowmapping + mappingservice-parent + 1.2.0-SNAPSHOT + + mappingservice.yangmodel + bundle + LISP Flow Mapping YANG Model + + + com.google.guava + guava + + + org.opendaylight.yangtools + yang-binding + + + org.opendaylight.yangtools + yang-common + + + org.opendaylight.yangtools.model + ietf-inet-types + + + org.opendaylight.yangtools.model + ietf-yang-types + + + + + + org.apache.felix + maven-bundle-plugin + + true + + + 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, @@ -48,48 +63,61 @@ 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 - - - com.google.common.collect, + org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.transportaddress + 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 - - - - - - org.opendaylight.yangtools - yang-maven-plugin - - - org.codehaus.mojo - build-helper-maven-plugin - - - - - - com.google.guava - guava - - - org.opendaylight.yangtools - yang-binding - - - org.opendaylight.yangtools - yang-common - - - org.opendaylight.yangtools.model - ietf-inet-types - - - org.opendaylight.yangtools.model - ietf-yang-types - - + org.opendaylight.yangtools.yang.common + + + + + org.opendaylight.yangtools + yang-maven-plugin + + + org.opendaylight.controller + yang-jmx-generator-plugin + ${config.version} + + + org.opendaylight.yangtools + maven-sal-api-gen-plugin + ${yangtools.version} + jar + + + org.osgi + org.osgi.core + ${osgi.core.version} + + + + + + generate-sources + + + src/main/yang + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + + + org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator + ${jmxGeneratorPath} + + lispflowmapping==org.opendaylight.lispflowmapping.config.yang + + + + true + + + + + + diff --git a/pom.xml b/pom.xml index 28c0c6737..f3d09991e 100644 --- a/pom.xml +++ b/pom.xml @@ -12,17 +12,9 @@ pom LISP Flow Mapping All modules - - scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git - scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git - https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main - HEAD - - commons/parent commons/build_tools - commons/code-parent commons/unittest_tools mappingservice distribution @@ -31,33 +23,108 @@ - - - ${basedir}/src/main/resources - - - ${project.build.directory}/generated-resources - true - - + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-shared-resources - - unpack-dependencies - - generate-resources - - ${project.build.directory}/generated-resources - true - - - + + com.google.code.sortpom + maven-sortpom-plugin + + + + + + + true + never + + + false + + opendaylight-mirror + opendaylight-mirror + http://nexus.opendaylight.org/content/groups/public/ + + + + + false + + + true + + opendaylight-snapshot + opendaylight-snapshot + http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + + + + true + + + false + + opendaylight-snapshot-release + opendaylight-snapshot-release + http://nexus.opendaylight.org/content/repositories/opendaylight.release/ + + + + true + never + + maven-restlet + Public online Restlet repository + http://maven.restlet.org + + + + + + + + + true + never + + + false + + opendaylight-mirror + opendaylight-mirror + http://nexus.opendaylight.org/content/groups/public/ + + + + + false + + + true + + opendaylight-snapshot + opendaylight-snapshot + http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + + + -- 2.36.6