X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features-aggregator%2Ffeatures-openflowplugin%2Fpom.xml;h=597ebd51a8488b953fa915e6f6a99d01cc6d11b6;hb=a425274a36f7ea227ba3ec7181ee646b5fa50d40;hp=c47fcbc73fe9f7006b5e8ffd1ec0260d12bfdbf4;hpb=7c91c008f76193ac2e942c62be0a97d65834be7b;p=openflowplugin.git

diff --git a/features-aggregator/features-openflowplugin/pom.xml b/features-aggregator/features-openflowplugin/pom.xml
index c47fcbc73f..597ebd51a8 100644
--- a/features-aggregator/features-openflowplugin/pom.xml
+++ b/features-aggregator/features-openflowplugin/pom.xml
@@ -1,279 +1,151 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>features-parent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <artifactId>feature-repo-parent</artifactId>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>features-openflowplugin</artifactId>
-    <packaging>pom</packaging>
-    <version>0.4.0-SNAPSHOT</version>
-
-    <properties>
-        <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
-        <config.version>0.6.0-SNAPSHOT</config.version>
-        <mdsal.version>1.5.0-SNAPSHOT</mdsal.version>
-        <openflowjava.version>0.9.0-SNAPSHOT</openflowjava.version>
-        <openflowplugin.version>0.4.0-SNAPSHOT</openflowplugin.version>
-        <dluxapps.version>0.5.0-SNAPSHOT</dluxapps.version>
-        <lldp.version>0.12.0-SNAPSHOT</lldp.version>
-        <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
-        <restconf.version>1.5.0-SNAPSHOT</restconf.version>
-        <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- This project -->
-            <dependency>
-                <groupId>org.opendaylight.openflowplugin</groupId>
-                <artifactId>openflowplugin-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-
-            <!-- YANG tools -->
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>${yangtools.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-
-            <!-- Controller infrastructure -->
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>config-artifacts</artifactId>
-                <version>${config.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>${mdsal.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-
-            <!-- restconf -->
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>restconf-artifacts</artifactId>
-                <version>${restconf.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-
-
-            <!-- OpenFlowJava -->
-            <dependency>
-                <groupId>org.opendaylight.openflowjava</groupId>
-                <artifactId>openflowjava-artifacts</artifactId>
-                <version>${openflowjava.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+    <packaging>feature</packaging>
+    <version>0.10.0-SNAPSHOT</version>
 
     <dependencies>
-        <!-- feature dependencies -->
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>features-mdsal-model</artifactId>
-            <version>${mdsal.model.version}</version>
-            <classifier>features</classifier>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-bulk-o-matic</artifactId>
+            <version>${project.version}</version>
             <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-mdsal</artifactId>
             <classifier>features</classifier>
-            <type>xml</type>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>features-yangtools</artifactId>
-            <classifier>features</classifier>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-config-pusher</artifactId>
+            <version>${project.version}</version>
             <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features-restconf</artifactId>
             <classifier>features</classifier>
-            <type>xml</type>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
-            <artifactId>features-openflowjava</artifactId>
-            <classifier>features</classifier>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-forwardingrules-manager</artifactId>
+            <version>${project.version}</version>
             <type>xml</type>
-        </dependency>
-
-        <!-- bundle dependencies -->
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin.model</groupId>
-            <artifactId>model-flow-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin.model</groupId>
-            <artifactId>model-flow-service</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin.model</groupId>
-            <artifactId>model-flow-statistics</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-inventory</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-topology</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>forwardingrules-manager</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>forwardingrules-sync</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>inventory-manager</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>lldp-speaker</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>statistics-manager</artifactId>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>openflowplugin-blueprint-config</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-forwardingrules-sync</artifactId>
             <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>openflowplugin-blueprint-config</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-notifications</artifactId>
             <version>${project.version}</version>
-            <type>cfg</type>
-            <classifier>config</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
-            <artifactId>openflowjava-blueprint-config</artifactId>
-            <version>${openflowjava.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
-            <artifactId>openflowjava-blueprint-config</artifactId>
-            <version>${openflowjava.version}</version>
             <type>xml</type>
-            <classifier>config</classifier>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
-            <artifactId>openflowjava-blueprint-config</artifactId>
-            <version>${openflowjava.version}</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-table-miss-enforcer</artifactId>
+            <version>${project.version}</version>
             <type>xml</type>
-            <classifier>legacyConfig</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.dluxapps</groupId>
-            <artifactId>features-dluxapps</artifactId>
-            <version>${dluxapps.version}</version>
             <classifier>features</classifier>
-            <type>xml</type>
         </dependency>
-
-        <!-- bundle dependencies -->
         <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>openflowplugin-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>openflowplugin-extension-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>openflowplugin</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>openflowplugin-impl</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-topology</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>table-miss-enforcer</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-lldp-speaker</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
-
         <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>topology-lldp-discovery</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-topology-lldp-discovery</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
-
         <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>topology-manager</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-topology-manager</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
-
         <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>of-switch-config-pusher</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-drop-test</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
-
         <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>drop-test-karaf</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-flow-services</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>test-common</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-flow-services-rest</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>openflowplugin-controller-config</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-nsf-model</artifactId>
+            <version>${project.version}</version>
             <type>xml</type>
-            <classifier>config-Li</classifier>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>openflowplugin-controller-config</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-southbound</artifactId>
+            <version>${project.version}</version>
             <type>xml</type>
-            <classifier>configmsgspy</classifier>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>liblldp</artifactId>
-            <version>${lldp.version}</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-reconciliation-framework</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>openflowplugin-common</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-southbound-cli</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>bulk-o-matic</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-libraries</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>notification-supplier</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-arbitratorreconciliation</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
     </dependencies>