Bug 4405 Removing ad-sal and nsf feature reference from dlux distribution

[dlux.git] / distribution-dlux / pom.xml

diff --git a/distribution-dlux/pom.xml b/distribution-dlux/pom.xml
index bbd8aa682663e6f636f79520f8c189a6c8113f91..18d019ee8f50e369053e2ded4dde9baa7261cc1f 100644 (file)
--- a/distribution-dlux/pom.xml
+++ b/distribution-dlux/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>dlux-parent</artifactId>
     <groupId>org.opendaylight.dlux</groupId>
-    <version>0.1.0-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
   </parent>
   <!--
     Necessary TODO: Hookup your parent pom here, else you will not get necessary versions,
@@ -15,26 +15,12 @@
   <artifactId>distribution-dlux</artifactId>
   <groupId>org.opendaylight.dlux</groupId>
   <!-- Optional TODO: Uncomment version if you are not using a parent pom.xml
-  <version>0.1.0-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   -->
   <packaging>pom</packaging>
   <prerequisites>
     <maven>3.0</maven>
   </prerequisites>
-  <properties>
-    <!-- Optional TODO: Move these properties to your parent pom and possibly
-            DependencyManagement section of your parent pom -->
-    <branding.version>1.0.0-SNAPSHOT</branding.version>
-    <karaf.resources.version>1.4.2-SNAPSHOT</karaf.resources.version>
-    <karaf.version>3.0.1</karaf.version>
-    <feature.mdsal.version>1.1-SNAPSHOT</feature.mdsal.version>
-    <feature.dlux.version>0.1.0-SNAPSHOT</feature.dlux.version>
-    <feature.flow.version>1.1-SNAPSHOT</feature.flow.version>
-    <feature.yangtools.version>0.6.2-SNAPSHOT</feature.yangtools.version>
-    <feature.adsal.version>0.8.1-SNAPSHOT</feature.adsal.version>
-    <feature.nsf.version>0.4.2-SNAPSHOT</feature.nsf.version>
-  </properties>
-
   <dependencies>
     <!-- Basic Karaf dependencies -->
     <dependency>
@@ -91,26 +77,10 @@
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-adsal</artifactId>
-      <classifier>features</classifier>
-      <version>${feature.adsal.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-nsf</artifactId>
-      <classifier>features</classifier>
-      <version>${feature.nsf.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>features-openflowplugin</artifactId>
-      <version>0.0.3-SNAPSHOT</version>
+      <version>${feature.openflowplugin.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
@@ -118,7 +88,7 @@
     <dependency>
       <groupId>org.opendaylight.dlux</groupId>
       <artifactId>features-dlux</artifactId>
-      <version>${feature.dlux.version}</version>
+      <version>${project.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
@@ -126,15 +96,7 @@
      <dependency>
       <groupId>org.opendaylight.l2switch</groupId>
       <artifactId>features-l2switch</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-adsal-compatibility</artifactId>
-      <version>1.4.2-SNAPSHOT</version>
+      <version>${feature.l2switch.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
@@ -143,23 +105,17 @@
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
       <artifactId>features-aaa</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
+      <version>${feature.aaa.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
 
-    <!-- test to validate features.xml -->
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-test</artifactId>
-      <version>0.6.2-SNAPSHOT</version>
-    </dependency>
     <!-- dependency for opendaylight-karaf-empty for use by testing -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>opendaylight-karaf-empty</artifactId>
-      <version>1.4.2-SNAPSHOT</version>
+      <version>${karaf.empty.version}</version>
       <type>zip</type>
     </dependency>
   </dependencies>
@@ -250,7 +206,6 @@
       <plugin>
         <groupId>org.apache.karaf.tooling</groupId>
         <artifactId>karaf-maven-plugin</artifactId>
-        <version>${karaf.version}</version>
         <extensions>true</extensions>
         <configuration>
           <bootFeatures>