Bump versions by x.(y+1).z for next dev cycle

[netvirt.git] / vpnservice / neutronvpn / neutronvpn-shell / pom.xml

diff --git a/vpnservice/neutronvpn/neutronvpn-shell/pom.xml b/vpnservice/neutronvpn/neutronvpn-shell/pom.xml
index 048b249e39d69d10319ee5a5f3500731b3c4ec3f..95ee84dd64e3e6a3ea0a33b3eeb66045a3bd7ab9 100644 (file)
--- a/vpnservice/neutronvpn/neutronvpn-shell/pom.xml
+++ b/vpnservice/neutronvpn/neutronvpn-shell/pom.xml
@@ -10,28 +10,67 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.opendaylight.vpnservice</groupId>
-        <artifactId>config-parent</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
-        <relativePath>../../commons/config-parent</relativePath>
+        <groupId>org.opendaylight.netvirt</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>0.5.0-SNAPSHOT</version>
+        <relativePath>../../commons/binding-parent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.opendaylight.vpnservice</groupId>
     <artifactId>neutronvpn-shell</artifactId>
-    <version>${vpnservices.version}</version>
+    <name>ODL :: netvirt :: ${project.artifactId}</name>
     <packaging>bundle</packaging>
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.vpnservice</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>neutronvpn-api</artifactId>
             <version>${vpnservices.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>vpnmanager-api</artifactId>
+            <version>${vpnservices.version}</version>
+        </dependency>
         <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
+
+        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>