Code Review / netvirt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Drop Maven prerequisite
[netvirt.git] / vpnservice / features / pom.xml
diff --git a/vpnservice/features/pom.xml b/vpnservice/features/pom.xml
index d22d859e2a2713139b8ef4c5b5268c819e3e5693..4f009682153c09cf9f960741c9a7d7f40cb8d27b 100644 (file)
--- a/vpnservice/features/pom.xml
+++ b/vpnservice/features/pom.xml
@@ -9,29 +9,26 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.netvirt</groupId>
   <artifactId>vpnservice-features</artifactId>
-  <version>0.3.0-SNAPSHOT</version>
+  <version>0.4.0-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <properties>
-    <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
-    <openflowplugin.version>0.3.0-SNAPSHOT</openflowplugin.version>
-    <restconf.version>1.4.0-SNAPSHOT</restconf.version>
-    <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
-    <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
-    <vpnservices.version>0.3.0-SNAPSHOT</vpnservices.version>
-    <ovsdb.version>1.3.0-SNAPSHOT</ovsdb.version>
-    <liblldp.version>0.11.0-SNAPSHOT</liblldp.version>
-    <neutron.version>0.7.0-SNAPSHOT</neutron.version>
-    <genius.version>0.1.0-SNAPSHOT</genius.version>
-    <infrautils.version>1.0.0-SNAPSHOT</infrautils.version>
+    <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>
@@ -45,6 +42,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <neutronvpn.version>${vpnservices.version}</neutronvpn.version>
     <cloud-servicechain.version>${vpnservices.version}</cloud-servicechain.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
+    <dlux.version>0.5.0-SNAPSHOT</dlux.version>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -90,16 +88,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>utils.ovsdb-it-utils</artifactId>
-      <version>${ovsdb.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netvirt</groupId>
-      <artifactId>netvirt-it-utils</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.netvirt</groupId>
       <artifactId>utils.servicehelper</artifactId>
@@ -168,13 +156,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>elanmanager-impl</artifactId>
       <version>${elanmgr.version}</version>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>elanmanager-impl</artifactId>
-      <version>${elanmgr.version}</version>
-      <classifier>config</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>elanmanager-api</artifactId>
@@ -220,7 +201,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>model-bgp</artifactId>
-      <version>2013.07.15.9-SNAPSHOT</version>
+      <version>2013.07.15.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -249,15 +230,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>natservice-impl</artifactId>
-      <version>${vpnservices.version}</version>
+      <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>
-      <classifier>config</classifier>
-      <type>xml</type>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -274,6 +255,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>aclservice-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>
@@ -299,6 +287,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>neutronvpn-shell</artifactId>
       <version>${neutronvpn.version}</version>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>vpnmanager-shell</artifactId>
+      <version>${vpnmanager.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>neutronvpn-impl</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
@@ -326,13 +326,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>cloud-servicechain-impl</artifactId>
       <version>${cloud-servicechain.version}</version>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>cloud-servicechain-impl</artifactId>
-      <version>${cloud-servicechain.version}</version>
-      <classifier>config</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>statemanager-impl</artifactId>
@@ -345,6 +338,24 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <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>${project.groupId}</groupId>
+      <artifactId>ovsdb-ui-bundle</artifactId>
+      <version>${ovsdb.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>
 
   <!--
NetVirt - Archived