Merge "Leaving deprecated API in Neutron-Mapper"

[groupbasedpolicy.git] / features / pom.xml

diff --git a/features/pom.xml b/features/pom.xml
old mode 100644 (file)
new mode 100755 (executable)
index ef10f9a..c3544e8
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -10,13 +10,13 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>features-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <relativePath />
   </parent>
 
   <groupId>org.opendaylight.groupbasedpolicy</groupId>
   <artifactId>features-groupbasedpolicy</artifactId>
-  <version>0.3.0-SNAPSHOT</version>
+  <version>0.4.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <prerequisites>
@@ -24,15 +24,17 @@
   </prerequisites>
 
   <properties>
-    <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
-    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
-    <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
-    <openflowplugin.version>0.2.0-SNAPSHOT</openflowplugin.version>
-    <ovsdb.southbound.version>1.2.1-SNAPSHOT</ovsdb.southbound.version>
-    <neutron.version>0.6.0-SNAPSHOT</neutron.version>
-    <sfc.version>0.2.0-SNAPSHOT</sfc.version>
-    <restconf.version>1.3.0-SNAPSHOT</restconf.version>
-    <dlux.version>0.3.0-SNAPSHOT</dlux.version>
+    <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>
     <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
   </properties>
 
@@ -136,35 +138,25 @@
       <version>${neutron.version}</version>
       <type>xml</type>
     </dependency>
-
-    <!-- SFC -->
     <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
-      <artifactId>features-sfc</artifactId>
-      <version>${sfc.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
+      <groupId>org.opendaylight.neutron</groupId>
+      <artifactId>dummyprovider</artifactId>
+      <version>${neutron.version}</version>
     </dependency>
+
+    <!-- Faas -->
     <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
-      <artifactId>features-sfc-sb-rest</artifactId>
-      <version>${sfc.version}</version>
+      <groupId>org.opendaylight.faas</groupId>
+      <artifactId>features-faas</artifactId>
       <classifier>features</classifier>
+      <version>${faas.version}</version>
       <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
-      <artifactId>features-sfc-ovs</artifactId>
-      <version>${sfc.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
     </dependency>
+
+    <!-- SFC -->
     <dependency>
       <groupId>org.opendaylight.sfc</groupId>
-      <artifactId>features-sfcofl2</artifactId>
+      <artifactId>features-sfc</artifactId>
       <version>${sfc.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
@@ -189,6 +181,29 @@
       <type>xml</type>
     </dependency>
 
+    <!-- AAA -->
+    <dependency>
+      <groupId>org.opendaylight.aaa</groupId>
+      <artifactId>features-aaa</artifactId>
+      <version>${aaa.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+
+    <!-- JERSEY -->
+    <dependency>
+        <groupId>com.sun.jersey</groupId>
+        <artifactId>jersey-core</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>com.sun.jersey</groupId>
+        <artifactId>jersey-server</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.thirdparty</groupId>
+      <artifactId>com.sun.jersey.jersey-servlet</artifactId>
+    </dependency>
+
     <!-- GBP -->
     <dependency>
       <groupId>commons-net</groupId>
@@ -202,6 +217,22 @@
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
       <artifactId>ofoverlay-renderer</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>ovssfc-renderer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>faas-renderer</artifactId>
+    </dependency>
+     <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>netconf-renderer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>iovisor-renderer</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
       <artifactId>neutron-mapper</artifactId>
@@ -222,25 +253,55 @@
     <!-- GBP configuration -->
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
-      <artifactId>groupbasedpolicy-ofoverlay-config</artifactId>
+      <artifactId>groupbasedpolicy</artifactId>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>ofoverlay-renderer</artifactId>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>ovssfc-renderer</artifactId>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>faas-renderer</artifactId>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
-      <artifactId>neutron-mapper-config</artifactId>
+      <artifactId>netconf-renderer</artifactId>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
-      <artifactId>neutron-ovsdb-config</artifactId>
+      <artifactId>iovisor-renderer</artifactId>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
-      <artifactId>ui-backend-config</artifactId>
+      <artifactId>neutron-mapper</artifactId>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>neutron-ovsdb</artifactId>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>ui-backend</artifactId>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>