Bug 7633: Karaf 4 vpnservice features

Change-Id: I74b33b43100fdd5fccdb5e05f07983f0da69b628
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/vpnservice/bgpmanager/bgpmanager-impl/pom.xml b/vpnservice/bgpmanager/bgpmanager-impl/pom.xml
index 6b16d7060e548295844589a32174c97d0d726fdd..1312d8934efde77bbac3b5372762924a26c85075 100644 (file)
--- a/vpnservice/bgpmanager/bgpmanager-impl/pom.xml
+++ b/vpnservice/bgpmanager/bgpmanager-impl/pom.xml
@@ -74,13 +74,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.console</artifactId>
-            <version>3.0.3</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-            </exclusions>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
@@ -114,6 +108,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                 <excludes>**/gen/**/*</excludes>
             </configuration>
         </plugin>
+        <plugin>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>maven-bundle-plugin</artifactId>
+            <extensions>true</extensions>
+            <configuration>
+                <instructions>
+                    <!-- This bundle works with Karaf 3 and 4.0 -->
+                    <Import-Package>
+                        org.apache.karaf.shell.commands;version="[3.0.0,4.1)",
+                        org.apache.karaf.shell.console;version="[3.0.0,4.1)",
+                        *
+                    </Import-Package>
+                </instructions>
+            </configuration>
+        </plugin>
     </plugins>
     </build>
 

diff --git a/vpnservice/commons/binding-parent/pom.xml b/vpnservice/commons/binding-parent/pom.xml
index 835db6f40e525635b9f52f26e5fc74871ae7a6c8..c42785b70aa7506b9f2822ed01ccd2949a225462 100644 (file)
--- a/vpnservice/commons/binding-parent/pom.xml
+++ b/vpnservice/commons/binding-parent/pom.xml
@@ -30,7 +30,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <ietf.inet.types.version>2010.09.24.10-SNAPSHOT</ietf.inet.types.version>
     <ietf.interfaces.version>2014.05.08.10-SNAPSHOT</ietf.interfaces.version>
     <ietf.yang.types.version>2010.09.24.10-SNAPSHOT</ietf.yang.types.version>
-    <karaf.shell.console.version>3.0.3</karaf.shell.console.version>
     <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
     <mdsal.version>2.2.0-SNAPSHOT</mdsal.version>
     <model.bgp.version>2013.07.15.10-SNAPSHOT</model.bgp.version>

diff --git a/vpnservice/commons/config-parent/pom.xml b/vpnservice/commons/config-parent/pom.xml
index 7134a18b023de319cdd445c6ce37f6f6e5aee030..5bca85b126adb1d3eabad9bcbccb65a25a224034 100644 (file)
--- a/vpnservice/commons/config-parent/pom.xml
+++ b/vpnservice/commons/config-parent/pom.xml
@@ -27,7 +27,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <controller.mdsal.version>1.5.0-SNAPSHOT</controller.mdsal.version>
     <genius.version>0.2.0-SNAPSHOT</genius.version>
     <infrautils.version>1.1.0-SNAPSHOT</infrautils.version>
-    <karaf.shell.console.version>3.0.3</karaf.shell.console.version>
     <liblldp.version>0.12.0-SNAPSHOT</liblldp.version>
     <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
     <model.bgp.version>2013.07.15.10-SNAPSHOT</model.bgp.version>

diff --git a/vpnservice/dhcpservice/dhcpservice-impl/pom.xml b/vpnservice/dhcpservice/dhcpservice-impl/pom.xml
index 83a59310210bbe331de24547b226312fac176efb..4999a251fe229c286c27122f4a01f8a709e97ee8 100644 (file)
--- a/vpnservice/dhcpservice/dhcpservice-impl/pom.xml
+++ b/vpnservice/dhcpservice/dhcpservice-impl/pom.xml
@@ -47,7 +47,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.apache.karaf.shell</groupId>
       <artifactId>org.apache.karaf.shell.console</artifactId>
-      <version>${karaf.shell.console.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.neutron</groupId>
@@ -115,6 +115,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <!-- This bundle works with Karaf 3 and 4.0 -->
+            <Import-Package>
+              org.apache.karaf.shell.commands;version="[3.0.0,4.1)",
+              org.apache.karaf.shell.console;version="[3.0.0,4.1)",
+              *
+            </Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <!--

diff --git a/vpnservice/elanmanager/elanmanager-impl/pom.xml b/vpnservice/elanmanager/elanmanager-impl/pom.xml
index c12b8dfcbc28b95bf68ad6a2c05fdd0e42e11e9b..20a9212142406dbe9d2d87dc532dd1c3f55654de 100644 (file)
--- a/vpnservice/elanmanager/elanmanager-impl/pom.xml
+++ b/vpnservice/elanmanager/elanmanager-impl/pom.xml
@@ -66,6 +66,7 @@
     <dependency>
       <groupId>org.apache.karaf.shell</groupId>
       <artifactId>org.apache.karaf.shell.console</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
@@ -169,6 +170,12 @@
           <instructions>
             <Embed-Dependency>utils.config;type=!pom;inline=false</Embed-Dependency>
             <Embed-Transitive>true</Embed-Transitive>
+            <!-- This bundle works with Karaf 3 and 4.0 -->
+            <Import-Package>
+              org.apache.karaf.shell.commands;version="[3.0.0,4.1)",
+              org.apache.karaf.shell.console;version="[3.0.0,4.1)",
+              *
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

diff --git a/vpnservice/features/odl-netvirt-api/pom.xml b/vpnservice/features/odl-netvirt-api/pom.xml
new file mode 100644 (file)
index 0000000..3974168
--- /dev/null
+++ b/vpnservice/features/odl-netvirt-api/pom.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, Inc. and others.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<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.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.netvirt</groupId>
+    <artifactId>odl-netvirt-api</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: NetVirt :: api</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <version>1.5.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-models</artifactId>
+            <version>0.10.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-nsf-model</artifactId>
+            <version>0.4.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-nxm-extensions</artifactId>
+            <version>0.4.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.ovsdb</groupId>
+            <artifactId>odl-ovsdb-southbound-api</artifactId>
+            <version>1.4.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.ovsdb</groupId>
+            <artifactId>odl-ovsdb-hwvtepsouthbound-api</artifactId>
+            <version>1.4.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.genius</groupId>
+            <artifactId>odl-genius-api</artifactId>
+            <version>0.2.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.infrautils</groupId>
+            <artifactId>odl-infrautils-counters</artifactId>
+            <version>1.1.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>liblldp</artifactId>
+            <version>0.12.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netvirt</groupId>
+            <artifactId>vpnmanager-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netvirt</groupId>
+            <artifactId>fibmanager-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netvirt</groupId>
+            <artifactId>neutronvpn-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netvirt</groupId>
+            <artifactId>dhcpservice-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netvirt</groupId>
+            <artifactId>natservice-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netvirt</groupId>
+            <artifactId>aclservice-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netvirt</groupId>
+            <artifactId>ipv6service-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netvirt</groupId>
+            <artifactId>elanmanager-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netvirt</groupId>
+            <artifactId>statistics-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netvirt</groupId>
+            <artifactId>cloud-servicechain-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file

diff --git a/vpnservice/features/odl-netvirt-federation/pom.xml b/vpnservice/features/odl-netvirt-federation/pom.xml
new file mode 100644 (file)
index 0000000..9457fa1
--- /dev/null
+++ b/vpnservice/features/odl-netvirt-federation/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, Inc. and others.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<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.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.netvirt</groupId>
+    <artifactId>odl-netvirt-federation</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: NetVirt :: Federation</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-netvirt-openstack</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.federation</groupId>
+            <artifactId>federation-with-rabbit</artifactId>
+            <version>0.2.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.infrautils</groupId>
+            <artifactId>odl-infrautils-inject</artifactId>
+            <version>1.1.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>federation-plugin-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file

diff --git a/vpnservice/features/odl-netvirt-impl/pom.xml b/vpnservice/features/odl-netvirt-impl/pom.xml
new file mode 100644 (file)
index 0000000..f00f20d
--- /dev/null
+++ b/vpnservice/features/odl-netvirt-impl/pom.xml
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, Inc. and others.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<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.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.netvirt</groupId>
+    <artifactId>odl-netvirt-impl</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: NetVirt :: impl</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <version>1.5.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.ovsdb</groupId>
+            <artifactId>odl-ovsdb-southbound-impl</artifactId>
+            <version>1.4.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.ovsdb</groupId>
+            <artifactId>odl-ovsdb-hwvtepsouthbound</artifactId>
+            <version>1.4.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-netvirt-api</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-southbound</artifactId>
+            <version>0.4.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-flow-services</artifactId>
+            <version>0.4.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.genius</groupId>
+            <artifactId>odl-genius</artifactId>
+            <version>0.2.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.infrautils</groupId>
+            <artifactId>odl-infrautils-inject</artifactId>
+            <version>1.1.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgpmanager-impl</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <!-- This needs to be wrapped, see feature.xml -->
+                    <groupId>org.apache.thrift</groupId>
+                    <artifactId>libthrift</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>vpnmanager-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>vpnmanager-shell</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>fibmanager-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>fibmanager-shell</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>neutronvpn-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>neutronvpn-shell</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>dhcpservice-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>cloud-servicechain-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>elanmanager-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>natservice-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aclservice-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>qosservice-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>policyservice-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ipv6service-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>statemanager-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>statistics-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <!-- finalname="etc/opendaylight/datastore/initial/config/netvirt-aclservice-config.xml" -->
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aclservice-impl</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>config</classifier>
+        </dependency>
+        <dependency>
+            <!-- finalname="etc/opendaylight/datastore/initial/config/netvirt-dhcpservice-config.xml" -->
+            <groupId>${project.groupId}</groupId>
+            <artifactId>dhcpservice-impl</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>config</classifier>
+        </dependency>
+        <dependency>
+            <!-- finalname="etc/opendaylight/datastore/initial/config/netvirt-elanmanager-config.xml" -->
+            <groupId>${project.groupId}</groupId>
+            <artifactId>elanmanager-impl</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>config</classifier>
+        </dependency>
+        <dependency>
+            <!-- finalname="etc/opendaylight/datastore/initial/config/netvirt-neutronvpn-config.xml" -->
+            <groupId>${project.groupId}</groupId>
+            <artifactId>neutronvpn-impl</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>config</classifier>
+        </dependency>
+        <dependency>
+            <!-- finalname="etc/opendaylight/datastore/initial/config/netvirt-qosalert-config.xml" -->
+            <groupId>${project.groupId}</groupId>
+            <artifactId>qosservice-impl</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>config</classifier>
+        </dependency>
+        <dependency>
+            <!-- finalname="etc/opendaylight/datastore/initial/config/netvirt-statistics-config.xml" -->
+            <groupId>${project.groupId}</groupId>
+            <artifactId>statistics-impl</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>config</classifier>
+        </dependency>
+        <dependency>
+            <!-- finalname="etc/opendaylight/datastore/initial/config/netvirt-vpnmanager-config.xml" -->
+            <groupId>${project.groupId}</groupId>
+            <artifactId>vpnmanager-impl</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>config</classifier>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file

diff --git a/vpnservice/features/odl-netvirt-impl/src/main/feature/feature.xml b/vpnservice/features/odl-netvirt-impl/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..ac2bc4e
--- /dev/null
+++ b/vpnservice/features/odl-netvirt-impl/src/main/feature/feature.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, Inc. and others.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<features name="odl-netvirt-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
+    <feature name="odl-netvirt-impl" version="${project.version}">
+        <bundle>wrap:mvn:org.apache.thrift/libthrift/0.9.1$overwrite=merge&amp;Bundle-Version=0.9.1&amp;Export-Package=*;-noimport:=true;version="0.9.1"</bundle>
+        <configfile finalname="etc/opendaylight/datastore/initial/config/netvirt-aclservice-config.xml">
+            mvn:org.opendaylight.netvirt/aclservice-impl/${project.version}/xml/config
+        </configfile>
+        <configfile finalname="etc/opendaylight/datastore/initial/config/netvirt-dhcpservice-config.xml">
+            mvn:org.opendaylight.netvirt/dhcpservice-impl/${project.version}/xml/config
+        </configfile>
+        <configfile finalname="etc/opendaylight/datastore/initial/config/netvirt-elanmanager-config.xml">
+            mvn:org.opendaylight.netvirt/elanmanager-impl/${project.version}/xml/config
+        </configfile>
+        <configfile finalname="etc/opendaylight/datastore/initial/config/netvirt-neutronvpn-config.xml">
+            mvn:org.opendaylight.netvirt/neutronvpn-impl/${project.version}/xml/config
+        </configfile>
+        <configfile finalname="etc/opendaylight/datastore/initial/config/netvirt-qosalert-config.xml">
+            mvn:org.opendaylight.netvirt/qosservice-impl/${project.version}/xml/config
+        </configfile>
+        <configfile finalname="etc/opendaylight/datastore/initial/config/netvirt-statistics-config.xml">
+            mvn:org.opendaylight.netvirt/statistics-impl/${project.version}/xml/config
+        </configfile>
+        <configfile finalname="etc/opendaylight/datastore/initial/config/netvirt-vpnmanager-config.xml">
+            mvn:org.opendaylight.netvirt/vpnmanager-impl/${project.version}/xml/config
+        </configfile>
+    </feature>
+</features>

diff --git a/vpnservice/features/odl-netvirt-openstack/pom.xml b/vpnservice/features/odl-netvirt-openstack/pom.xml
new file mode 100644 (file)
index 0000000..0690d9e
--- /dev/null
+++ b/vpnservice/features/odl-netvirt-openstack/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, Inc. and others.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<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.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.netvirt</groupId>
+    <artifactId>odl-netvirt-openstack</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: NetVirt :: OpenStack</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.neutron</groupId>
+            <artifactId>odl-neutron-service</artifactId>
+            <version>0.8.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-netvirt-impl</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-restconf</artifactId>
+            <version>1.5.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file

diff --git a/vpnservice/features/odl-netvirt-sfc/pom.xml b/vpnservice/features/odl-netvirt-sfc/pom.xml
new file mode 100644 (file)
index 0000000..8681cfb
--- /dev/null
+++ b/vpnservice/features/odl-netvirt-sfc/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, Inc. and others.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<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.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.netvirt</groupId>
+    <artifactId>odl-netvirt-sfc</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: NetVirt :: SFC</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.sfc</groupId>
+            <artifactId>odl-sfc-provider</artifactId>
+            <version>0.5.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-netvirt-openstack</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sfc.classifier-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sfc.translator</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file

diff --git a/vpnservice/features/odl-netvirt-ui/pom.xml b/vpnservice/features/odl-netvirt-ui/pom.xml
new file mode 100644 (file)
index 0000000..a57019f
--- /dev/null
+++ b/vpnservice/features/odl-netvirt-ui/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, Inc. and others.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<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.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.netvirt</groupId>
+    <artifactId>odl-netvirt-ui</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: NetVirt :: DLUX Integration Plugin</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.dlux</groupId>
+            <artifactId>odl-dlux-core</artifactId>
+            <version>0.5.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ovsdb-ui-bundle</artifactId>
+            <version>1.4.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file

diff --git a/vpnservice/features/pom.xml b/vpnservice/features/pom.xml
index fb94f9bacbf8f8ed04d4a0e8fb216a4727a06b7f..9d54923fa317f26756f555c01ce3e0835a1a5201 100644 (file)
--- a/vpnservice/features/pom.xml
+++ b/vpnservice/features/pom.xml
@@ -1,482 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2015 - 2017 Ericsson India Global Services Pvt Ltd. and
-  others. All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0 which
-  accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
-  INTERNAL -->
-<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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>features-parent</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
-    <relativePath />
-  </parent>
-  <groupId>org.opendaylight.netvirt</groupId>
-  <artifactId>vpnservice-features</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
-  <name>ODL :: netvirt :: ${project.artifactId}</name>
-  <modelVersion>4.0.0</modelVersion>
-  <properties>
-    <mdsal.version>1.5.0-SNAPSHOT</mdsal.version>
-    <openflowplugin.version>0.4.0-SNAPSHOT</openflowplugin.version>
-    <restconf.version>1.5.0-SNAPSHOT</restconf.version>
-    <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
-    <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
-    <vpnservices.version>0.4.0-SNAPSHOT</vpnservices.version>
-    <ovsdb.version>1.4.0-SNAPSHOT</ovsdb.version>
-    <liblldp.version>0.12.0-SNAPSHOT</liblldp.version>
-    <neutron.version>0.8.0-SNAPSHOT</neutron.version>
-    <genius.version>0.2.0-SNAPSHOT</genius.version>
-    <infrautils.version>1.1.0-SNAPSHOT</infrautils.version>
-    <arputil.version>${genius.version}</arputil.version>
-    <mdsalutil.version>${genius.version}</mdsalutil.version>
-    <vpnmanager.version>${vpnservices.version}</vpnmanager.version>
-    <interfacemgr.version>${genius.version}</interfacemgr.version>
-    <elanmgr.version>${vpnservices.version}</elanmgr.version>
-    <nexthopmgr.version>${vpnservices.version}</nexthopmgr.version>
-    <fibmanager.version>${vpnservices.version}</fibmanager.version>
-    <lockmanager.version>${genius.version}</lockmanager.version>
-    <idmanager.version>${genius.version}</idmanager.version>
-    <itm.version>${genius.version}</itm.version>
-    <neutronvpn.version>${vpnservices.version}</neutronvpn.version>
-    <statistics.plugin.version>${vpnservices.version}</statistics.plugin.version>
-    <cloud-servicechain.version>${vpnservices.version}</cloud-servicechain.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-    <dlux.version>0.5.0-SNAPSHOT</dlux.version>
-    <federation.version>0.2.0-SNAPSHOT</federation.version>
-    <sfc.version>0.5.0-SNAPSHOT</sfc.version>
-    <legacy.utils.version>1.4.0-SNAPSHOT</legacy.utils.version>
-  </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>
-    </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.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <classifier>features</classifier>
-      <version>${mdsal.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.netvirt</groupId>
-      <artifactId>utils.servicehelper</artifactId>
-      <version>${ovsdb.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netvirt</groupId>
-      <artifactId>utils.mdsal-utils</artifactId>
-      <version>${ovsdb.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>southbound-features</artifactId>
-      <version>${ovsdb.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>hwvtepsouthbound-features</artifactId>
-      <version>${ovsdb.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>features-openflowplugin</artifactId>
-      <classifier>features</classifier>
-      <version>${openflowplugin.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-restconf</artifactId>
-      <classifier>features</classifier>
-      <version>${restconf.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.neutron</groupId>
-      <artifactId>features-neutron</artifactId>
-      <classifier>features</classifier>
-      <version>${neutron.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.genius</groupId>
-      <artifactId>genius-features</artifactId>
-      <version>${genius.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>vpnmanager-impl</artifactId>
-      <version>${vpnmanager.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>vpnmanager-impl</artifactId>
-      <version>${vpnmanager.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>elanmanager-impl</artifactId>
-      <version>${elanmgr.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>elanmanager-impl</artifactId>
-      <version>${elanmgr.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>elanmanager-api</artifactId>
-      <version>${elanmgr.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>liblldp</artifactId>
-      <version>${liblldp.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.genius</groupId>
-      <artifactId>alivenessmonitor-impl</artifactId>
-      <version>${genius.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.genius</groupId>
-      <artifactId>alivenessmonitor-api</artifactId>
-      <version>${genius.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>vpnmanager-api</artifactId>
-      <version>${vpnmanager.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>bgpmanager-impl</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>bgpmanager-api</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>model-bgp</artifactId>
-      <version>2013.07.15.10-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>statistics-api</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>statistics-impl</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>statistics-impl</artifactId>
-      <version>${vpnservices.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>fibmanager-impl</artifactId>
-      <version>${fibmanager.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>fibmanager-shell</artifactId>
-      <version>${fibmanager.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>fibmanager-api</artifactId>
-      <version>${fibmanager.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>dhcpservice-impl</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>dhcpservice-api</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>dhcpservice-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>natservice-impl</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>natservice-api</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>qosservice-api</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>qosservice-impl</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>qosservice-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>aclservice-api</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>aclservice-impl</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>policyservice-api</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>policyservice-impl</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>aclservice-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>ipv6service-api</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>ipv6service-impl</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>neutronvpn-api</artifactId>
-      <version>${neutronvpn.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>neutronvpn-impl</artifactId>
-      <version>${neutronvpn.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>neutronvpn-shell</artifactId>
-      <version>${neutronvpn.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>neutronvpn-impl</artifactId>
-      <version>${neutronvpn.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>vpnmanager-shell</artifactId>
-      <version>${vpnmanager.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>federation-plugin-api</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>federation-plugin-impl</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.thrift</groupId>
-      <artifactId>libthrift</artifactId>
-      <version>0.9.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>features-openflowplugin-extension</artifactId>
-      <classifier>features</classifier>
-      <version>${openflowplugin.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-net</groupId>
-      <artifactId>commons-net</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>cloud-servicechain-api</artifactId>
-      <version>${cloud-servicechain.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>cloud-servicechain-impl</artifactId>
-      <version>${cloud-servicechain.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>statemanager-impl</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.infrautils</groupId>
-      <artifactId>infrautils-features</artifactId>
-      <version>${infrautils.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.dlux</groupId>
-      <artifactId>features-dlux</artifactId>
-      <version>${dlux.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.federation</groupId>
-      <artifactId>federation-features</artifactId>
-      <version>${federation.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>ovsdb-ui-bundle</artifactId>
-      <version>${ovsdb.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sfc.classifier-api</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>utils.mdsal-openflow</artifactId>
-      <version>${legacy.utils.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>utils.mdsal-utils</artifactId>
-      <version>${legacy.utils.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sfc.classifier-impl</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sfc.translator</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
-      <artifactId>features-sfc</artifactId>
-      <version>${sfc.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
-      <artifactId>sfc-provider</artifactId>
-      <version>${sfc.version}</version>
-    </dependency>
-    <dependency>
-      <!-- TODO Remove when https://git.opendaylight.org/gerrit/#/c/44502/
-        is merged -->
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-      <version>1</version>
-    </dependency>
-  </dependencies>
+<!--
+ Copyright © 2017 Red Hat, Inc. and others.
 
-  <!-- Maven Site Configuration The following configuration is necessary
-    for maven-site-plugin to correctly identify the correct deployment path for
-    OpenDaylight Maven sites. -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+    <groupId>org.opendaylight.netvirt</groupId>
+    <artifactId>vpnservice-features-aggregator</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-  <distributionManagement>
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/${project.artifactId}/</url>
-    </site>
-  </distributionManagement>
+    <name>ODL :: netvirt :: ${project.artifactId}</name>
+
+    <modules>
+        <module>vpnservice-features</module>
+        <module>vpnservice-features4</module>
+        <module>odl-netvirt-api</module>
+        <module>odl-netvirt-impl</module>
+        <module>odl-netvirt-openstack</module>
+        <module>odl-netvirt-federation</module>
+        <module>odl-netvirt-ui</module>
+        <module>odl-netvirt-sfc</module>
+    </modules>
+
+    <!-- Maven Site Configuration The following configuration is necessary
+      for maven-site-plugin to correctly identify the correct deployment path for
+      OpenDaylight Maven sites. -->
+    <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+
+    <distributionManagement>
+        <site>
+            <id>opendaylight-site</id>
+            <url>${nexus.site.url}/${project.artifactId}/</url>
+        </site>
+    </distributionManagement>
 </project>

diff --git a/vpnservice/features/vpnservice-features/pom.xml b/vpnservice/features/vpnservice-features/pom.xml
new file mode 100644 (file)
index 0000000..21759e2
--- /dev/null
+++ b/vpnservice/features/vpnservice-features/pom.xml
@@ -0,0 +1,482 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2015 - 2017 Ericsson India Global Services Pvt Ltd. and
+  others. All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0 which
+  accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
+  INTERNAL -->
+<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">
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>features-parent</artifactId>
+    <version>1.8.0-SNAPSHOT</version>
+    <relativePath />
+  </parent>
+  <groupId>org.opendaylight.netvirt</groupId>
+  <artifactId>vpnservice-features</artifactId>
+  <version>0.4.0-SNAPSHOT</version>
+  <name>ODL :: netvirt :: ${project.artifactId}</name>
+  <modelVersion>4.0.0</modelVersion>
+  <properties>
+    <mdsal.version>1.5.0-SNAPSHOT</mdsal.version>
+    <openflowplugin.version>0.4.0-SNAPSHOT</openflowplugin.version>
+    <restconf.version>1.5.0-SNAPSHOT</restconf.version>
+    <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
+    <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
+    <vpnservices.version>0.4.0-SNAPSHOT</vpnservices.version>
+    <ovsdb.version>1.4.0-SNAPSHOT</ovsdb.version>
+    <liblldp.version>0.12.0-SNAPSHOT</liblldp.version>
+    <neutron.version>0.8.0-SNAPSHOT</neutron.version>
+    <genius.version>0.2.0-SNAPSHOT</genius.version>
+    <infrautils.version>1.1.0-SNAPSHOT</infrautils.version>
+    <arputil.version>${genius.version}</arputil.version>
+    <mdsalutil.version>${genius.version}</mdsalutil.version>
+    <vpnmanager.version>${vpnservices.version}</vpnmanager.version>
+    <interfacemgr.version>${genius.version}</interfacemgr.version>
+    <elanmgr.version>${vpnservices.version}</elanmgr.version>
+    <nexthopmgr.version>${vpnservices.version}</nexthopmgr.version>
+    <fibmanager.version>${vpnservices.version}</fibmanager.version>
+    <lockmanager.version>${genius.version}</lockmanager.version>
+    <idmanager.version>${genius.version}</idmanager.version>
+    <itm.version>${genius.version}</itm.version>
+    <neutronvpn.version>${vpnservices.version}</neutronvpn.version>
+    <statistics.plugin.version>${vpnservices.version}</statistics.plugin.version>
+    <cloud-servicechain.version>${vpnservices.version}</cloud-servicechain.version>
+    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
+    <dlux.version>0.5.0-SNAPSHOT</dlux.version>
+    <federation.version>0.2.0-SNAPSHOT</federation.version>
+    <sfc.version>0.5.0-SNAPSHOT</sfc.version>
+    <legacy.utils.version>1.4.0-SNAPSHOT</legacy.utils.version>
+  </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>
+    </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.controller</groupId>
+      <artifactId>features-mdsal</artifactId>
+      <classifier>features</classifier>
+      <version>${mdsal.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.netvirt</groupId>
+      <artifactId>utils.servicehelper</artifactId>
+      <version>${ovsdb.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netvirt</groupId>
+      <artifactId>utils.mdsal-utils</artifactId>
+      <version>${ovsdb.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>southbound-features</artifactId>
+      <version>${ovsdb.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>hwvtepsouthbound-features</artifactId>
+      <version>${ovsdb.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features-openflowplugin</artifactId>
+      <classifier>features</classifier>
+      <version>${openflowplugin.version}</version>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>features-restconf</artifactId>
+      <classifier>features</classifier>
+      <version>${restconf.version}</version>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.neutron</groupId>
+      <artifactId>features-neutron</artifactId>
+      <classifier>features</classifier>
+      <version>${neutron.version}</version>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>genius-features</artifactId>
+      <version>${genius.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>vpnmanager-impl</artifactId>
+      <version>${vpnmanager.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>vpnmanager-impl</artifactId>
+      <version>${vpnmanager.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>elanmanager-impl</artifactId>
+      <version>${elanmgr.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>elanmanager-impl</artifactId>
+      <version>${elanmgr.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>elanmanager-api</artifactId>
+      <version>${elanmgr.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>liblldp</artifactId>
+      <version>${liblldp.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>alivenessmonitor-impl</artifactId>
+      <version>${genius.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>alivenessmonitor-api</artifactId>
+      <version>${genius.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>vpnmanager-api</artifactId>
+      <version>${vpnmanager.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>bgpmanager-impl</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>bgpmanager-api</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>model-bgp</artifactId>
+      <version>2013.07.15.10-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>statistics-api</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>statistics-impl</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>statistics-impl</artifactId>
+      <version>${vpnservices.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>fibmanager-impl</artifactId>
+      <version>${fibmanager.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>fibmanager-shell</artifactId>
+      <version>${fibmanager.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>fibmanager-api</artifactId>
+      <version>${fibmanager.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>dhcpservice-impl</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>dhcpservice-api</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>dhcpservice-impl</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>natservice-impl</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>natservice-api</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>qosservice-api</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>qosservice-impl</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>qosservice-impl</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>aclservice-api</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>aclservice-impl</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>policyservice-api</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>policyservice-impl</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>aclservice-impl</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>ipv6service-api</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>ipv6service-impl</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>neutronvpn-api</artifactId>
+      <version>${neutronvpn.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>neutronvpn-impl</artifactId>
+      <version>${neutronvpn.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>neutronvpn-shell</artifactId>
+      <version>${neutronvpn.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>neutronvpn-impl</artifactId>
+      <version>${neutronvpn.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>vpnmanager-shell</artifactId>
+      <version>${vpnmanager.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>federation-plugin-api</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>federation-plugin-impl</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.thrift</groupId>
+      <artifactId>libthrift</artifactId>
+      <version>0.9.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features-openflowplugin-extension</artifactId>
+      <classifier>features</classifier>
+      <version>${openflowplugin.version}</version>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>cloud-servicechain-api</artifactId>
+      <version>${cloud-servicechain.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>cloud-servicechain-impl</artifactId>
+      <version>${cloud-servicechain.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>statemanager-impl</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.infrautils</groupId>
+      <artifactId>infrautils-features</artifactId>
+      <version>${infrautils.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.dlux</groupId>
+      <artifactId>features-dlux</artifactId>
+      <version>${dlux.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.federation</groupId>
+      <artifactId>federation-features</artifactId>
+      <version>${federation.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>ovsdb-ui-bundle</artifactId>
+      <version>${ovsdb.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>sfc.classifier-api</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>utils.mdsal-openflow</artifactId>
+      <version>${legacy.utils.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>utils.mdsal-utils</artifactId>
+      <version>${legacy.utils.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>sfc.classifier-impl</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>sfc.translator</artifactId>
+      <version>${vpnservices.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.sfc</groupId>
+      <artifactId>features-sfc</artifactId>
+      <version>${sfc.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.sfc</groupId>
+      <artifactId>sfc-provider</artifactId>
+      <version>${sfc.version}</version>
+    </dependency>
+    <dependency>
+      <!-- TODO Remove when https://git.opendaylight.org/gerrit/#/c/44502/
+        is merged -->
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+    </dependency>
+  </dependencies>
+
+  <!-- Maven Site Configuration The following configuration is necessary
+    for maven-site-plugin to correctly identify the correct deployment path for
+    OpenDaylight Maven sites. -->
+  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+
+  <distributionManagement>
+    <site>
+      <id>opendaylight-site</id>
+      <url>${nexus.site.url}/${project.artifactId}/</url>
+    </site>
+  </distributionManagement>
+</project>

diff --git a/vpnservice/features/src/main/features/features.xml b/vpnservice/features/vpnservice-features/src/main/features/features.xml
similarity index 100%
rename from vpnservice/features/src/main/features/features.xml
rename to vpnservice/features/vpnservice-features/src/main/features/features.xml

diff --git a/vpnservice/features/vpnservice-features4/pom.xml b/vpnservice/features/vpnservice-features4/pom.xml
new file mode 100644 (file)
index 0000000..7216a9c
--- /dev/null
+++ b/vpnservice/features/vpnservice-features4/pom.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, Inc. and others.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<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.odlparent</groupId>
+        <artifactId>feature-repo-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.netvirt</groupId>
+    <artifactId>vpnservice-features4</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-netvirt-api</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-netvirt-impl</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-netvirt-openstack</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-netvirt-federation</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-netvirt-ui</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-netvirt-sfc</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
+    
+</project>
\ No newline at end of file

diff --git a/vpnservice/fibmanager/fibmanager-shell/pom.xml b/vpnservice/fibmanager/fibmanager-shell/pom.xml
index 1afd086912eed8daeff11af6cba9a3217f137607..8f0671fac27e64b073276a76d56828dd94eac758 100644 (file)
--- a/vpnservice/fibmanager/fibmanager-shell/pom.xml
+++ b/vpnservice/fibmanager/fibmanager-shell/pom.xml
@@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.apache.karaf.shell</groupId>
       <artifactId>org.apache.karaf.shell.console</artifactId>
-      <version>${karaf.shell.console.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netvirt</groupId>
@@ -38,6 +38,26 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <!-- This bundle works with Karaf 3 and 4.0 -->
+            <Import-Package>
+              org.apache.karaf.shell.commands;version="[3.0.0,4.1)",
+              org.apache.karaf.shell.console;version="[3.0.0,4.1)",
+              *
+            </Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <!--
       Maven Site Configuration
 

diff --git a/vpnservice/neutronvpn/neutronvpn-shell/pom.xml b/vpnservice/neutronvpn/neutronvpn-shell/pom.xml
index c6a0c440f5b0a42aa18185ee6557f98766220141..5770b173c30a162321eba805880bcff2932aea02 100644 (file)
--- a/vpnservice/neutronvpn/neutronvpn-shell/pom.xml
+++ b/vpnservice/neutronvpn/neutronvpn-shell/pom.xml
@@ -34,10 +34,30 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.console</artifactId>
-            <version>${karaf.shell.console.version}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <!-- This bundle works with Karaf 3 and 4.0 -->
+                        <Import-Package>
+                            org.apache.karaf.shell.commands;version="[3.0.0,4.1)",
+                            org.apache.karaf.shell.console;version="[3.0.0,4.1)",
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <!--
         Maven Site Configuration
 

diff --git a/vpnservice/qosservice/impl/pom.xml b/vpnservice/qosservice/impl/pom.xml
index b8d0220a81ff564f5888eb676cd89f62200b88e2..21cc94993384b665bc2f6453ae13f9d0114e2138 100644 (file)
--- a/vpnservice/qosservice/impl/pom.xml
+++ b/vpnservice/qosservice/impl/pom.xml
@@ -58,7 +58,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.console</artifactId>
-            <version>${karaf.shell.console.version}</version>
+            <scope>provided</scope>
         </dependency>
 
     </dependencies>
@@ -92,6 +92,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
           <groupId>org.apache.aries.blueprint</groupId>
           <artifactId>blueprint-maven-plugin</artifactId>
         </plugin>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <extensions>true</extensions>
+          <configuration>
+            <instructions>
+              <!-- This bundle works with Karaf 3 and 4.0 -->
+              <Import-Package>
+                org.apache.karaf.shell.commands;version="[3.0.0,4.1)",
+                org.apache.karaf.shell.console;version="[3.0.0,4.1)",
+                *
+              </Import-Package>
+            </instructions>
+          </configuration>
+        </plugin>
       </plugins>
     </build>
 

diff --git a/vpnservice/vpnmanager/vpnmanager-shell/pom.xml b/vpnservice/vpnmanager/vpnmanager-shell/pom.xml
index 14ce477f34105772d54156d3a589de4e21aeba03..48d66dac616676ebebbbb99f69ed69508eb4ec4e 100644 (file)
--- a/vpnservice/vpnmanager/vpnmanager-shell/pom.xml
+++ b/vpnservice/vpnmanager/vpnmanager-shell/pom.xml
@@ -25,7 +25,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.console</artifactId>
-            <version>${karaf.shell.console.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -34,6 +34,26 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <!-- This bundle works with Karaf 3 and 4.0 -->
+                        <Import-Package>
+                            org.apache.karaf.shell.commands;version="[3.0.0,4.1)",
+                            org.apache.karaf.shell.console;version="[3.0.0,4.1)",
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <!--
         Maven Site Configuration