Adding feature selector application module to root pom.

Change-Id: I388fa7d451d837741738da22ac42898b231f3f3a
Signed-off-by: Harman Singh <harmasin@cisco.com>

diff --git a/feature-selector/pom.xml b/feature-selector/pom.xml
index a64866129b221a8ee575cd577db2a72de8d7cdfd..5535a36efe71f03655284bccd91d2f1360ec53da 100644 (file)
--- a/feature-selector/pom.xml
+++ b/feature-selector/pom.xml
@@ -1,15 +1,20 @@
 <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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.release</groupId>
+  <parent>
+      <groupId>org.opendaylight.integration</groupId>
+      <artifactId>root</artifactId>
+      <version>0.2.0-SNAPSHOT</version>
+      <relativePath>../</relativePath>
+  </parent>
   <artifactId>feature-selector</artifactId>
   <packaging>war</packaging>
-  <version>0.1.0-SNAPSHOT</version>
-  <name>feature-selector Maven Webapp</name>
-  <url>http://maven.apache.org</url>
+  <name>feature-selector Webapp</name>
   <properties>
       <spring.version>3.1.3.RELEASE</spring.version>
       <jackson.version>1.9.10</jackson.version>
+      <jstl.version>1.1.2</jstl.version>
+      <servlet.version>2.5</servlet.version>
   </properties>
   <build>
     <finalName>feature-selector</finalName>
@@ -53,18 +58,18 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
-            <version>1.1.2</version>
+            <version>${jstl.version}</version>
         </dependency>
 
         <dependency>
             <groupId>taglibs</groupId>
             <artifactId>standard</artifactId>
-            <version>1.1.2</version>
+            <version>${jstl.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
+            <version>${servlet.version}</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/pom.xml b/pom.xml
index 62fee04ee3aa0159688b3bb25ba2676ac4eb4d89..5e8cb0f1f6253ab9b2db456c4d76a262e6132c5c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@
   <modules>
     <module>distributions/</module>
     <module>features/</module>
+    <module>feature-selector</module>
   </modules>
 
   <repositories>
@@ -257,7 +258,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>{$maven.surefire.version}</version>
+          <version>${maven.surefire.version}</version>
         </plugin>
       </plugins>
     </pluginManagement>