X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fpom.xml;h=53b315fae693859e1f9d62b88590758e8f3870ca;hb=1dbb955927cc8cfe2b539b9ed31fc4a9d4c5e722;hp=77089623e919981bb79b9e7668628d1a64b79d5d;hpb=e25f1fa95281918b7d3eb4967ee404f887d8fce0;p=groupbasedpolicy.git

diff --git a/features/pom.xml b/features/pom.xml
index 77089623e..53b315fae 100755
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -4,19 +4,19 @@
   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">
+         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>features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
-    <relativePath />
+    <version>1.9.0-SNAPSHOT</version>
+    <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.groupbasedpolicy</groupId>
   <artifactId>features-groupbasedpolicy</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <prerequisites>
@@ -24,19 +24,23 @@
   </prerequisites>
 
   <properties>
-    <aaa.version>0.4.0-SNAPSHOT</aaa.version>
-    <mdsal.version>2.1.0-SNAPSHOT</mdsal.version>
-    <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
-    <controller.mdsal.version>1.4.0-SNAPSHOT</controller.mdsal.version>
-    <openflowplugin.version>0.3.0-SNAPSHOT</openflowplugin.version>
-    <ovsdb.southbound.version>1.3.0-SNAPSHOT</ovsdb.southbound.version>
-    <neutron.version>0.7.0-SNAPSHOT</neutron.version>
-    <faas.version>1.1.0-SNAPSHOT</faas.version>
-    <sfc.version>0.3.0-SNAPSHOT</sfc.version>
-    <restconf.version>1.4.0-SNAPSHOT</restconf.version>
-    <dlux.version>0.4.0-SNAPSHOT</dlux.version>
+    <aaa.version>0.6.0-SNAPSHOT</aaa.version>
+    <mdsal.version>2.3.0-SNAPSHOT</mdsal.version>
+    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
+    <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
+    <openflowplugin.version>0.5.0-SNAPSHOT</openflowplugin.version>
+    <ovsdb.southbound.version>1.5.0-SNAPSHOT</ovsdb.southbound.version>
+    <neutron.version>0.9.0-SNAPSHOT</neutron.version>
+    <faas.version>1.3.0-SNAPSHOT</faas.version>
+    <sfc.version>0.6.0-SNAPSHOT</sfc.version>
+    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
+    <dlux.version>0.6.0-SNAPSHOT</dlux.version>
     <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
-    <sxp.version>1.3.0-SNAPSHOT</sxp.version>
+    <sxp.version>1.5.0-SNAPSHOT</sxp.version>
+    <netconf.version>1.3.0-SNAPSHOT</netconf.version>
+    <vbd.version>1.2.0-SNAPSHOT</vbd.version>
+    <!-- for jolokia -->
+    <feature.controller.extras.version>1.9.0-SNAPSHOT</feature.controller.extras.version>
   </properties>
 
   <dependencyManagement>
@@ -73,6 +77,24 @@
         <type>pom</type>
       </dependency>
 
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>features-extras</artifactId>
+        <version>${feature.controller.extras.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
+      </dependency>
+
+
+      <!-- netconf -->
+      <dependency>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>netconf-artifacts</artifactId>
+        <version>${netconf.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
       <!-- Openflow plugin -->
       <dependency>
         <groupId>org.opendaylight.openflowplugin</groupId>
@@ -81,6 +103,15 @@
         <scope>import</scope>
         <type>pom</type>
       </dependency>
+
+      <!-- honeycomb/VBD -->
+      <dependency>
+        <groupId>org.opendaylight.honeycomb.vbd</groupId>
+        <artifactId>vbd-artifacts</artifactId>
+        <version>${vbd.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -100,13 +131,18 @@
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>features-mdsal-model</artifactId>
-      <version>${mdsal.model.version}</version>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>features-netconf-connector</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-extras</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
 
     <!-- Openflow plugin -->
     <dependency>
@@ -139,11 +175,6 @@
       <version>${neutron.version}</version>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.neutron</groupId>
-      <artifactId>dummyprovider</artifactId>
-      <version>${neutron.version}</version>
-    </dependency>
 
     <!-- Faas -->
     <dependency>
@@ -177,7 +208,7 @@
     <dependency>
       <groupId>org.opendaylight.dlux</groupId>
       <artifactId>features-dlux</artifactId>
-	  <version>${dlux.version}</version>
+      <version>${dlux.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -193,16 +224,12 @@
 
     <!-- JERSEY -->
     <dependency>
-        <groupId>com.sun.jersey</groupId>
-        <artifactId>jersey-core</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>com.sun.jersey</groupId>
-        <artifactId>jersey-server</artifactId>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller.thirdparty</groupId>
-      <artifactId>com.sun.jersey.jersey-servlet</artifactId>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-server</artifactId>
     </dependency>
 
     <!-- sxp -->
@@ -216,6 +243,11 @@
       <artifactId>sxp-core</artifactId>
       <version>${sxp.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.sxp</groupId>
+      <artifactId>sxp-controller</artifactId>
+      <version>${sxp.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.sxp</groupId>
       <artifactId>features</artifactId>
@@ -224,6 +256,14 @@
       <classifier>features</classifier>
     </dependency>
 
+    <!-- honeycomb/VBD -->
+    <dependency>
+      <groupId>org.opendaylight.honeycomb.vbd</groupId>
+      <artifactId>vbd-features</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+
     <!-- GBP -->
     <dependency>
       <groupId>commons-net</groupId>
@@ -233,6 +273,10 @@
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
       <artifactId>groupbasedpolicy</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>l2-l3-domain-extension</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
       <artifactId>ofoverlay-renderer</artifactId>
@@ -245,7 +289,7 @@
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
       <artifactId>faas-renderer</artifactId>
     </dependency>
-     <dependency>
+    <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
       <artifactId>netconf-renderer</artifactId>
     </dependency>
@@ -267,11 +311,11 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
-      <artifactId>neutron-ovsdb</artifactId>
+      <artifactId>neutron-vpp-mapper</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
-      <artifactId>ui-backend</artifactId>
+      <artifactId>neutron-ovsdb</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
@@ -279,11 +323,23 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
-      <artifactId>groupbasedpolicy-old-ui-bundle</artifactId>
+      <artifactId>sxp-ep-provider</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
-      <artifactId>sxp-mapper</artifactId>
+      <artifactId>sxp-ep-provider</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>ip-sgt-distribution-service</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>ios-xe-renderer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>sxp-ise-adapter</artifactId>
     </dependency>
 
     <!-- GBP configuration -->
@@ -293,6 +349,12 @@
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>l2-l3-domain-extension</artifactId>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
       <artifactId>ofoverlay-renderer</artifactId>
@@ -330,9 +392,10 @@
       <classifier>config</classifier>
     </dependency>
     <dependency>
+      <!-- finalname="/etc/org.opendaylight.groupbasedpolicy.renderer.vpp.startup.cfg" -->
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
       <artifactId>vpp-renderer</artifactId>
-      <type>xml</type>
+      <type>cfg</type>
       <classifier>config</classifier>
     </dependency>
     <dependency>
@@ -341,6 +404,13 @@
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
+    <dependency>
+      <!-- finalname="/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.startup.cfg" -->
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>neutron-vpp-mapper</artifactId>
+      <type>cfg</type>
+      <classifier>config</classifier>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
       <artifactId>neutron-ovsdb</artifactId>
@@ -349,15 +419,27 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
-      <artifactId>ui-backend</artifactId>
+      <artifactId>sxp-ep-provider</artifactId>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>ip-sgt-distribution-service</artifactId>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
     <dependency>
-       <groupId>org.opendaylight.groupbasedpolicy</groupId>
-       <artifactId>sxp-mapper</artifactId>
-       <type>xml</type>
-       <classifier>config</classifier>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>ios-xe-renderer</artifactId>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>sxp-ise-adapter</artifactId>
+      <type>xml</type>
+      <classifier>config</classifier>
     </dependency>
   </dependencies>
 </project>