Move features to features-parent

Because:
  1) It's sort of needed for karaf based IT
  2) Less maintenance burden
  3) It's the RightThing(tm)

Change-Id: I5b527daea160e1bcc0509bda9c12f96816e1a8b9
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --git a/features/pom.xml b/features/pom.xml
index 0fa870b967ae011d1eb613d437da0df8506a08de..65aae0dbd87a8f59b48467753e1a492ddd7bb3f2 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -1,31 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
 
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
+This program and the accompanying materials are made available under the
+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">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <groupId>org.opendaylight.lispflowmapping</groupId>
-    <artifactId>lispflowmapping-all</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>features-parent</artifactId>
+    <version>1.6.0-SNAPSHOT</version>
+    <relativePath/>
   </parent>
+
+  <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>features-lispflowmapping</artifactId>
-  <packaging>jar</packaging>
+  <version>1.3.0-SNAPSHOT</version>
   <name>LISP Flow Mapping Project - Karaf Features</name>
+
   <prerequisites>
     <maven>3.1.1</maven>
   </prerequisites>
+
   <properties>
     <commons.opendaylight.version>1.6.0-SNAPSHOT</commons.opendaylight.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
     <features.file>features.xml</features.file>
     <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+    <neutron.version>0.6.0-SNAPSHOT</neutron.version>
     <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
   </properties>
+
   <dependencyManagement>
     <dependencies>
       <!-- project specific dependencies -->
@@ -38,6 +46,7 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -52,12 +61,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency> -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-nsf</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-mdsal</artifactId>
@@ -105,20 +108,24 @@
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.api</artifactId>
+      <version>${project.version}</version>
     </dependency>
 <!--     <dependency>
-      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.clusterdao</artifactId>
+      <version>${project.version}</version>
     </dependency> -->
     <dependency>
-      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.config</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.inmemorydb</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -128,110 +135,37 @@
       <type>xml</type>
     </dependency>
 <!--     <dependency>
-      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.netconf</artifactId>
+      <version>${project.version}</version>
     </dependency> -->
     <dependency>
-      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.neutron</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.shell</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.yangmodel</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.neutron</groupId>
       <artifactId>features-neutron</artifactId>
+      <version>${neutron.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <!-- error : java.lang.NoSuchMethodError: org.slf4j.helpers.MessageFormatter.format(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Lorg/slf4j/helpers/FormattingTuple; -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-    </dependency>
-    <!-- test to validate features.xml -->
-    <dependency>
-      <groupId>org.opendaylight.odlparent</groupId>
-      <artifactId>features-test</artifactId>
-      <version>1.6.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
-    <!-- dependency for opendaylight-karaf-empty for use by testing -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>opendaylight-karaf-empty</artifactId>
-      <type>zip</type>
-    </dependency>
   </dependencies>
-
-  <build>
-    <resources>
-      <resource>
-        <filtering>true</filtering>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>filter</id>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-            <phase>generate-resources</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
-            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-            <karaf.distro.version>${karaf.empty.version}</karaf.distro.version>
-          </systemPropertyVariables>
-          <dependenciesToScan>
-            <dependency>org.opendaylight.odlparent:features-test</dependency>
-          </dependenciesToScan>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/classes/${features.file}</file>
-                  <type>xml</type>
-                  <classifier>features</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
 </project>

diff --git a/features/src/main/resources/features.xml b/features/src/main/features/features.xml
similarity index 68%
rename from features/src/main/resources/features.xml
rename to features/src/main/features/features.xml
index a732f9a7801bf7848795232438094bfb41908cb2..09d2940c57e22b3c35ef79bc6c0747ae016c5faa 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/features/features.xml
@@ -7,7 +7,7 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<features name="odl-lispflowmapping-${lispflowmapping.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+<features name="odl-lispflowmapping-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
 
@@ -17,18 +17,17 @@
     <!-- TODO features-base should be removed when we get rid of Activators, hopefully soon -->
     <repository>mvn:org.opendaylight.controller/features-base/${commons.opendaylight.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.neutron/features-neutron/${neutron.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-nsf/${nsf.version}/xml/features</repository>
     <!-- <repository>mvn:org.opendaylight.controller/features-netconf-connector/${mdsal.version}/xml/features</repository> -->
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
 
-    <feature name="odl-lispflowmapping-all" description="OpenDaylight :: LISP Flow Mapping :: All" version='${lispflowmapping.version}'>
-        <feature version="${lispflowmapping.version}">odl-lispflowmapping-mappingservice</feature>
-        <feature version="${lispflowmapping.version}">odl-lispflowmapping-southbound</feature>
-        <!-- <feature version="${lispflowmapping.version}">odl-lispflowmapping-netconf</feature> -->
-        <feature version="${lispflowmapping.version}">odl-lispflowmapping-neutron</feature>
+    <feature name="odl-lispflowmapping-all" description="OpenDaylight :: LISP Flow Mapping :: All" version='${project.version}'>
+        <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
+        <feature version="${project.version}">odl-lispflowmapping-southbound</feature>
+        <!-- <feature version="${project.version}">odl-lispflowmapping-netconf</feature> -->
+        <feature version="${project.version}">odl-lispflowmapping-neutron</feature>
     </feature>
 
-    <feature name="odl-lispflowmapping-mappingservice" description="OpenDaylight :: LISP Flow Mapping :: Mapping Service" version='${lispflowmapping.version}'>
+    <feature name="odl-lispflowmapping-mappingservice" description="OpenDaylight :: LISP Flow Mapping :: Mapping Service" version='${project.version}'>
         <!-- TODO felix-dm should be removed when we get rid of Activators, hopefully soon -->
         <feature>odl-base-felix-dm</feature>
         <feature version="${mdsal.version}">odl-mdsal-broker</feature>
@@ -37,49 +36,49 @@
         <!-- <feature version="${clustering.services.version}">odl-adsal-clustering</feature> -->
         <feature version='${yangtools.version}'>odl-yangtools-binding</feature>
         <feature version='${yangtools.version}'>odl-yangtools-models</feature>
-        <feature version="${lispflowmapping.version}">odl-lispflowmapping-inmemorydb</feature>
+        <feature version="${project.version}">odl-lispflowmapping-inmemorydb</feature>
         <bundle>mvn:com.google.guava/guava/${guava.version}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.yangmodel/${lispflowmapping.version}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.api/${lispflowmapping.version}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.implementation/${lispflowmapping.version}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.shell/${lispflowmapping.version}</bundle>
-        <!-- <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.clusterdao/${lispflowmapping.version}</bundle>  -->
+        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.yangmodel/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.api/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.implementation/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.shell/${project.version}</bundle>
+        <!-- <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.clusterdao/${project.version}</bundle>  -->
         <configfile finalname="${configfile.directory}/lfm-mappingservice.xml">
-            mvn:org.opendaylight.lispflowmapping/mappingservice.implementation/${lispflowmapping.version}/xml/config
+            mvn:org.opendaylight.lispflowmapping/mappingservice.implementation/${project.version}/xml/config
         </configfile>
     </feature>
 
-    <feature name="odl-lispflowmapping-inmemorydb" description="OpenDaylight :: LISP Flow Mapping :: In Memory DB" version='${lispflowmapping.version}'>
+    <feature name="odl-lispflowmapping-inmemorydb" description="OpenDaylight :: LISP Flow Mapping :: In Memory DB" version='${project.version}'>
         <feature version="${mdsal.version}">odl-mdsal-broker</feature>
         <feature version='${yangtools.version}'>odl-yangtools-binding</feature>
         <feature version='${yangtools.version}'>odl-yangtools-models</feature>
         <bundle>mvn:com.google.guava/guava/${guava.version}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.yangmodel/${lispflowmapping.version}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.api/${lispflowmapping.version}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.inmemorydb/${lispflowmapping.version}</bundle>
+        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.yangmodel/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.api/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.inmemorydb/${project.version}</bundle>
         <configfile finalname="${configfile.directory}/lfm-inmemorydb.xml">
-            mvn:org.opendaylight.lispflowmapping/mappingservice.inmemorydb/${lispflowmapping.version}/xml/config
+            mvn:org.opendaylight.lispflowmapping/mappingservice.inmemorydb/${project.version}/xml/config
         </configfile>
     </feature>
 
-    <feature name="odl-lispflowmapping-southbound" description="OpenDaylight :: LISP Flow Mapping :: Southbound Plugin" version='${lispflowmapping.version}'>
-        <feature version="${lispflowmapping.version}">odl-lispflowmapping-mappingservice</feature>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.southbound/${lispflowmapping.version}</bundle>
+    <feature name="odl-lispflowmapping-southbound" description="OpenDaylight :: LISP Flow Mapping :: Southbound Plugin" version='${project.version}'>
+        <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
+        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.southbound/${project.version}</bundle>
         <configfile finalname="${configfile.directory}/lfm-mappingservice-sb.xml">
-            mvn:org.opendaylight.lispflowmapping/mappingservice.southbound/${lispflowmapping.version}/xml/config
+            mvn:org.opendaylight.lispflowmapping/mappingservice.southbound/${project.version}/xml/config
         </configfile>
     </feature>
 
-<!--     <feature name="odl-lispflowmapping-netconf" description="OpenDaylight :: LISP Flow Mapping :: NETCONF" version='${lispflowmapping.version}'>
+<!--     <feature name="odl-lispflowmapping-netconf" description="OpenDaylight :: LISP Flow Mapping :: NETCONF" version='${project.version}'>
         <feature version="${mdsal.version}">odl-netconf-connector-ssh</feature>
-        <feature version="${lispflowmapping.version}">odl-lispflowmapping-mappingservice</feature>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.netconf/${lispflowmapping.version}</bundle>
+        <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
+        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.netconf/${project.version}</bundle>
     </feature> -->
 
-    <feature name="odl-lispflowmapping-neutron" description="OpenDaylight :: LISP Flow Mapping :: Neutron Integration" version='${lispflowmapping.version}'>
+    <feature name="odl-lispflowmapping-neutron" description="OpenDaylight :: LISP Flow Mapping :: Neutron Integration" version='${project.version}'>
         <feature version="${neutron.version}">odl-neutron-service</feature>
-        <feature version="${lispflowmapping.version}">odl-lispflowmapping-mappingservice</feature>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.neutron/${lispflowmapping.version}</bundle>
+        <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
+        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.neutron/${project.version}</bundle>
     </feature>
 
 </features>