Refactor the poms to clean up unused tags and move to odl parent

[lispflowmapping.git] / features / pom.xml

diff --git a/features/pom.xml b/features/pom.xml
index 171a56b544f00f42a5ffd5fc025dd547b2dfa08d..16c3e0667c10e4de03fadccecf1aa020bc445e3e 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -10,13 +10,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
-    <artifactId>lispflowmapping-commons</artifactId>
+    <artifactId>lispflowmapping-all</artifactId>
     <version>1.2.0-SNAPSHOT</version>
-    <relativePath>../commons/parent</relativePath>
   </parent>
   <artifactId>features-lispflowmapping</artifactId>
-  <name>LISP Flow Mapping Project - Karaf Features</name>
   <packaging>jar</packaging>
+  <name>LISP Flow Mapping Project - Karaf Features</name>
   <properties>
     <features.file>features.xml</features.file>
   </properties>
@@ -24,54 +23,42 @@
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <version>${mdsal.version}</version>
+      <artifactId>features-adsal</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-adsal</artifactId>
-      <version>${sal.version}</version>
+      <artifactId>features-mdsal</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-nsf</artifactId>
-      <version>${nsf.version}</version>
+      <artifactId>features-netconf-connector</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-netconf-connector</artifactId>
-      <version>${mdsal.version}</version>
+      <artifactId>features-nsf</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <!-- test to validate features.xml -->
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-test</artifactId>
-      <version>${feature.test.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>
-      <version>${karaf.empty.version}</version>
       <type>zip</type>
     </dependency>
+
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
-      <artifactId>mappingservice.yangmodel</artifactId>
+      <artifactId>mappingservice.api</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
-      <artifactId>mappingservice.api</artifactId>
+      <artifactId>mappingservice.clusterdao</artifactId>
     </dependency>
 
     <dependency>
@@ -83,14 +70,15 @@
       <groupId>org.opendaylight.lispflowmapping</groupId>
       <artifactId>mappingservice.implementation</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
-      <artifactId>mappingservice.clusterdao</artifactId>
+      <artifactId>mappingservice.netconf</artifactId>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
-      <artifactId>mappingservice.southbound</artifactId>
+      <artifactId>mappingservice.neutron</artifactId>
     </dependency>
 
     <dependency>
@@ -100,85 +88,82 @@
 
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
-      <artifactId>mappingservice.netconf</artifactId>
+      <artifactId>mappingservice.southbound</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
-      <artifactId>mappingservice.neutron</artifactId>
+      <artifactId>mappingservice.yangmodel</artifactId>
     </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>
-      <version>1.7.2</version>
+    </dependency>
+    <!-- test to validate features.xml -->
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>features-test</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
   <build>
     <resources>
       <resource>
-        <directory>src/main/resources</directory>
         <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>
-                <phase>generate-resources</phase>
-                <goals>
-                   <goal>resources</goal>
-                </goals>
-             </execution>
-          </executions>
-       </plugin>
-       <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>build-helper-maven-plugin</artifactId>
-          <executions>
-             <execution>
-                <id>attach-artifacts</id>
-                <phase>package</phase>
-                <goals>
-                   <goal>attach-artifact</goal>
-                </goals>
-                <configuration>
-                   <artifacts>
-                      <artifact>
-                         <file>${project.build.directory}/classes/${features.file}</file>
-                         <type>xml</type>
-                         <classifier>features</classifier>
-                      </artifact>
-                   </artifacts>
-                </configuration>
-             </execution>
-          </executions>
-       </plugin>
-       <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>${surefire.version}</version>
-          <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.yangtools:features-test</dependency>
-            </dependenciesToScan>
-          </configuration>
-        </plugin>
+      <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.yangtools: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>
-  <scm>
-    <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
-   </scm>
 </project>