Change-Id: I91fc936c3497d844495105db4aab58a615bb916b
Signed-off-by: Sam Hague <shague@redhat.com>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<classifier>features</classifier>
<type>xml</type>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.netvirt</groupId>
+ <artifactId>vpnservice-features</artifactId>
+ <version>${feature.netvirt.vpnservice.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </dependency>
+ <dependency>
<groupId>org.opendaylight.netide</groupId>
<artifactId>netide-features</artifactId>
<version>${feature.netide.version}</version>
<groupId>org.opendaylight.netide</groupId>
<artifactId>netide-features</artifactId>
<version>${feature.netide.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<classifier>features</classifier>
<type>xml</type>
</dependency>
- <dependency>
- <groupId>org.opendaylight.vpnservice</groupId>
- <artifactId>vpnservice-features</artifactId>
- <version>${feature.vpnservice.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- </dependency>
<dependency>
<groupId>org.opendaylight.yang-push</groupId>
<artifactId>yangpush-features</artifactId>
<dependency>
<groupId>org.opendaylight.yang-push</groupId>
<artifactId>yangpush-features</artifactId>
<repository>mvn:org.opendaylight.netide/netide-features/${feature.netide.version}/xml/features</repository>
<repository>mvn:org.opendaylight.netvirt/features-netvirt/${feature.netvirt.version}/xml/features</repository>
<repository>mvn:org.opendaylight.netvirt/openstack.net-virt-sfc-features/${feature.netvirt.version}/xml/features</repository>
<repository>mvn:org.opendaylight.netide/netide-features/${feature.netide.version}/xml/features</repository>
<repository>mvn:org.opendaylight.netvirt/features-netvirt/${feature.netvirt.version}/xml/features</repository>
<repository>mvn:org.opendaylight.netvirt/openstack.net-virt-sfc-features/${feature.netvirt.version}/xml/features</repository>
+ <repository>mvn:org.opendaylight.netvirt/vpnservice-features/${feature.netvirt.vpnservice.version}/xml/features</repository>
<repository>mvn:org.opendaylight.neutron/features-neutron/${feature.neutron.version}/xml/features</repository>
<repository>mvn:org.opendaylight.nic/features-nic/${feature.nic.version}/xml/features</repository>
<repository>mvn:org.opendaylight.ocpplugin/features-ocpplugin/${feature.ocpplugin.version}/xml/features</repository>
<repository>mvn:org.opendaylight.neutron/features-neutron/${feature.neutron.version}/xml/features</repository>
<repository>mvn:org.opendaylight.nic/features-nic/${feature.nic.version}/xml/features</repository>
<repository>mvn:org.opendaylight.ocpplugin/features-ocpplugin/${feature.ocpplugin.version}/xml/features</repository>
<repository>mvn:org.opendaylight.unimgr/unimgr-features/${feature.unimgr.version}/xml/features</repository>
<repository>mvn:org.opendaylight.usc/usc-features/${feature.usc.version}/xml/features</repository>
<repository>mvn:org.opendaylight.usecplugin/usecplugin-features/${feature.usecplugin.version}/xml/features</repository>
<repository>mvn:org.opendaylight.unimgr/unimgr-features/${feature.unimgr.version}/xml/features</repository>
<repository>mvn:org.opendaylight.usc/usc-features/${feature.usc.version}/xml/features</repository>
<repository>mvn:org.opendaylight.usecplugin/usecplugin-features/${feature.usecplugin.version}/xml/features</repository>
- <repository>mvn:org.opendaylight.vpnservice/vpnservice-features/${feature.vpnservice.version}/xml/features</repository>
<repository>mvn:org.opendaylight.vtn/features-vtn-manager/${feature.vtn-manager.version}/xml/features</repository>
<repository>mvn:org.opendaylight.yang-push/yangpush-features/${feature.yang-push.version}/xml/features</repository>
</features>
<repository>mvn:org.opendaylight.vtn/features-vtn-manager/${feature.vtn-manager.version}/xml/features</repository>
<repository>mvn:org.opendaylight.yang-push/yangpush-features/${feature.yang-push.version}/xml/features</repository>
</features>
which leads to BindException.
<feature version='${feature.lacp.version}'>odl-lacp-ui</feature>
-->
which leads to BindException.
<feature version='${feature.lacp.version}'>odl-lacp-ui</feature>
-->
+ <feature version='${feature.netvirt.vpnservice.version}'>odl-netvirt-vpnservice-openstack</feature>
<!--
Commented out, because NIC brings in Li designed OpenFlowPlugin
which leads to BindException.
<!--
Commented out, because NIC brings in Li designed OpenFlowPlugin
which leads to BindException.
<feature version='${feature.snbi.version}'>odl-snbi-all</feature>
<feature version='${feature.sfc.version}'>odl-sfcofl2</feature>
<feature version='${feature.tsdr.version}'>odl-tsdr-hsqldb-all</feature>
<feature version='${feature.snbi.version}'>odl-snbi-all</feature>
<feature version='${feature.sfc.version}'>odl-sfcofl2</feature>
<feature version='${feature.tsdr.version}'>odl-tsdr-hsqldb-all</feature>
- <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</feature>
- <feature version='${feature.vpnservice.version}'>odl-vpnservice-openstack</feature>
<feature version='${feature.vtn-manager.version}'>odl-vtn-manager-neutron</feature>
<feature version='${feature.vtn-manager.version}'>odl-vtn-manager-rest</feature>
<feature version='${feature.yang-push.version}'>odl-yangpush-api</feature>
<feature version='${feature.vtn-manager.version}'>odl-vtn-manager-neutron</feature>
<feature version='${feature.vtn-manager.version}'>odl-vtn-manager-rest</feature>
<feature version='${feature.yang-push.version}'>odl-yangpush-api</feature>
<feature.netconf.version>1.1.0-SNAPSHOT</feature.netconf.version>
<feature.netide.version>0.2.0-SNAPSHOT</feature.netide.version>
<feature.netvirt.version>1.3.0-SNAPSHOT</feature.netvirt.version>
<feature.netconf.version>1.1.0-SNAPSHOT</feature.netconf.version>
<feature.netide.version>0.2.0-SNAPSHOT</feature.netide.version>
<feature.netvirt.version>1.3.0-SNAPSHOT</feature.netvirt.version>
+ <feature.netvirt.vpnservice.version>0.3.0-SNAPSHOT</feature.netvirt.vpnservice.version>
<feature.nic.version>1.2.0-SNAPSHOT</feature.nic.version>
<feature.neutron.version>0.7.0-SNAPSHOT</feature.neutron.version>
<feature.ocpplugin.version>0.1.0-SNAPSHOT</feature.ocpplugin.version>
<feature.nic.version>1.2.0-SNAPSHOT</feature.nic.version>
<feature.neutron.version>0.7.0-SNAPSHOT</feature.neutron.version>
<feature.ocpplugin.version>0.1.0-SNAPSHOT</feature.ocpplugin.version>
<feature.unimgr.version>0.1.0-SNAPSHOT</feature.unimgr.version>
<feature.usc.version>1.2.0-SNAPSHOT</feature.usc.version>
<feature.usecplugin.version>1.1.0-SNAPSHOT</feature.usecplugin.version>
<feature.unimgr.version>0.1.0-SNAPSHOT</feature.unimgr.version>
<feature.usc.version>1.2.0-SNAPSHOT</feature.usc.version>
<feature.usecplugin.version>1.1.0-SNAPSHOT</feature.usecplugin.version>
- <feature.vpnservice.version>0.3.0-SNAPSHOT</feature.vpnservice.version>
<feature.vtn-manager.version>0.5.0-SNAPSHOT</feature.vtn-manager.version>
<feature.yang-push.version>1.1.0-SNAPSHOT</feature.yang-push.version>
<feature.yangtools.version>1.0.0-SNAPSHOT</feature.yangtools.version>
<feature.vtn-manager.version>0.5.0-SNAPSHOT</feature.vtn-manager.version>
<feature.yang-push.version>1.1.0-SNAPSHOT</feature.yang-push.version>
<feature.yangtools.version>1.0.0-SNAPSHOT</feature.yangtools.version>