From: Ed Warnicke <eaw@cisco.com>
Date: Tue, 19 Aug 2014 23:43:54 +0000 (-0500)
Subject: Small fixes to feature files.
X-Git-Tag: release/helium~259
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=5777a875530dc42751bad5098efa44e17db8023f

Small fixes to feature files.

As it turns out... the default artifact type
for config files is jar from commons/opendaylight/pom.xml

This is not corrected there because jar *is* the thing that
is used by the legacy distributions...

But if we don't correct it here, if you try to test a feature
against an empty .m2... the test will fail.

(Yes, this is how I spend my evenings, emtpying out my .m2
directory :( )

Change-Id: Icd24a7a2437f999da3f0c10618fead203b726c62
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---

diff --git a/features/config-netty/pom.xml b/features/config-netty/pom.xml
index 5fbc463df3..bf036979cf 100644
--- a/features/config-netty/pom.xml
+++ b/features/config-netty/pom.xml
@@ -45,6 +45,14 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-netty-config</artifactId>
+      <!--
+        note, the reason the type and classifier
+        are here instead of in opendaylight/commons/opendaylight/pom.xml
+        is because they are used as jars in distribution.
+      -->
+      <version>${config.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
     </dependency>
     <!-- test to validate features.xml -->
     <dependency>
diff --git a/features/config/pom.xml b/features/config/pom.xml
index 8c061c2736..20feceb360 100644
--- a/features/config/pom.xml
+++ b/features/config/pom.xml
@@ -16,6 +16,13 @@
   </properties>
 
   <dependencies>
+    <!-- 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>
+      <type>zip</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>features-yangtools</artifactId>
diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml
index e7b825c48b..ac6b82b26f 100644
--- a/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@ -83,6 +83,9 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>md-sal-config</artifactId>
+      <version>${mdsal.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -99,6 +102,9 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>netconf-connector-config</artifactId>
+      <version>${netconf.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -151,6 +157,9 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-rest-connector-config</artifactId>
+      <version>${mdsal.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.samples</groupId>
@@ -167,6 +176,9 @@
     <dependency>
       <groupId>org.opendaylight.controller.samples</groupId>
       <artifactId>toaster-config</artifactId>
+      <version>${mdsal.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
     </dependency>
     <!-- test to validate features.xml -->
     <dependency>