Add netvirt-features

Depends-on: I8e2afcf08d523219f488c1b9ec9ad82330ba4557

Change-Id: I81b13bce4435422406640e005003f0a79a1fb08e
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index b9f9884d77aabb3369863f3255f72a1a56b3573d..315190c2aba05625635eca08a9300dabfbf70c84 100644 (file)
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -226,8 +226,8 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.opendaylight.netvirt</groupId>
-                        <artifactId>vpnservice-artifacts</artifactId>
-                        <version>${vpnservice.version}</version>
+                        <artifactId>netvirt-artifacts</artifactId>
+                        <version>${netvirt.version}</version>
                         <type>pom</type>
                         <scope>import</scope>
                     </dependency>

diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 859331f611d9420c44e96d4f41a95053ab886f9b..64431b89206b616141ddb53dbe6d34eb808de69d 100644 (file)
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -74,7 +74,7 @@
         <nemo.version>1.4.0-SNAPSHOT</nemo.version>
         <netconf.version>1.4.0-SNAPSHOT</netconf.version>
         <netide.version>0.5.0-SNAPSHOT</netide.version>
-        <netvirt.version>1.6.0-SNAPSHOT</netvirt.version>
+        <netvirt.version>0.6.0-SNAPSHOT</netvirt.version>
         <nic.version>1.5.0-SNAPSHOT</nic.version>
         <neutron.version>0.10.0-SNAPSHOT</neutron.version>
         <ocpplugin.version>0.4.0-SNAPSHOT</ocpplugin.version>
@@ -93,7 +93,6 @@
         <tsdr.version>1.5.0-SNAPSHOT</tsdr.version>
         <unimgr.version>0.4.0-SNAPSHOT</unimgr.version>
         <usc.version>1.5.0-SNAPSHOT</usc.version>
-        <vpnservice.version>0.6.0-SNAPSHOT</vpnservice.version>
         <vtn-manager.version>0.8.0-SNAPSHOT</vtn-manager.version>
         <yangtools.version>2.0.1</yangtools.version>
         <!-- Keep this list sorted alphabetically please. -->

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index f3723875ac03dcf39c84f995f3673a419233a6b2..61ac4c53acb5e5110547864a3829dc6e6f46e6ca 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -432,7 +432,7 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- Netvirt -->
+        <!-- NetVirt -->
         <profile>
             <id>netvirt</id>
             <activation>
@@ -441,7 +441,7 @@
             <dependencies>
                 <dependency>
                     <groupId>org.opendaylight.netvirt</groupId>
-                    <artifactId>vpnservice-features</artifactId>
+                    <artifactId>netvirt-features</artifactId>
                     <classifier>features</classifier>
                     <type>xml</type>
                 </dependency>