diff options
Diffstat (limited to 'v3po/features')
| -rw-r--r-- | v3po/features/pom.xml | 193 | ||||
| -rw-r--r-- | v3po/features/src/main/features/features.xml | 63 |
2 files changed, 23 insertions, 233 deletions
diff --git a/v3po/features/pom.xml b/v3po/features/pom.xml index 2929e5d87..8ffdb10e4 100644 --- a/v3po/features/pom.xml +++ b/v3po/features/pom.xml @@ -37,117 +37,22 @@ <dlux.version>0.3.2-Beryllium-SR2</dlux.version> <configfile.directory>etc/opendaylight/karaf</configfile.directory> </properties> - <dependencyManagement> - <dependencies> - <!-- project specific dependencies --> - <dependency> - <groupId>org.opendaylight.controller</groupId> - <artifactId>mdsal-artifacts</artifactId> - <version>${mdsal.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - <dependency> - <groupId>org.opendaylight.netconf</groupId> - <artifactId>restconf-artifacts</artifactId> - <version>${restconf.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - <dependency> - <groupId>org.opendaylight.netconf</groupId> - <artifactId>netconf-artifacts</artifactId> - <version>${netconf.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> <dependencies> <dependency> - <groupId>org.opendaylight.yangtools</groupId> - <artifactId>features-yangtools</artifactId> - <classifier>features</classifier> - <version>${yangtools.version}</version> - <type>xml</type> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.opendaylight.mdsal.model</groupId> - <artifactId>features-mdsal-model</artifactId> - <version>${mdsal.model.version}</version> - <classifier>features</classifier> - <type>xml</type> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.opendaylight.controller</groupId> - <artifactId>features-mdsal</artifactId> - <classifier>features</classifier> - <type>xml</type> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.opendaylight.netconf</groupId> - <artifactId>features-restconf</artifactId> - <classifier>features</classifier> - <type>xml</type> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.opendaylight.netconf</groupId> - <artifactId>features-netconf-connector</artifactId> + <groupId>io.fd.honeycomb</groupId> + <artifactId>honeycomb-features</artifactId> <classifier>features</classifier> + <version>${project.version}</version> <type>xml</type> <scope>runtime</scope> </dependency> <dependency> - <groupId>org.opendaylight.dlux</groupId> - <artifactId>features-dlux</artifactId> + <groupId>io.fd.honeycomb.vpp</groupId> + <artifactId>vpp-common-features</artifactId> <classifier>features</classifier> - <version>${dlux.version}</version> - <type>xml</type> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>v3po-impl</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>v3po-impl</artifactId> <version>${project.version}</version> <type>xml</type> - <classifier>config</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>v3po-impl</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>netconf</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>v3po-impl</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>init</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>v3po-impl</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>context</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>v3po-impl</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>restconf</classifier> + <scope>runtime</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -156,87 +61,6 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>data-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>data-impl</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>notification-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>notification-impl</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>notification-impl</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>config</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>notification-impl</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>notification2netconf</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vpp-jvpp-cfg</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vpp-jvpp-cfg</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>config</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vpp-cfg-init</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>translate-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>translate-spi</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>translate-impl</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>translate-utils</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jgrapht</groupId> - <artifactId>jgrapht-core</artifactId> - <version>0.9.2</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vpp-translate-utils</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>v3po2vpp</artifactId> <version>${project.version}</version> </dependency> @@ -247,10 +71,5 @@ <type>xml</type> <classifier>config</classifier> </dependency> - <dependency> - <groupId>io.fd.vpp</groupId> - <artifactId>jvpp</artifactId> - <version>16.09-SNAPSHOT</version> - </dependency> </dependencies> </project> diff --git a/v3po/features/src/main/features/features.xml b/v3po/features/src/main/features/features.xml index 8419fbebd..ef2a27532 100644 --- a/v3po/features/src/main/features/features.xml +++ b/v3po/features/src/main/features/features.xml @@ -17,61 +17,32 @@ <features name="odl-v3po-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository> - <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository> + + <repository>mvn:io.fd.honeycomb/honeycomb-features/${project.version}/xml/features</repository> + <repository>mvn:io.fd.honeycomb.vpp/vpp-common-features/${project.version}/xml/features</repository> <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository> - <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository> - <repository>mvn:org.opendaylight.netconf/features-netconf-connector/${netconf.version}/xml/features</repository> - <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository> - <feature name='odl-v3po-api' version='${project.version}' description='OpenDaylight :: v3po :: api'> + <feature name='odl-honeycomb-v3po-api' version='${project.version}' description='OpenDaylight :: v3po :: api'> <feature version='${mdsal.model.version}'>odl-mdsal-models</feature> - <bundle>mvn:io.fd.honeycomb.v3po/v3po-api/${project.version}</bundle> + <bundle>mvn:io.fd.honeycomb.v3po/v3po-api/{{VERSION}}</bundle> </feature> - <feature name='odl-v3po' version='${project.version}' description='OpenDaylight :: v3po'> - <feature version='${mdsal.version}'>odl-mdsal-broker</feature> - <feature version='${project.version}'>odl-v3po-api</feature> - <!-- FIXME remove netconf-connector-ssh from features, only netconf northbound is needed --> - <feature version='${netconf.version}'>odl-netconf-connector-ssh</feature> - <feature version='${mdsal.version}'>odl-netconf-mdsal</feature> - <bundle>mvn:io.fd.honeycomb.v3po/v3po-impl/${project.version}</bundle> - <bundle>mvn:io.fd.honeycomb.v3po/translate-api/${project.version}</bundle> - <bundle>mvn:io.fd.honeycomb.v3po/translate-spi/${project.version}</bundle> - <bundle>mvn:org.jgrapht/jgrapht-core/{{VERSION}}</bundle> - <bundle>mvn:io.fd.honeycomb.v3po/translate-utils/${project.version}</bundle> - <bundle>mvn:io.fd.honeycomb.v3po/vpp-translate-utils/${project.version}</bundle> - <bundle>mvn:io.fd.honeycomb.v3po/data-api/${project.version}</bundle> - <bundle>mvn:io.fd.honeycomb.v3po/data-impl/${project.version}</bundle> - <bundle>mvn:io.fd.honeycomb.v3po/notification-api/${project.version}</bundle> - <bundle>mvn:io.fd.honeycomb.v3po/notification-impl/${project.version}</bundle> - <bundle>mvn:io.fd.honeycomb.v3po/translate-impl/${project.version}</bundle> - <bundle>wrap:mvn:io.fd.vpp/jvpp/16.09-SNAPSHOT</bundle> - <bundle>mvn:io.fd.honeycomb.v3po/vpp-jvpp-cfg/${project.version}</bundle> - <bundle>mvn:io.fd.honeycomb.v3po/v3po2vpp/${project.version}</bundle> - <bundle>mvn:io.fd.honeycomb.v3po/vpp-cfg-init/${project.version}</bundle> - <configfile finalname="${configfile.directory}/vpp-jvpp.xml">mvn:io.fd.honeycomb.v3po/vpp-jvpp-cfg/${project.version}/xml/config</configfile> - <configfile finalname="${configfile.directory}/v3po-context.xml">mvn:io.fd.honeycomb.v3po/v3po-impl/${project.version}/xml/context</configfile> - <configfile finalname="${configfile.directory}/v3po-notification.xml">mvn:io.fd.honeycomb.v3po/notification-impl/${project.version}/xml/config</configfile> - <configfile finalname="${configfile.directory}/v3po.xml">mvn:io.fd.honeycomb.v3po/v3po-impl/${project.version}/xml/config</configfile> - <configfile finalname="${configfile.directory}/v3po-init.xml">mvn:io.fd.honeycomb.v3po/v3po-impl/${project.version}/xml/init</configfile> - <configfile finalname="${configfile.directory}/v3po2vpp.xml">mvn:io.fd.honeycomb.v3po/v3po2vpp/${project.version}/xml/config</configfile> + <feature name='odl-honeycomb-v3po' version='${project.version}' description='OpenDaylight :: v3po'> + <feature version='${project.version}'>odl-honeycomb</feature> + <feature version='${project.version}'>odl-honeycomb-vpp-common</feature> + <feature version='${project.version}'>odl-honeycomb-v3po-api</feature> + <bundle>mvn:io.fd.honeycomb.v3po/v3po2vpp/{{VERSION}}</bundle> + <configfile finalname="${configfile.directory}/honeycomb-v3po.xml">mvn:io.fd.honeycomb.v3po/v3po2vpp/{{VERSION}}/xml/config</configfile> </feature> - <feature name='odl-v3po-rest' version='${project.version}' description='OpenDaylight :: v3po :: REST'> - <feature version="${project.version}">odl-v3po</feature> - <feature version="${restconf.version}">odl-restconf</feature> - <!-- Northbound interfaces configuration --> - <configfile finalname="${configfile.directory}/v3po-netconf.xml">mvn:io.fd.honeycomb.v3po/v3po-impl/${project.version}/xml/netconf</configfile> - <configfile finalname="${configfile.directory}/v3po-notification2netconf.xml">mvn:io.fd.honeycomb.v3po/notification-impl/${project.version}/xml/notification2netconf</configfile> - <configfile finalname="${configfile.directory}/v3po-restconf.xml">mvn:io.fd.honeycomb.v3po/v3po-impl/${project.version}/xml/restconf</configfile> + <feature name='odl-honeycomb-v3po-rest' version='${project.version}' description='OpenDaylight :: v3po :: rest'> + <feature version='${project.version}'>odl-honeycomb-rest</feature> + <feature version='${project.version}'>odl-honeycomb-v3po</feature> </feature> - <feature name='odl-v3po-ui' version='${project.version}' description='OpenDaylight :: v3po :: UI'> - <feature version="${project.version}">odl-v3po-rest</feature> - <feature version="${restconf.version}">odl-mdsal-apidocs</feature> - <feature version="${mdsal.version}">odl-mdsal-xsql</feature> - <feature version="${dlux.version}">odl-dlux-yangui</feature> + <feature name='odl-honeycomb-v3po-ui' version='${project.version}' description='OpenDaylight :: v3po :: ui'> + <feature version='${project.version}'>odl-honeycomb-ui</feature> + <feature version='${project.version}'>odl-honeycomb-v3po-rest</feature> </feature> </features> |