From: Claudio D. Gasparini Date: Fri, 20 Jan 2017 10:16:51 +0000 (+0100) Subject: BUG-7512: BMP features migration to karaf 4 X-Git-Tag: release/carbon~62 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=9c1e95f59efacd06968a345ef84e61570cbfb717;p=bgpcep.git BUG-7512: BMP features migration to karaf 4 BMP features migration to karaf 4 Change-Id: Iee8a60c7831cb8a5af791b297b2052648e21b26e Signed-off-by: Claudio D. Gasparini Signed-off-by: Robert Varga --- diff --git a/artifacts/pom.xml b/artifacts/pom.xml index f1d108c1e8..c8de60ef03 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -640,6 +640,7 @@ xml ${project.version} + org.opendaylight.bgpcep features-bmp @@ -647,6 +648,20 @@ xml ${project.version} + + org.opendaylight.bgpcep + features4-bmp + features + xml + ${project.version} + + + org.opendaylight.bgpcep + odl-bgpcep-bmp + features + xml + ${project.version} + org.opendaylight.bgpcep diff --git a/features/bmp/features-bmp/pom.xml b/features/bmp/features-bmp/pom.xml new file mode 100644 index 0000000000..90d0df47ad --- /dev/null +++ b/features/bmp/features-bmp/pom.xml @@ -0,0 +1,200 @@ + + 4.0.0 + + org.opendaylight.odlparent + features-parent + 1.8.0-SNAPSHOT + + + features-bmp + org.opendaylight.bgpcep + 0.7.0-SNAPSHOT + + + 1.1.0-SNAPSHOT + 1.5.0-SNAPSHOT + 0.10.0-SNAPSHOT + 0.6.0-SNAPSHOT + 1.8.0-SNAPSHOT + + + + + + org.opendaylight.bgpcep + bgpcep-artifacts + ${project.version} + pom + import + + + + + org.opendaylight.yangtools + yangtools-artifacts + ${yangtools.version} + import + pom + + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + ${mdsal.model.version} + import + pom + + + + + org.opendaylight.controller + mdsal-artifacts + ${controller.mdsal.version} + import + pom + + + org.opendaylight.controller + config-artifacts + ${config.version} + import + pom + + + + + + + org.opendaylight.yangtools + features-yangtools + features + xml + runtime + + + org.opendaylight.controller + features-mdsal + features + xml + runtime + + + org.opendaylight.controller + features-config + features + xml + runtime + + + org.opendaylight.controller + features-config-netty + features + xml + runtime + + + org.opendaylight.bgpcep + features-bgp + features + xml + runtime + + + + ${project.groupId} + concepts + + + ${project.groupId} + data-change-counter + + + ${project.groupId} + bgp-controller-config + xml + config + runtime + + + ${project.groupId} + bgp-controller-config + xml + bmp-config + runtime + + + ${project.groupId} + bgp-controller-config + xml + bmp-config-example + runtime + + + ${project.groupId} + bgp-bmp-api + + + ${project.groupId} + bgp-bmp-spi + + + ${project.groupId} + bgp-bmp-impl + + + ${project.groupId} + bgp-bmp-parser-impl + + + ${project.groupId} + data-change-counter-controller-config + xml + config + runtime + + + ${project.groupId} + rsvp-api + + + ${project.groupId} + topology-api + + + ${project.groupId} + topology-segment-routing + + + ${project.groupId} + util + + + io.netty + netty-buffer + + + com.google.guava + guava + + + org.opendaylight.mdsal.model + opendaylight-l2-types + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + diff --git a/features/bmp/src/main/features/features.xml b/features/bmp/features-bmp/src/main/features/features.xml similarity index 100% rename from features/bmp/src/main/features/features.xml rename to features/bmp/features-bmp/src/main/features/features.xml diff --git a/features/bmp/features4-bmp/pom.xml b/features/bmp/features4-bmp/pom.xml new file mode 100644 index 0000000000..30446e9a1c --- /dev/null +++ b/features/bmp/features4-bmp/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + + org.opendaylight.odlparent + feature-repo-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.bgpcep + features4-bmp + 0.7.0-SNAPSHOT + feature + + + + + org.opendaylight.bgpcep + bgpcep-artifacts + ${project.version} + pom + import + + + + + + + ${project.groupId} + odl-bgpcep-bmp + xml + features + runtime + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + \ No newline at end of file diff --git a/features/bmp/odl-bgpcep-bmp/pom.xml b/features/bmp/odl-bgpcep-bmp/pom.xml new file mode 100644 index 0000000000..974fc48d02 --- /dev/null +++ b/features/bmp/odl-bgpcep-bmp/pom.xml @@ -0,0 +1,199 @@ + + + 4.0.0 + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.bgpcep + odl-bgpcep-bmp + 0.7.0-SNAPSHOT + feature + + OpenDaylight :: BMP + + + 1.5.0-SNAPSHOT + 0.6.0-SNAPSHOT + + + + + + + org.opendaylight.bgpcep + bgpcep-artifacts + ${project.version} + pom + import + + + + org.opendaylight.controller + config-artifacts + ${config.version} + import + pom + + + org.opendaylight.controller + mdsal-artifacts + ${controller.mdsal.version} + import + pom + + + + + + + ${project.groupId} + bgp-bmp-api + + + ${project.groupId} + bgp-bmp-spi + + + ${project.groupId} + bgp-bmp-parser-impl + + + ${project.groupId} + bgp-bmp-impl + + + ${project.groupId} + odl-bgpcep-bgp-dependencies + xml + features + runtime + + + ${project.groupId} + odl-bgpcep-bgp-parser + xml + features + runtime + + + ${project.groupId} + odl-bgpcep-bgp-rib-api + xml + features + runtime + + + ${project.groupId} + odl-bgpcep-bgp-rib-impl + xml + features + runtime + + + ${project.groupId} + odl-bgpcep-bgp-linkstate + xml + features + runtime + + + ${project.groupId} + odl-bgpcep-bgp-flowspec + xml + features + runtime + + + ${project.groupId} + odl-bgpcep-bgp-labeled-unicast + xml + features + runtime + + + ${project.groupId} + odl-bgpcep-bgp-l3vpn + xml + features + runtime + + + ${project.groupId} + odl-bgpcep-bgp-evpn + xml + features + runtime + + + ${project.groupId} + odl-bgpcep-bgp-openconfig + xml + features + runtime + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + runtime + + + org.opendaylight.controller + odl-config-netty + xml + features + runtime + + + org.opendaylight.controller + odl-config-netty-config-api + xml + features + runtime + + + ${project.groupId} + bgp-controller-config + xml + config + runtime + + + ${project.groupId} + bgp-controller-config + xml + bmp-config + runtime + + + ${project.groupId} + bgp-controller-config + xml + bmp-config-example + runtime + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + \ No newline at end of file diff --git a/features/bmp/odl-bgpcep-bmp/src/main/feature/feature.xml b/features/bmp/odl-bgpcep-bmp/src/main/feature/feature.xml new file mode 100644 index 0000000000..95a6ccd403 --- /dev/null +++ b/features/bmp/odl-bgpcep-bmp/src/main/feature/feature.xml @@ -0,0 +1,18 @@ + + + + + + mvn:org.opendaylight.bgpcep/bgp-controller-config/${project.version}/xml/config + mvn:org.opendaylight.bgpcep/bgp-controller-config/${project.version}/xml/bmp-config + mvn:org.opendaylight.bgpcep/bgp-controller-config/${project.version}/xml/bmp-config-example + + diff --git a/features/bmp/pom.xml b/features/bmp/pom.xml index ac4ddb0028..7f382c8057 100644 --- a/features/bmp/pom.xml +++ b/features/bmp/pom.xml @@ -1,185 +1,37 @@ - - 4.0.0 - - org.opendaylight.odlparent - features-parent - 1.8.0-SNAPSHOT - - - features-bmp - org.opendaylight.bgpcep - 0.7.0-SNAPSHOT - - - 1.1.0-SNAPSHOT - 1.5.0-SNAPSHOT - 0.10.0-SNAPSHOT - 0.6.0-SNAPSHOT - 1.8.0-SNAPSHOT - - - - - - org.opendaylight.bgpcep - bgpcep-artifacts - ${project.version} - pom - import - - - - - org.opendaylight.yangtools - yangtools-artifacts - ${yangtools.version} - import - pom - - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${mdsal.model.version} - import - pom - - - - - org.opendaylight.controller - mdsal-artifacts - ${controller.mdsal.version} - import - pom - - - org.opendaylight.controller - config-artifacts - ${config.version} - import - pom - - - - - - - org.opendaylight.yangtools - features-yangtools - features - xml - - - org.opendaylight.controller - features-mdsal - features - xml - - - org.opendaylight.controller - features-config - features - xml - - - org.opendaylight.controller - features-config-netty - features - xml - - - org.opendaylight.bgpcep - features-bgp - features - xml - - - - ${project.groupId} - concepts - - - ${project.groupId} - data-change-counter - - - ${project.groupId} - bgp-controller-config - xml - bmp-config - - - ${project.groupId} - bgp-controller-config - xml - bmp-config-example - - - ${project.groupId} - bgp-bmp-api - - - ${project.groupId} - bgp-bmp-spi - - - ${project.groupId} - bgp-bmp-impl - - - ${project.groupId} - bgp-bmp-parser-impl - - - ${project.groupId} - data-change-counter-controller-config - xml - config - - - ${project.groupId} - rsvp-api - - - ${project.groupId} - topology-api - - - ${project.groupId} - topology-segment-routing - - - ${project.groupId} - util - - - io.netty - netty-buffer - - - com.google.guava - guava - - - org.opendaylight.mdsal.model - opendaylight-l2-types - - - - - ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ - - - - opendaylight-site - ${nexus.site.url}/${project.artifactId}/ - - + + 4.0.0 + + org.opendaylight.odlparent + odlparent-lite + 1.8.0-SNAPSHOT + + + + features-aggregator-bmp + org.opendaylight.bgpcep + 0.7.0-SNAPSHOT + pom + + + features-bmp + features4-bmp + odl-bgpcep-bmp + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + +